public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Forward default HttpDownloader options to RemoteFilesystem/CurlDownloader, fixes #8757

pull/8762/head
Jordi Boggiano 2020-04-10 12:10:30 +02:00
parent 86cfbdc541
commit 4cb74d33e6
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Composer/Util/HttpDownloader.php
View File

@ -155,6 +155,7 @@ class HttpDownloader
// start job // start job
$url = $job['request']['url']; $url = $job['request']['url'];
$options = $job['request']['options']; $options = $job['request']['options'];
$options = array_replace_recursive($this->options, $options);
$job['status'] = HttpDownloader::STATUS_STARTED; $job['status'] = HttpDownloader::STATUS_STARTED;
@ -236,6 +237,8 @@ class HttpDownloader
return; return;
} }
$options = array_replace_recursive($this->options, $options);
if ($job['request']['copyTo']) { if ($job['request']['copyTo']) {
$this->curl->download($resolve, $reject, $origin, $url, $options, $job['request']['copyTo']); $this->curl->download($resolve, $reject, $origin, $url, $options, $job['request']['copyTo']);
} else { } else {