diff options
author | Jamis Buck <jamis@37signals.com> | 2005-06-27 09:35:09 +0000 |
---|---|---|
committer | Jamis Buck <jamis@37signals.com> | 2005-06-27 09:35:09 +0000 |
commit | d23d3bc360f591e6bd8bfe1fa757415d3a878be5 (patch) | |
tree | a4103daadc52859853489a7ceefae5b3562c7933 /actionpack | |
parent | 9b0bb24fe01c83086724c89d0b884a74f4f5088d (diff) | |
download | rails-d23d3bc360f591e6bd8bfe1fa757415d3a878be5.tar.gz rails-d23d3bc360f591e6bd8bfe1fa757415d3a878be5.tar.bz2 rails-d23d3bc360f591e6bd8bfe1fa757415d3a878be5.zip |
Attempt to explicitly flush the output at the end of CgiProcess#out
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1537 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
-rw-r--r-- | actionpack/lib/action_controller/cgi_process.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index dcf8d4ef08..8c8da2fda2 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Attempt to explicitly flush the output at the end of CgiProcess#out + * Fixed assert_redirected_to to handle absolute controller paths properly #1472 [Rick Olson/Nicholas Seckar] * Added event-based observations when frequency is not set on observe_field/form #1474 [flash@vanklinkenbergsoftware.nl] diff --git a/actionpack/lib/action_controller/cgi_process.rb b/actionpack/lib/action_controller/cgi_process.rb index e4e86615c0..43a8a53b8b 100644 --- a/actionpack/lib/action_controller/cgi_process.rb +++ b/actionpack/lib/action_controller/cgi_process.rb @@ -139,6 +139,8 @@ module ActionController #:nodoc: else output.write(@body) end + + output.flush if output.respond_to?(:flush) rescue Errno::EPIPE => e # lost connection to the FCGI process -- ignore the output, then end |