From cdcd216237276fac07e6934e31eaeca5c3944f23 Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Wed, 24 Mar 2021 10:55:38 +0100 Subject: [PATCH] Revert "Revert "Merge pull request #10898 from reitermarkus/audit-timeout"" This reverts commit 0b8a9bc1a14d8513ab57423fe028d72a52b38b3d. --- Library/Homebrew/utils/curl.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/utils/curl.rb b/Library/Homebrew/utils/curl.rb index f6d7cbea7..0a2560965 100644 --- a/Library/Homebrew/utils/curl.rb +++ b/Library/Homebrew/utils/curl.rb @@ -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])