1 files changed, 6 insertions, 6 deletions
diff --git a/actionpack/lib/action_controller/metal/live.rb b/actionpack/lib/action_controller/metal/live.rb
index 69583f8ab4..c874165816 100644
--- a/actionpack/lib/action_controller/metal/live.rb
+++ b/actionpack/lib/action_controller/metal/live.rb
@@ -145,8 +145,8 @@ module ActionController
 
       def write(string)
         unless @response.committed?
-          @response.headers["Cache-Control"] = "no-cache"
-          @response.headers.delete "Content-Length"
+          @response.set_header "Cache-Control", "no-cache"
+          @response.delete_header "Content-Length"
         end
 
         super
@@ -236,6 +236,10 @@ module ActionController
         end
       end
 
+      def initialize(status = 200, header = {}, body = [])
+        super(status, Header.new(self, header), body)
+      end
+
       private
 
       def before_committed
@@ -257,10 +261,6 @@ module ActionController
         buf
       end
 
-      def merge_default_headers(original, default)
-        Header.new self, super
-      end
-
       def handle_conditional_get!
         super unless committed?
       end