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

Always pass headers as array to downloader, if present

Browse Source 
We still need to support it being named "header" in the Cask url stanza.
This commit is contained in:
Don Chea 2023-06-28 09:11:14 -04:00
parent 0e9a8418fc
commit 907a9238c2
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/cask/url.rb
View File

@ -57,6 +57,8 @@ module Cask
@uri = URI(uri) @uri = URI(uri)
header = Array(header) unless header.nil?
specs = {} specs = {}
specs[:verified] = @verified = verified specs[:verified] = @verified = verified
specs[:using] = @using = using specs[:using] = @using = using
@ -67,7 +69,7 @@ module Cask
specs[:trust_cert] = @trust_cert = trust_cert specs[:trust_cert] = @trust_cert = trust_cert
specs[:cookies] = @cookies = cookies specs[:cookies] = @cookies = cookies
specs[:referer] = @referer = referer specs[:referer] = @referer = referer
specs[:header] = @header = header specs[:headers] = @header = header
specs[:user_agent] = @user_agent = user_agent || :default specs[:user_agent] = @user_agent = user_agent || :default
specs[:data] = @data = data specs[:data] = @data = data
specs[:only_path] = @only_path = only_path specs[:only_path] = @only_path = only_path

7
Library/Homebrew/download_strategy.rb
View File

@ -389,12 +389,7 @@ class CurlDownloadStrategy < AbstractFileDownloadStrategy
# Merge `:header` with `:headers`. # Merge `:header` with `:headers`.
if (header = meta.delete(:header)) if (header = meta.delete(:header))
meta[:headers] ||= [] meta[:headers] ||= []
meta[:headers] << header
if header.is_a?(Array)
meta[:headers] += header
else
meta[:headers] << header
end
end end
super super