Explorar el Código

Fix CN matching to use correct host (should almost eliminate TLS retries where wildcard CNs are used)

Pádraic Brady hace 11 años
padre
commit
8abff794cd
Se han modificado 1 ficheros con 2 adiciones y 2 borrados
  1. 2 2
      src/Composer/Util/RemoteFilesystem.php

+ 2 - 2
src/Composer/Util/RemoteFilesystem.php

@@ -343,10 +343,10 @@ class RemoteFilesystem
 
         // Setup remaining TLS options - the matching may need monitoring, esp. www vs none in CN
         if ($this->disableTls === false) {
-            if (!preg_match("|^https?://|", $originUrl)) {
+            if (!preg_match("|^https?://|", $this->fileUrl)) {
                 $host = $originUrl;
             } else {
-                $host = parse_url($originUrl, PHP_URL_HOST);
+                $host = parse_url($this->fileUrl, PHP_URL_HOST);
             }
             /**
              * This is sheer painful, but hopefully it'll be a footnote once SAN support