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

Fix additionalOptions getting dropped when SAN and redirect handling are combined, refs #4782

pull/4831/head
Jordi Boggiano 2016-01-26 10:43:59 +00:00
parent 03e0d65f37
commit fff5074bbf
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Composer/Util/RemoteFilesystem.php
View File

@ -208,21 +208,23 @@ class RemoteFilesystem
$this->io->setAuthentication($originUrl, urldecode($match[1]), urldecode($match[2])); $this->io->setAuthentication($originUrl, urldecode($match[1]), urldecode($match[2]));
} }
if (isset($additionalOptions['retry-auth-failure'])) { $tempAdditionalOptions = $additionalOptions;
$this->retryAuthFailure = (bool) $additionalOptions['retry-auth-failure']; if (isset($tempAdditionalOptions['retry-auth-failure'])) {
$this->retryAuthFailure = (bool) $tempAdditionalOptions['retry-auth-failure'];
unset($additionalOptions['retry-auth-failure']); unset($tempAdditionalOptions['retry-auth-failure']);
} }
$isRedirect = false; $isRedirect = false;
if (isset($additionalOptions['redirects'])) { if (isset($tempAdditionalOptions['redirects'])) {
$this->redirects = $additionalOptions['redirects']; $this->redirects = $tempAdditionalOptions['redirects'];
$isRedirect = true; $isRedirect = true;
unset($additionalOptions['redirects']); unset($tempAdditionalOptions['redirects']);
} }
$options = $this->getOptionsForUrl($originUrl, $additionalOptions); $options = $this->getOptionsForUrl($originUrl, $tempAdditionalOptions);
unset($tempAdditionalOptions);
$userlandFollow = isset($options['http']['follow_location']) && !$options['http']['follow_location']; $userlandFollow = isset($options['http']['follow_location']) && !$options['http']['follow_location'];
if ($this->io->isDebug()) { if ($this->io->isDebug()) {
@ -422,7 +424,7 @@ class RemoteFilesystem
$result = $this->get($this->originUrl, $this->fileUrl, $additionalOptions, $this->fileName, $this->progress); $result = $this->get($this->originUrl, $this->fileUrl, $additionalOptions, $this->fileName, $this->progress);
if (false !== $this->storeAuth) { if ($this->storeAuth && $this->config) {
$authHelper = new AuthHelper($this->io, $this->config); $authHelper = new AuthHelper($this->io, $this->config);
$authHelper->storeAuth($this->originUrl, $this->storeAuth); $authHelper->storeAuth($this->originUrl, $this->storeAuth);
$this->storeAuth = false; $this->storeAuth = false;