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

The origin may not be the remote host

pull/4798/head
Chris Smith 2016-01-24 19:09:35 +00:00
parent 304c268c3b
commit 74aa73e841
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -561,11 +561,7 @@ class RemoteFilesystem
// Setup remaining TLS options - the matching may need monitoring, esp. www vs none in CN // Setup remaining TLS options - the matching may need monitoring, esp. www vs none in CN
if ($this->disableTls === false && PHP_VERSION_ID < 50600) { if ($this->disableTls === false && PHP_VERSION_ID < 50600) {
if (!preg_match('{^https?://}', $this->fileUrl)) {
$host = $originUrl;
} else {
$host = parse_url($this->fileUrl, PHP_URL_HOST); $host = parse_url($this->fileUrl, PHP_URL_HOST);
}
if ($host === 'github.com' || $host === 'api.github.com') { if ($host === 'github.com' || $host === 'api.github.com') {
$host = '*.github.com'; $host = '*.github.com';