summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-10-23 11:29:29 +0000
committergotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-10-23 11:29:29 +0000
commit93924c119fad876d12b80eb7bbce725acb12c25b (patch)
tree90eeb5b8f79c8418613583c4e812d20254ea7c6c
parent28decb2237381ad8e8a4815b266c2eb022951d52 (diff)
downloadruby-93924c119fad876d12b80eb7bbce725acb12c25b.tar.gz
ruby-93924c119fad876d12b80eb7bbce725acb12c25b.tar.xz
ruby-93924c119fad876d12b80eb7bbce725acb12c25b.zip
* lib/webrick/server.rb (GenericServer#start): should rescue
IOError from IO::accept. [ruby-dev:21692] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@4838 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/webrick/server.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e76ec5acb..4cc96ab4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct 23 20:25:32 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * lib/webrick/server.rb (GenericServer#start): should rescue
+ IOError from IO::accept. [ruby-dev:21692]
+
Thu Oct 23 17:59:36 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (ruby_cleanup): initialize stack bottom for embedding.
diff --git a/lib/webrick/server.rb b/lib/webrick/server.rb
index 77519bf8e..f89115f03 100644
--- a/lib/webrick/server.rb
+++ b/lib/webrick/server.rb
@@ -99,7 +99,7 @@ module WEBrick
rescue Errno::ECONNRESET, Errno::ECONNABORTED, Errno::EPROTO => ex
# TCP connection was established but RST segment was sent
# from peer before calling TCPServer#accept.
- rescue Errno::EBADF => ex
+ rescue Errno::EBADF, IOError => ex
# if the listening socket was closed in GenericServer#shutdown,
# IO::select raise it.
rescue => ex