From 834c252e5e5afe87843aed00a700f6080503b03b Mon Sep 17 00:00:00 2001 From: normal Date: Wed, 18 Oct 2017 23:23:33 +0000 Subject: webrick: fix up r60172 and r60208 Thanks to MSP-Greg (Greg L) for helping with this. * lib/webrick/server.rb (start_thread): fix non-local return introduced in r60208 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60210 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/webrick/server.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/webrick/server.rb') diff --git a/lib/webrick/server.rb b/lib/webrick/server.rb index 0c853b240c..a2add48b7c 100644 --- a/lib/webrick/server.rb +++ b/lib/webrick/server.rb @@ -294,13 +294,13 @@ module WEBrick raise end if sock.respond_to?(:sync_close=) && @config[:SSLStartImmediately] - WEBrick::Utils.timeout(@config[:RequestTimeout]) do - begin + begin + WEBrick::Utils.timeout(@config[:RequestTimeout]) do sock.accept # OpenSSL::SSL::SSLSocket#accept - rescue Errno::ECONNRESET, Errno::ECONNABORTED, - Errno::EPROTO, Errno::EINVAL - return end + rescue Errno::ECONNRESET, Errno::ECONNABORTED, + Errno::EPROTO, Errno::EINVAL + return end end call_callback(:AcceptCallback, sock) -- cgit v1.2.3