From dc5a2c1764b1da3cfa85d8910338eb72cd4da96c Mon Sep 17 00:00:00 2001
From: Markus Reiter
Date: Fri, 4 Aug 2017 16:24:29 +0200
Subject: Simplify CurlDownloadStrategy.

---
 Library/Homebrew/dev-cmd/audit.rb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'Library/Homebrew/dev-cmd/audit.rb')

diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb
index 1f07fa89e..b3e0785a5 100644
--- a/Library/Homebrew/dev-cmd/audit.rb
+++ b/Library/Homebrew/dev-cmd/audit.rb
@@ -242,12 +242,10 @@ class FormulaAuditor
 
   def self.http_content_headers_and_checksum(url, hash_needed: false, user_agent: :default)
     max_time = hash_needed ? "600" : "25"
-    args = curl_args(
-      extra_args: ["--connect-timeout", "15", "--include", "--max-time", max_time, url],
-      show_output: true,
-      user_agent: user_agent,
+    output, = curl_output(
+      "--connect-timeout", "15", "--include", "--max-time", max_time, "--location", url,
+      user_agent: user_agent
     )
-    output = Open3.popen3(*args) { |_, stdout, _, _| stdout.read }
 
     status_code = :unknown
     while status_code == :unknown || status_code.to_s.start_with?("3")
-- 
cgit v1.2.3