normal	2017-10-19 08:34:02 +0900 (Thu, 19 Oct 2017)

  New Revision: 60211

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

  Log:
    webrick: fix up r60172 and r60210
    
    Thanks to MSP-Greg (Greg L) for helping with this.
    
    * lib/webrick/server.rb (start_thread): properly fix non-local return
      introduced in r60208 and r60210

  Modified files:
    trunk/lib/webrick/server.rb
Index: lib/webrick/server.rb
===================================================================
--- lib/webrick/server.rb	(revision 60210)
+++ lib/webrick/server.rb	(revision 60211)
@@ -294,13 +294,13 @@ module WEBrick https://github.com/ruby/ruby/blob/trunk/lib/webrick/server.rb#L294
             raise
           end
           if sock.respond_to?(:sync_close=) && @config[:SSLStartImmediately]
-            begin
-              WEBrick::Utils.timeout(@config[:RequestTimeout]) do
+            WEBrick::Utils.timeout(@config[:RequestTimeout]) do
+              begin
                 sock.accept # OpenSSL::SSL::SSLSocket#accept
+              rescue Errno::ECONNRESET, Errno::ECONNABORTED,
+                     Errno::EPROTO, Errno::EINVAL
+                Thread.exit
               end
-            rescue Errno::ECONNRESET, Errno::ECONNABORTED,
-                   Errno::EPROTO, Errno::EINVAL
-              return
             end
           end
           call_callback(:AcceptCallback, sock)

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