summaryrefslogtreecommitdiff
path: root/lib/webrick/server.rb
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-10-18 21:45:34 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-10-18 21:45:34 +0000
commit3b1db7d319c5f8f4da9b600c0d146bf1d74e4c7d (patch)
tree1c1e61d8299259c7f772b3215e98d370bd4e15d9 /lib/webrick/server.rb
parent4a375f3ef518797bc8788abf0891655d79aa719c (diff)
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
Diffstat (limited to 'lib/webrick/server.rb')
-rw-r--r--lib/webrick/server.rb15
1 files changed, 6 insertions, 9 deletions
diff --git a/lib/webrick/server.rb b/lib/webrick/server.rb
index 2d67827..0c853b2 100644
--- a/lib/webrick/server.rb
+++ b/lib/webrick/server.rb
@@ -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)