зеркало из https://github.com/github/ruby.git
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 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60211 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
834c252e5e
Коммит
cda27e1a6d
|
@ -294,13 +294,13 @@ module WEBrick
|
|||
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)
|
||||
|
|
Загрузка…
Ссылка в новой задаче