From 4347cb7a55acb775f38fb45eaba43190cb9ca66d Mon Sep 17 00:00:00 2001 From: "Jasper N. Brouwer" Date: Wed, 27 Feb 2013 13:23:59 +0100 Subject: [PATCH] Fixed the "access_token query param" (5b1f314) fix --- src/Composer/Util/RemoteFilesystem.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Composer/Util/RemoteFilesystem.php b/src/Composer/Util/RemoteFilesystem.php index 15b1cf9bf..79efd3298 100644 --- a/src/Composer/Util/RemoteFilesystem.php +++ b/src/Composer/Util/RemoteFilesystem.php @@ -283,6 +283,8 @@ class RemoteFilesystem $headers[] = 'Accept-Encoding: gzip'; } + $options = array_replace_recursive($this->options, $additionalOptions); + if ($this->io->hasAuthentication($originUrl)) { $auth = $this->io->getAuthentication($originUrl); 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'])) { $options['http']['header'] = explode("\r\n", trim($options['http']['header'], "\r\n")); }