aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/cgi_process.rb
diff options
context:
space:
mode:
authorMarcel Molina <marcel@vernix.org>2006-04-29 05:06:49 +0000
committerMarcel Molina <marcel@vernix.org>2006-04-29 05:06:49 +0000
commitc745f4780442271a2a2dcead4567b3fec9057630 (patch)
tree0c751737ea43942132b081ee104169d266254f86 /actionpack/lib/action_controller/cgi_process.rb
parentf42403ff499fb120c4996b61a6f98b96e399ed87 (diff)
downloadrails-c745f4780442271a2a2dcead4567b3fec9057630.tar.gz
rails-c745f4780442271a2a2dcead4567b3fec9057630.tar.bz2
rails-c745f4780442271a2a2dcead4567b3fec9057630.zip
Use #flush between switching from #write to #syswrite. Closes #4907. [Blair Zajac <blair@orcaware.com>]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4306 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/cgi_process.rb')
-rw-r--r--actionpack/lib/action_controller/cgi_process.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/cgi_process.rb b/actionpack/lib/action_controller/cgi_process.rb
index 09a6000b9f..05e9886ab0 100644
--- a/actionpack/lib/action_controller/cgi_process.rb
+++ b/actionpack/lib/action_controller/cgi_process.rb
@@ -180,6 +180,9 @@ end_msg
if @cgi.send(:env_table)['REQUEST_METHOD'] == 'HEAD'
return
elsif @body.respond_to?(:call)
+ # Flush the output now in case the @body Proc uses
+ # #syswrite.
+ output.flush if output.respond_to?(:flush)
@body.call(self, output)
else
output.write(@body)