diff options
author | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-18 23:23:33 +0000 |
---|---|---|
committer | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-18 23:23:33 +0000 |
commit | d20a373908292364d0f03346c251dacb2ed1a6ce (patch) | |
tree | 978cba7bf0a74c97b3b4859397b16689ee40e9b4 /lib/webrick | |
parent | 33c2ee4e846cc34c4ad77b5a4923b58cec8214b0 (diff) | |
download | ruby-d20a373908292364d0f03346c251dacb2ed1a6ce.tar.gz |
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
Diffstat (limited to 'lib/webrick')
-rw-r--r-- | lib/webrick/server.rb | 10 |
1 files changed, 5 insertions, 5 deletions
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) |