From c2bbd9df7e6d0860dc144cc12d44ed5d75efcb21 Mon Sep 17 00:00:00 2001 From: Claudia Date: Mon, 28 Jan 2019 08:10:37 +0100 Subject: [PATCH] Remove unneeded `curl_openssl_or_deps` invocation This fixes a regression introduced in #5626 [1], which removed `curl_openssl_or_deps` and left a single call in the code. [1]: https://github.com/Homebrew/brew/pull/5626 --- Library/Homebrew/dev-cmd/audit.rb | 2 +- Library/Homebrew/utils/curl.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb index e0965add21..61f14f28bb 100644 --- a/Library/Homebrew/dev-cmd/audit.rb +++ b/Library/Homebrew/dev-cmd/audit.rb @@ -1134,7 +1134,7 @@ module Homebrew # pull request. next if url =~ %r{^https://dl.bintray.com/homebrew/mirror/} - if http_content_problem = curl_check_http_content(url, require_http: curl_openssl_or_deps) + if http_content_problem = curl_check_http_content(url) problem http_content_problem end elsif strategy <= GitDownloadStrategy diff --git a/Library/Homebrew/utils/curl.rb b/Library/Homebrew/utils/curl.rb index 8c68a4ac38..5b0c5a66db 100644 --- a/Library/Homebrew/utils/curl.rb +++ b/Library/Homebrew/utils/curl.rb @@ -69,12 +69,12 @@ def curl_output(*args, **options) print_stderr: false) end -def curl_check_http_content(url, user_agents: [:default], check_content: false, strict: false, require_http: false) +def curl_check_http_content(url, user_agents: [:default], check_content: false, strict: false) return unless url.start_with? "http" details = nil user_agent = nil - hash_needed = url.start_with?("http:") && !require_http + hash_needed = url.start_with?("http:") user_agents.each do |ua| details = curl_http_content_headers_and_checksum(url, hash_needed: hash_needed, user_agent: ua) user_agent = ua