From 0b8a9bc1a14d8513ab57423fe028d72a52b38b3d Mon Sep 17 00:00:00 2001 From: Rylan Polster Date: Wed, 24 Mar 2021 01:22:03 -0400 Subject: [PATCH] Revert "Merge pull request #10898 from reitermarkus/audit-timeout" This reverts commit 6eaeba184bee5ad42269819c362ab18e9c70b3fa, reversing changes made to 28b176567992f8d323d73a0a1367d8239e34e8a4. --- Library/Homebrew/utils/curl.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Library/Homebrew/utils/curl.rb b/Library/Homebrew/utils/curl.rb index 0a25609653..f6d7cbea75 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.lines.last.chomp if timeout && result.status.exitstatus == 28 + raise Timeout::Error, result.stderr.chomp if result.status.exitstatus == 28 # Error in the HTTP2 framing layer if result.status.exitstatus == 16 @@ -176,12 +176,9 @@ module Utils hash_needed = false if url != secure_url user_agents.each do |user_agent| - secure_details = begin + secure_details = 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])