1 files changed, 20 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb
index 85d9c3be00..f6f63f1f32 100644
--- a/actionpack/lib/action_dispatch/http/response.rb
+++ b/actionpack/lib/action_dispatch/http/response.rb
@@ -161,6 +161,26 @@ module ActionDispatch # :nodoc:
     def set_header(key, v); headers[key] = v;   end
     def delete_header(key); headers.delete key; end
 
+    # Add a header that may have multiple values.
+    #
+    # Example:
+    #   response.add_header 'Vary', 'Accept'
+    #   response.add_header 'Vary', 'Accept-Encoding'
+    #   response.add_header 'Vary', 'Cookie'
+    #
+    #   assert_equal 'Accept,Accept-Encoding,Cookie', response.get_header 'Vary'
+    #
+    # http://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4.2
+    def add_header(key, v)
+      if v.nil?
+        get_header key
+      elsif have_header? key
+        set_header key, "#{get_header key},#{v}"
+      else
+        set_header key, v
+      end
+    end
+
     def await_commit
       synchronize do
         @cv.wait_until { @committed }