Merge pull request Homebrew#17356 from Homebrew/verify-fail-with-body

livecheck/strategy: verify `--fail-with-body` support
franela · May 24, 2024 · ea5023a · ea5023a
2 parents ff950e6 + 07e69b0
commit ea5023a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/Library/Homebrew/livecheck/strategy.rb b/Library/Homebrew/livecheck/strategy.rb
@@ -219,7 +219,7 @@ def self.page_content(url, homebrew_curl: false)
           stdout, stderr, status = curl_output(
             *PAGE_CONTENT_CURL_ARGS, url,
             **DEFAULT_CURL_OPTIONS,
-            use_homebrew_curl: homebrew_curl,
+            use_homebrew_curl: homebrew_curl || !curl_supports_fail_with_body?,
             user_agent:
           )
           next unless status.success?

diff --git a/Library/Homebrew/utils/curl.rb b/Library/Homebrew/utils/curl.rb
@@ -470,6 +470,13 @@ def curl_http_content_headers_and_checksum(
       T.must(file).unlink
     end
 
+    def curl_supports_fail_with_body?
+      @curl_supports_fail_with_body ||= Hash.new do |h, key|
+        h[key] = Version.new(curl_output("-V").stdout[/curl (\d+(\.\d+)+)/, 1]) >= Version.new("7.76.0")
+      end
+      @curl_supports_fail_with_body[curl_path]
+    end
+
     def curl_supports_tls13?
       @curl_supports_tls13 ||= Hash.new do |h, key|
         h[key] = quiet_system(curl_executable, "--tlsv1.3", "--head", "https://brew.sh/")