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

Merge pull request #8117 from Homebrew/revert-8076-301-redirect

Browse Source 
Revert "curl: alert on 301 redirect"
This commit is contained in:
Mike McQuaid 2020-07-28 11:02:28 +01:00 committed by GitHub
commit 376094560f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,8 +127,6 @@ def curl_check_http_content(url, user_agents: [:default], check_content: false,
return "The URL #{url} is not reachable"
end
return "#{url} permanently redirects to #{details[:permanent_redirect]}" if url != details[:permanent_redirect]
unless http_status_ok?(details[:status])
return "The URL #{url} is not reachable (HTTP status code #{details[:status]})"
end
@ -205,23 +203,20 @@ def curl_http_content_headers_and_checksum(url, hash_needed: false, user_agent:
status_code = headers[%r{HTTP/.* (\d+)}, 1]
location = headers[/^Location:\s*(.*)$/i, 1]
final_url = location.chomp if location
permanent_redirect = location.chomp if status_code == "301"
end
output_hash = Digest::SHA256.file(file.path) if hash_needed
final_url ||= url
permanent_redirect ||= url
{
url: url,
final_url: final_url,
permanent_redirect: permanent_redirect,
status: status_code,
etag: headers[%r{ETag: ([wW]/)?"(([^"]|\\")*)"}, 2],
content_length: headers[/Content-Length: (\d+)/, 1],
file_hash: output_hash,
file: output,
url: url,
final_url: final_url,
status: status_code,
etag: headers[%r{ETag: ([wW]/)?"(([^"]|\\")*)"}, 2],
content_length: headers[/Content-Length: (\d+)/, 1],
file_hash: output_hash,
file: output,
}
ensure
file.unlink