aboutsummaryrefslogtreecommitdiffstats
path: root/lib/webrick/httpserver.rb
diff options
context:
space:
mode:
authorgotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-08-19 06:00:36 +0000
committergotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-08-19 06:00:36 +0000
commit65652ecdb5145fae92e3c86611a4425a476da6ec (patch)
treeeedc2d207ffde1876c9d7271f8492741ee065584 /lib/webrick/httpserver.rb
parent90e010abb9efeaaf706c363af31beedf65c8be3b (diff)
downloadruby-65652ecdb5145fae92e3c86611a4425a476da6ec.tar.gz
* lib/webrick/ssl.rb: new file; SSL/TLS enhancement for GenericServer.
* lib/webrick/https.rb: SSLSocket handling is moved to webrick/ssl.rb. * lib/webrick/compat.rb (File::fnmatch): remove old migration code. * lib/webrick/httpserver.rb (HTTPServer#run): ditto. * lib/webrick/server.rb (GenericServer#listen): the body of this method is pull out as Utils::create_lisnteners. * lib/webrick/utils.rb (Utils::create_lisnteners): new method. * lib/webrick/server.rb (GenericServer#start): should not through unknown errors. and refine comments. * ext/openssl/lib/openssl/ssl.rb (SSLServer#accept): should close socket if SSLSocket raises error. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4409 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/webrick/httpserver.rb')
-rw-r--r--lib/webrick/httpserver.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/webrick/httpserver.rb b/lib/webrick/httpserver.rb
index df06e19e2c..a3da99db1a 100644
--- a/lib/webrick/httpserver.rb
+++ b/lib/webrick/httpserver.rb
@@ -58,7 +58,7 @@ module WEBrick
res.set_error(ex)
rescue HTTPStatus::Status => ex
res.status = ex.code
- rescue StandardError, NameError => ex # for Ruby 1.6
+ rescue StandardError => ex
@logger.error(ex)
res.set_error(ex, true)
ensure