aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--railties/CHANGELOG2
-rwxr-xr-xrailties/dispatches/dispatch.fcgi1
2 files changed, 2 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 0585769622..867ed839ff 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* RailsFCGIHandler (dispatch.fcgi) no longer tries to explicitly flush $stdout (CgiProcess#out always calls flush)
+
* Fixed rakefile actions against PostgreSQL when the password is all numeric #1462 [michael@schubert.cx]
* ActionMailer::Base subclasses are reloaded with the other rails components #1262
diff --git a/railties/dispatches/dispatch.fcgi b/railties/dispatches/dispatch.fcgi
index 2d298c1935..e27a7e03c1 100755
--- a/railties/dispatches/dispatch.fcgi
+++ b/railties/dispatches/dispatch.fcgi
@@ -88,7 +88,6 @@ class RailsFCGIHandler
raise if SignalException === e
dispatcher_error(e)
ensure
- $stdout.flush
@i_am_currently_processing_a_request = false
end
end