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

Merge default options after buildind proxy one

pull/224/head
Jordan Alliot 2012-01-20 04:35:20 -08:00
parent 054faef5eb
commit 468eb0ed8d
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Composer/Util/StreamContextFactory.php
View File

@ -22,14 +22,14 @@ final class StreamContextFactory
/**
* Creates a context supporting HTTP proxies
*
* @param array $options Options to merge with the default
* @param array $params Parameters to specify on the context
* @param array $defaultOptions Options to merge with the default
* @param array $defaultParams Parameters to specify on the context
* @return resource Default context
* @throws \RuntimeException if https proxy required and OpenSSL uninstalled
*/
static public function getContext(array $options = array(), array $params = array())
static public function getContext(array $defaultOptions = array(), array $defaultParams = array())
{
$options = array_merge(array('http' => array()), $options);
$options = array('http' => array());
// Handle system proxy
if (isset($_SERVER['HTTP_PROXY']) || isset($_SERVER['http_proxy'])) {
@ -49,6 +49,8 @@ final class StreamContextFactory
);
}
return stream_context_create($options, $params);
$options = array_merge($options, $defaultOptions);
return stream_context_create($options, $defaultParams);
}
}