webrick: fix up r60172 and revert r60189

Thanks to MSP-Greg (Greg L) for helping with this.

* lib/webrick/server.rb (start_thread): ignore ECONNRESET, ECONNABORTED,
  EPROTO, and EINVAL on TLS negotiation errors the same way they
  were ignored before r60172 in the accept_client method of the
  main acceptor thread.
  [Bug #14013] [Bug #14005]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60208 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
normal 2017-10-18 21:45:34 +00:00
Родитель 4a375f3ef5
Коммит 3b1db7d319
1 изменённых файлов: 6 добавлений и 9 удалений

Просмотреть файл

@ -295,15 +295,12 @@ module WEBrick
end
if sock.respond_to?(:sync_close=) && @config[:SSLStartImmediately]
WEBrick::Utils.timeout(@config[:RequestTimeout]) do
# we must call OpenSSL::SSL::SSLSocket#accept_nonblock until
# it stop returning wait_* symbols:
case ret = sock.accept_nonblock(exception: false)
when :wait_readable, :wait_writable
sock.to_io.__send__(ret)
else
break
end while true
begin
sock.accept # OpenSSL::SSL::SSLSocket#accept
rescue Errno::ECONNRESET, Errno::ECONNABORTED,
Errno::EPROTO, Errno::EINVAL
return
end
end
end
call_callback(:AcceptCallback, sock)