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

Merge pull request #17571 from Homebrew/ignore-last-modified-header-if-invalid

Browse Source
This commit is contained in:
Mike McQuaid 2024-06-27 12:54:39 +01:00 committed by GitHub
commit 5f3af23cdc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Library/Homebrew/download_strategy.rb
View File

@ -518,10 +518,13 @@ class CurlDownloadStrategy < AbstractFileDownloadStrategy
[*parse_content_disposition.call("Content-Disposition: #{header}")] [*parse_content_disposition.call("Content-Disposition: #{header}")]
end end
time = parsed_headers time = parsed_headers
.flat_map { |headers| [*headers["last-modified"]] } .flat_map { |headers| [*headers["last-modified"]] }
.map { |t| t.match?(/^\d+$/) ? Time.at(t.to_i) : Time.parse(t) } .filter_map do |t|
.last t.match?(/^\d+$/) ? Time.at(t.to_i) : Time.parse(t)
rescue ArgumentError # When `Time.parse` gets a badly formatted date.
nil
end
file_size = parsed_headers file_size = parsed_headers
.flat_map { |headers| [*headers["content-length"]&.to_i] } .flat_map { |headers| [*headers["content-length"]&.to_i] }
@ -530,7 +533,7 @@ class CurlDownloadStrategy < AbstractFileDownloadStrategy
is_redirection = url != final_url is_redirection = url != final_url
basename = filenames.last || parse_basename(final_url, search_query: !is_redirection) basename = filenames.last || parse_basename(final_url, search_query: !is_redirection)
@resolved_info_cache[url] = [final_url, basename, time, file_size, is_redirection] @resolved_info_cache[url] = [final_url, basename, time.last, file_size, is_redirection]
end end
def _fetch(url:, resolved_url:, timeout:) def _fetch(url:, resolved_url:, timeout:)