2 files changed, 9 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/metal/live.rb b/actionpack/lib/action_controller/metal/live.rb
index fe63cf2b98..41b997a755 100644
--- a/actionpack/lib/action_controller/metal/live.rb
+++ b/actionpack/lib/action_controller/metal/live.rb
@@ -125,9 +125,11 @@ module ActionController
       end
 
       def each
+        @response.sending!
         while str = @buf.pop
           yield str
         end
+        @response.sent!
       end
 
       def close
@@ -179,12 +181,16 @@ module ActionController
 
       private
 
-      def finalize_response
+      def before_committed
         super
         jar = request.cookie_jar
         # The response can be committed multiple times
         jar.write self unless committed?
-        jar.commit!
+      end
+
+      def before_sending
+        super
+        request.cookie_jar.commit!
         headers.freeze
       end
 
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 009f83861d..e9166d8747 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -595,7 +595,7 @@ module ActionController
         @controller.process(name)
 
         if cookies = @request.env['action_dispatch.cookies']
-          unless cookies.committed?
+          unless @response.committed?
             cookies.write(@response)
           end
         end