summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-05 10:24:53 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-05 10:24:53 +0000
commita0e4956dce4dfa1f42f0377400078e98317ef54b (patch)
tree154bf5145f49b3b8856d9b18c0c1eae4b6a36b29
parent4b8cb23a365f4d8dafc51a3b92e2b99c38a18623 (diff)
* lib/webrick/server.rb: Stop lisntner loop properly.
[ruby-core:66085] [Bug #10478] Fixed by Charles Nutter. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48285 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 e5d914c596..627ced3d77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Nov 5 19:20:08 2014 Tanaka Akira <akr@fsij.org>
+
+ * lib/webrick/server.rb: Stop lisntner loop properly.
+ [ruby-core:66085] [Bug #10478] Fixed by Charles Nutter.
+
Wed Nov 5 17:20:29 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* include/ruby/intern.h (rb_disable_super, rb_enable_super): warn
diff --git a/lib/webrick/server.rb b/lib/webrick/server.rb
index 7a3632b0b5..d173c22906 100644
--- a/lib/webrick/server.rb
+++ b/lib/webrick/server.rb
@@ -173,7 +173,7 @@ module WEBrick
begin
if svrs = IO.select([shutdown_pipe_r, *@listeners], nil, nil, 2.0)
if svrs[0].include? shutdown_pipe_r
- return
+ break
end
svrs[0].each{|svr|
@tokens.pop # blocks while no token is there.