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

Merge pull request #912 from WanWizard/master 

fixed getContext() choking on empty HTTP_PROXY environment variable
pull/911/merge
Jordi Boggiano 2012-07-15 08:44:03 -07:00
parent bf245ab885 e24226162d
commit b007836a13
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/StreamContextFactory.php
View File

@ -32,9 +32,9 @@ final class StreamContextFactory
$options = array('http' => array()); $options = array('http' => array());
// Handle system proxy // Handle system proxy
if (isset($_SERVER['HTTP_PROXY']) || isset($_SERVER['http_proxy'])) { if (!empty($_SERVER['HTTP_PROXY']) || !empty($_SERVER['http_proxy'])) {
// Some systems seem to rely on a lowercased version instead... // Some systems seem to rely on a lowercased version instead...
$proxy = parse_url(isset($_SERVER['http_proxy']) ? $_SERVER['http_proxy'] : $_SERVER['HTTP_PROXY']); $proxy = parse_url(!empty($_SERVER['http_proxy']) ? $_SERVER['http_proxy'] : $_SERVER['HTTP_PROXY']);
} }
if (!empty($proxy)) { if (!empty($proxy)) {