Merge branch '1.1'

2016-05-17 23:02:40 +01:00 · 2016-05-17 23:02:40 +01:00 · e2c3bc5e89
parent 9dc6490403 3ac822d5e2
commit e2c3bc5e89
1 changed files with 4 additions and 1 deletions
--- a/src/Composer/Util/RemoteFilesystem.php
+++ b/src/Composer/Util/RemoteFilesystem.php
@ -233,7 +233,10 @@ class RemoteFilesystem
        $origFileUrl = $fileUrl;

        if (isset($options['github-token'])) {
+            // only add the access_token if it is actually a github URL (in case we were redirected to S3)
+            if (preg_match('{^https?://([a-z0-9-]+\.)*github\.com/}', $fileUrl)) {
                $fileUrl .= (false === strpos($fileUrl, '?') ? '?' : '&') . 'access_token='.$options['github-token'];
+            }
            unset($options['github-token']);
        }