mirror of
https://github.com/github/rails.git
synced 2026-04-26 03:00:59 -04:00
Rescue Errno::ECONNRESET to handle an unexpectedly closed socket connection. Improves SCGI reliability. Closes #3368, closes #6226.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5146 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
*SVN*
|
||||
|
||||
* Rescue Errno::ECONNRESET to handle an unexpectedly closed socket connection. Improves SCGI reliability. #3368, #6226 [sdsykes, fhanshaw@vesaria.com]
|
||||
|
||||
* Added that respond_to blocks will automatically set the content type to be the same as is requested [DHH]. Examples:
|
||||
|
||||
respond_to do |format|
|
||||
|
||||
@@ -173,7 +173,7 @@ end_msg
|
||||
convert_content_type!(@headers)
|
||||
output.binmode if output.respond_to?(:binmode)
|
||||
output.sync = false if output.respond_to?(:sync=)
|
||||
|
||||
|
||||
begin
|
||||
output.write(@cgi.header(@headers))
|
||||
|
||||
@@ -189,8 +189,8 @@ end_msg
|
||||
end
|
||||
|
||||
output.flush if output.respond_to?(:flush)
|
||||
rescue Errno::EPIPE => e
|
||||
# lost connection to the FCGI process -- ignore the output, then
|
||||
rescue Errno::EPIPE, Errno::ECONNRESET
|
||||
# lost connection to parent process, ignore output
|
||||
end
|
||||
end
|
||||
|
||||
@@ -207,4 +207,4 @@ end_msg
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user