about summary refs log tree commit homepage
path: root/lib/mongrel/header_out.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/mongrel/header_out.rb')
-rw-r--r--lib/mongrel/header_out.rb10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/mongrel/header_out.rb b/lib/mongrel/header_out.rb
index b34e95e..008bff8 100644
--- a/lib/mongrel/header_out.rb
+++ b/lib/mongrel/header_out.rb
@@ -10,13 +10,19 @@ module Mongrel
     attr_reader :out
     attr_accessor :allowed_duplicates
 
-    def initialize(out)
+    def initialize(out = StringIO.new)
       @sent = {}
       @allowed_duplicates = {"Set-Cookie" => true, "Set-Cookie2" => true,
         "Warning" => true, "WWW-Authenticate" => true}
       @out = out
     end
 
+    def merge!(hash)
+      hash.each do |key, value|
+        self[key] = value
+      end
+    end
+
     # Simply writes "#{key}: #{value}" to an output buffer.
     def[]=(key,value)
       if not @sent.has_key?(key) or @allowed_duplicates.has_key?(key)
@@ -25,4 +31,4 @@ module Mongrel
       end
     end
   end
-end \ No newline at end of file
+end