akr	2014-11-05 19:24:53 +0900 (Wed, 05 Nov 2014)

  New Revision: 48285

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=48285

  Log:
    * lib/webrick/server.rb: Stop lisntner loop properly.
      [ruby-core:66085] [Bug #10478] Fixed by Charles Nutter.

  Modified files:
    trunk/ChangeLog
    trunk/lib/webrick/server.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 48284)
+++ ChangeLog	(revision 48285)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Wed Nov  5 19:20:08 2014  Tanaka Akira  <akr@f...>
+
+	* 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@r...>
 
 	* include/ruby/intern.h (rb_disable_super, rb_enable_super): warn
Index: lib/webrick/server.rb
===================================================================
--- lib/webrick/server.rb	(revision 48284)
+++ lib/webrick/server.rb	(revision 48285)
@@ -173,7 +173,7 @@ module WEBrick https://github.com/ruby/ruby/blob/trunk/lib/webrick/server.rb#L173
             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.

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/