Merge URL :header
with :headers
.
This commit is contained in:
parent
9b60fcf7ac
commit
555ce9a5b0
@ -378,6 +378,14 @@ class CurlDownloadStrategy < AbstractFileDownloadStrategy
|
|||||||
super
|
super
|
||||||
@try_partial = true
|
@try_partial = true
|
||||||
@mirrors = meta.fetch(:mirrors, [])
|
@mirrors = meta.fetch(:mirrors, [])
|
||||||
|
|
||||||
|
# Merge `:header` with `:headers`.
|
||||||
|
if (header = meta.delete(:header))
|
||||||
|
meta[:headers] ||= []
|
||||||
|
meta[:headers] << header
|
||||||
|
end
|
||||||
|
|
||||||
|
super
|
||||||
end
|
end
|
||||||
|
|
||||||
# Download and cache the file at {#cached_location}.
|
# 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 += ["--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]
|
if meta[:insecure]
|
||||||
unless @insecure_warning_shown
|
unless @insecure_warning_shown
|
||||||
|
Loading…
x
Reference in New Issue
Block a user