close the response when the response body is set so that normal render calls will work

fa3c4ea6 · Aaron Patterson · 4509494f · fa3c4ea6 · fa3c4ea6
Showing with 14 addition and 0 deletion

actionpack/lib/action_controller/metal/live.rb actionpack/lib/action_controller/metal/live.rb +5 -0

actionpack/test/controller/live_stream_test.rb actionpack/test/controller/live_stream_test.rb +9 -0

未找到文件。
--- a/actionpack/lib/action_controller/metal/live.rb
+++ b/actionpack/lib/action_controller/metal/live.rb
@@ -121,6 +121,11 @@ def process(name)
      @_response.await_commit
    end

+    def response_body=(body)
+      super
+      response.stream.close if response
+    end
+
    def set_response!(request)
      if request.env["HTTP_VERSION"] == "HTTP/1.0"
        super

--- a/actionpack/test/controller/live_stream_test.rb
+++ b/actionpack/test/controller/live_stream_test.rb
@@ -12,6 +12,10 @@ def self.controller_path
        'test'
      end

+      def render_text
+        render :text => 'zomg'
+      end
+
      def default_header
        response.stream.write "<html><body>hi</body></html>"
        response.stream.close
@@ -107,5 +111,10 @@ def test_live_stream_default_header
      _, headers, _ = @response.prepare!
      assert headers['Content-Type']
    end
+
+    def test_render_text
+      get :render_text
+      assert @response.stream.closed?, 'stream should be closed'
+    end
  end
 end