summaryrefslogtreecommitdiffstats
path: root/lib/webrick/httpresponse.rb
diff options
context:
space:
mode:
authorgotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-12-04 00:12:14 +0000
committergotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-12-04 00:12:14 +0000
commitc6ab282224b451dbc412a7b5ea02dda197fe8054 (patch)
treeb6b13564030628640e7026271b47e878891a4c9c /lib/webrick/httpresponse.rb
parent6facf92c611719f5cb1995fc19faeeae38bc2f0b (diff)
downloadruby-c6ab282224b451dbc412a7b5ea02dda197fe8054.tar.gz
ruby-c6ab282224b451dbc412a7b5ea02dda197fe8054.tar.xz
ruby-c6ab282224b451dbc412a7b5ea02dda197fe8054.zip
* lib/webrick/server.rb (GenericServer#start): should rescue
Exception to avoid unexpected aborting. [ruby-core:01853] * lib/webrick/server.rb (GenericServer#start_thread): should check that peeraddr isn't nil before printing. * lib/webrick/httpresponse.rb (HTTPResponse#start_thread): should rescue Exception to avoid unexpected aborting of thread. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5098 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/webrick/httpresponse.rb')
-rw-r--r--lib/webrick/httpresponse.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/webrick/httpresponse.rb b/lib/webrick/httpresponse.rb
index 667c4c46c..9d6e5522e 100644
--- a/lib/webrick/httpresponse.rb
+++ b/lib/webrick/httpresponse.rb
@@ -84,10 +84,10 @@ module WEBrick
setup_header()
send_header(socket)
send_body(socket)
- rescue Errno::EPIPE
- @logger.error("HTTPResponse#send_response: EPIPE occured.")
+ rescue Errno::EPIPE, Errno::ECONNRESET, Errno::ENOTCONN => ex
+ @logger.debug(ex)
@keep_alive = false
- rescue => ex
+ rescue Exception => ex
@logger.error(ex)
@keep_alive = false
end