aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-07-29 15:51:21 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2012-07-29 15:51:21 -0700
commit356787fce80ba545e288f464450483d52782871a (patch)
tree53736c756b5383806b78fadb834adb3a18892504 /actionpack/lib/action_controller
parent76d75f42409a5711a772d78f67cb635b9b1e933a (diff)
downloadrails-356787fce80ba545e288f464450483d52782871a.tar.gz
rails-356787fce80ba545e288f464450483d52782871a.tar.bz2
rails-356787fce80ba545e288f464450483d52782871a.zip
adding a buffered stream to the response object
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/metal.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb
index 92433ab462..0a0f5393ce 100644
--- a/actionpack/lib/action_controller/metal.rb
+++ b/actionpack/lib/action_controller/metal.rb
@@ -187,7 +187,7 @@ module ActionController
end
def performed?
- !!response_body
+ response_body || (response && response.committed?)
end
def dispatch(name, request) #:nodoc: