admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #18279 from samford/curl-work-with-56-exit_status

Browse Source
This commit is contained in:
Patrick Linnane 2024-09-08 18:38:02 -07:00 committed by GitHub
commit 40648b5381
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/utils/curl.rb
View File

@ -22,6 +22,10 @@ module Utils
# code that is >= 400. # code that is >= 400.
CURL_HTTP_RETURNED_ERROR_EXIT_CODE = 22 CURL_HTTP_RETURNED_ERROR_EXIT_CODE = 22
# Error returned when curl gets an error from the lowest networking layers
# that the receiving of data failed.
CURL_RECV_ERROR_EXIT_CODE = 56
# This regex is used to extract the part of an ETag within quotation marks, # This regex is used to extract the part of an ETag within quotation marks,
# ignoring any leading weak validator indicator (`W/`). This simplifies # ignoring any leading weak validator indicator (`W/`). This simplifies
# ETag comparison in `#curl_check_http_content`. # ETag comparison in `#curl_check_http_content`.
@ -38,6 +42,7 @@ module Utils
private_constant :CURL_WEIRD_SERVER_REPLY_EXIT_CODE, private_constant :CURL_WEIRD_SERVER_REPLY_EXIT_CODE,
:CURL_HTTP_RETURNED_ERROR_EXIT_CODE, :CURL_HTTP_RETURNED_ERROR_EXIT_CODE,
:CURL_RECV_ERROR_EXIT_CODE,
:ETAG_VALUE_REGEX, :HTTP_RESPONSE_BODY_SEPARATOR, :ETAG_VALUE_REGEX, :HTTP_RESPONSE_BODY_SEPARATOR,
:HTTP_STATUS_LINE_REGEX :HTTP_STATUS_LINE_REGEX
@ -237,8 +242,11 @@ module Utils
# We still receive usable headers with certain non-successful exit # We still receive usable headers with certain non-successful exit
# statuses, so we special case them below. # statuses, so we special case them below.
if result.success? || if result.success? || [
[CURL_WEIRD_SERVER_REPLY_EXIT_CODE, CURL_HTTP_RETURNED_ERROR_EXIT_CODE].include?(result.exit_status) CURL_WEIRD_SERVER_REPLY_EXIT_CODE,
CURL_HTTP_RETURNED_ERROR_EXIT_CODE,
CURL_RECV_ERROR_EXIT_CODE,
].include?(result.exit_status)
parsed_output = parse_curl_output(result.stdout) parsed_output = parse_curl_output(result.stdout)
if request_args.empty? if request_args.empty?