aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal
diff options
context:
space:
mode:
authorLauro Caetano <laurocaetano1@gmail.com>2013-11-28 23:01:57 -0200
committerLauro Caetano <laurocaetano1@gmail.com>2013-11-30 16:06:52 -0200
commit71d19f15171e59b5dfddd66f3fa3a234c3f7911d (patch)
tree9c42fe550754367e05663c3a22fdb5313cfdd08b /actionpack/lib/action_controller/metal
parentcd4d9316591ab61e478f98e1697599cdffc11d8c (diff)
downloadrails-71d19f15171e59b5dfddd66f3fa3a234c3f7911d.tar.gz
rails-71d19f15171e59b5dfddd66f3fa3a234c3f7911d.tar.bz2
rails-71d19f15171e59b5dfddd66f3fa3a234c3f7911d.zip
Fix stream closing when sending file with `ActionController::Live` included.
Fixes #12381
Diffstat (limited to 'actionpack/lib/action_controller/metal')
-rw-r--r--actionpack/lib/action_controller/metal/live.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/live.rb b/actionpack/lib/action_controller/metal/live.rb
index 0dd788645b..09ea4919c2 100644
--- a/actionpack/lib/action_controller/metal/live.rb
+++ b/actionpack/lib/action_controller/metal/live.rb
@@ -234,7 +234,7 @@ module ActionController
def response_body=(body)
super
- response.stream.close if response
+ response.close if response
end
def set_response!(request)