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

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

pull/2745/head
Pádraic Brady 2014-02-26 20:48:39 +00:00
parent 2972ec3d86
commit 8abff794cd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -343,10 +343,10 @@ 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) { if ($this->disableTls === false) {
if (!preg_match("|^https?://|", $originUrl)) { if (!preg_match("|^https?://|", $this->fileUrl)) {
$host = $originUrl; $host = $originUrl;
} else { } 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 * This is sheer painful, but hopefully it'll be a footnote once SAN support