make sure set_response! sets the correct response object

2 files changed, 15 insertions, 0 deletions

diff --git a/actionpack/lib/action_controller/metal/live.rb b/actionpack/lib/action_controller/metal/live.rb
index e98ad7e2a6..d1734f2138 100644
--- a/actionpack/lib/action_controller/metal/live.rb
+++ b/actionpack/lib/action_controller/metal/live.rb
@@ -111,5 +111,14 @@ module ActionController # :nodoc:
 
       @_response.await_commit
     end
+
+    def set_response!(request)
+      if request.env["HTTP_VERSION"] == "HTTP/1.0"
+        super
+      else
+        @_response         = Live::Response.new
+        @_response.request = request
+      end
+    end
   end
 end
diff --git a/actionpack/test/controller/live_stream_test.rb b/actionpack/test/controller/live_stream_test.rb
index 5bb37a271d..e5fb50fca4 100644
--- a/actionpack/test/controller/live_stream_test.rb
+++ b/actionpack/test/controller/live_stream_test.rb
@@ -53,6 +53,12 @@ module ActionController
       TestResponse.new
     end
 
+    def test_set_response!
+      @controller.set_response!(@request)
+      assert_kind_of(Live::Response, @controller.response)
+      assert_equal @request, @controller.response.request
+    end
+
     def test_write_to_stream
       @controller = TestController.new
       get :basic_stream