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

Merge pull request #1625 from jappie/master 

Fixed the "access_token query param" (5b1f314) fix
pull/1629/head
Jordi Boggiano 2013-02-27 04:36:27 -08:00
parent 573b7a0fb7 4347cb7a55
commit 5454645cf3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -283,6 +283,8 @@ class RemoteFilesystem
$headers[] = 'Accept-Encoding: gzip'; $headers[] = 'Accept-Encoding: gzip';
} }
$options = array_replace_recursive($this->options, $additionalOptions);
if ($this->io->hasAuthentication($originUrl)) { if ($this->io->hasAuthentication($originUrl)) {
$auth = $this->io->getAuthentication($originUrl); $auth = $this->io->getAuthentication($originUrl);
if ('github.com' === $originUrl && 'x-oauth-basic' === $auth['password']) { if ('github.com' === $originUrl && 'x-oauth-basic' === $auth['password']) {
@ -293,8 +295,6 @@ class RemoteFilesystem
} }
} }
$options = array_replace_recursive($this->options, $additionalOptions);
if (isset($options['http']['header']) && !is_array($options['http']['header'])) { if (isset($options['http']['header']) && !is_array($options['http']['header'])) {
$options['http']['header'] = explode("\r\n", trim($options['http']['header'], "\r\n")); $options['http']['header'] = explode("\r\n", trim($options['http']['header'], "\r\n"));
} }