Project

General

Profile

Bug #14013 » webrick_60172_fix.patch

MSP-Greg (Greg L), 10/14/2017 03:33 AM

View differences:

lib/webrick/server.rb
end
if sock.respond_to?(:sync_close=) && @config[:SSLStartImmediately]
WEBrick::Utils.timeout(@config[:RequestTimeout]) do
sock.accept # OpenSSL::SSL::SSLSocket#accept
ret = sock.accept_nonblock(exception: false)
case ret
when :wait_readable
t = IO.select([sock.to_io])
t.is_a?(Array) ? t[0] : nil
when :wait_writeable
t = IO.select(nil, [sock.to_io])
t.is_a?(Array) ? t[0] : nil
else
ret
end
end
end
call_callback(:AcceptCallback, sock)
test/net/http/test_https.rb
skip $!
end
if ENV["RUBY_OPENSSL_TEST_ALL"]
def test_verify
http = Net::HTTP.new("ssl.netlab.jp", 443)
http.use_ssl = true
assert(
(http.request_head("/"){|res| } rescue false),
"The system may not have default CA certificate store."
)
end
def test_verify
skip("No cert file file found.") unless
File.exist?(OpenSSL::X509::DEFAULT_CERT_FILE ||'') ||
File.exist?(ENV['SSL_CERT_FILE'] || '')
http = Net::HTTP.new("ssl.netlab.jp", 443)
http.use_ssl = true
assert(
(http.request_head("/"){|res| } rescue false),
"The system may not have default CA certificate store."
)
end
def test_verify_none
(2-2/4)