mirrors/brew
1
0
Fork 0
mirror of https://github.com/Homebrew/brew.git synced 2025-07-14 16:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert "Merge pull request #10898 from reitermarkus/audit-timeout""

Browse Source 
This reverts commit 0b8a9bc1a14d8513ab57423fe028d72a52b38b3d.
This commit is contained in:
Markus Reiter 2021-03-24 10:55:38 +01:00
parent 24c9b599a6
commit cdcd216237
No known key found for this signature in database
GPG Key ID: 245293B51702655B
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/utils/curl.rb
View File

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