Merge pull request #10898 from reitermarkus/audit-timeout

Ignore timeout when checking for HTTPS availability.
This commit is contained in:
Markus Reiter 2021-03-23 00:58:54 +01:00 committed by GitHub
commit 6eaeba184b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -85,7 +85,7 @@ module Utils
return result if result.success? || !args.exclude?("--http1.1")
raise Timeout::Error, result.stderr.chomp if result.status.exitstatus == 28
raise Timeout::Error, result.stderr.lines.last.chomp if timeout && result.status.exitstatus == 28
# Error in the HTTP2 framing layer
if result.status.exitstatus == 16
@ -176,9 +176,12 @@ module Utils
hash_needed = false
if url != secure_url
user_agents.each do |user_agent|
secure_details =
secure_details = begin
curl_http_content_headers_and_checksum(secure_url, specs: specs, hash_needed: true,
user_agent: user_agent)
rescue Timeout::Error
next
end
next unless http_status_ok?(secure_details[:status])