Browse Source

The origin may not be the remote host

Chris Smith 9 years ago
parent
commit
74aa73e841
1 changed files with 1 additions and 5 deletions
  1. 1 5
      src/Composer/Util/RemoteFilesystem.php

+ 1 - 5
src/Composer/Util/RemoteFilesystem.php

@@ -561,11 +561,7 @@ class RemoteFilesystem
 
         // Setup remaining TLS options - the matching may need monitoring, esp. www vs none in CN
         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') {
                 $host = '*.github.com';