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

Put CN matching above the final recursive option merge

pull/2745/head
Pádraic Brady 2014-02-23 13:15:05 +00:00
parent 9412bb427a
commit fa54b7054c
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -338,6 +338,11 @@ class RemoteFilesystem
$headers[] = 'Accept-Encoding: gzip'; $headers[] = 'Accept-Encoding: gzip';
} }
// Setup remaining TLS options - the matching may need monitoring, esp. www vs none in CN
$host = parse_url($originUrl, PHP_URL_HOST);
$this->options['ssl']['CN_match'] = $host;
$this->options['ssl']['SNI_server_name'] = $host;
$options = array_replace_recursive($this->options, $additionalOptions); $options = array_replace_recursive($this->options, $additionalOptions);
if ($this->io->hasAuthentication($originUrl)) { if ($this->io->hasAuthentication($originUrl)) {
@ -357,17 +362,6 @@ class RemoteFilesystem
$options['http']['header'][] = $header; $options['http']['header'][] = $header;
} }
// Setup remaining TLS options - the matching may need monitoring, esp. www vs none in CN
$host = parse_url($originUrl, PHP_URL_HOST);
$this->options['ssl']['CN_match'] = $host;
$this->options['ssl']['SNI_server_name'] = $host;
/**
* Setup TLS options CN_match and SNI_server_name based on URL given
*/
$parts = parse_url($originUrl);
return $options; return $options;
} }