Merge URL :header with :headers.

This commit is contained in:
alejandro.alvarez.acero 2023-04-17 11:47:33 +02:00 committed by Markus Reiter
parent 9b60fcf7ac
commit 555ce9a5b0
No known key found for this signature in database
GPG Key ID: 245293B51702655B

View File

@ -378,6 +378,14 @@ class CurlDownloadStrategy < AbstractFileDownloadStrategy
super
@try_partial = true
@mirrors = meta.fetch(:mirrors, [])
# Merge `:header` with `:headers`.
if (header = meta.delete(:header))
meta[:headers] ||= []
meta[:headers] << header
end
super
end
# Download and cache the file at {#cached_location}.
@ -543,7 +551,7 @@ class CurlDownloadStrategy < AbstractFileDownloadStrategy
args += ["--user", meta.fetch(:user)] if meta.key?(:user)
args += [meta[:header], meta[:headers]].flatten.compact.flat_map { |h| ["--header", h.strip] }
args += meta.fetch(:headers, []).flat_map { |h| ["--header", h.strip] }
if meta[:insecure]
unless @insecure_warning_shown