push header merge down to a private method so that live responses can have their own header object

1 files changed, 4 insertions, 5 deletions

diff --git a/actionpack/lib/action_controller/metal/live.rb b/actionpack/lib/action_controller/metal/live.rb
index bba75b22fd..32e5afa335 100644
--- a/actionpack/lib/action_controller/metal/live.rb
+++ b/actionpack/lib/action_controller/metal/live.rb
@@ -81,11 +81,6 @@ module ActionController
         end
       end
 
-      def initialize(status = 200, header = {}, body = [])
-        header = Header.new self, header
-        super(status, header, body)
-      end
-
       def commit!
         headers.freeze
         super
@@ -98,6 +93,10 @@ module ActionController
         body.each { |part| buf.write part }
         buf
       end
+
+      def merge_default_headers(original, default)
+        Header.new self, super
+      end
     end
 
     def process(name)