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

Follow-up coding standard fixes

pull/649/head
Maxim Chernyshev 2012-05-02 15:16:36 +08:00
parent 37476eb61f
commit 1ae0a1b7af
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,12 +43,10 @@ final class StreamContextFactory
if (isset($proxyPort)) {
$proxyURL .= ":" . $proxyPort;
} else {
if ('http://' == substr($proxyURL, 0, 7)) {
$proxyURL .= ":80";
} else if ('https://' == substr($proxyURL, 0, 8)) {
$proxyURL .= ":443";
}
} else if ('http://' == substr($proxyURL, 0, 7)) {
$proxyURL .= ":80";
} else if ('https://' == substr($proxyURL, 0, 8)) {
$proxyURL .= ":443";
}
// http(s):// is not supported in proxy
@ -75,14 +73,13 @@ final class StreamContextFactory
$auth = base64_encode($auth);
// Preserve headers if already set in default options
if (isset($defaultOptions['http']) && isset($defaultOptions['http']['header'])) {
if (isset($defaultOptions['http']['header'])) {
$defaultOptions['http']['header'] .= "Proxy-Authorization: Basic {$auth}\r\n";
} else {
$options['http']['header'] = "Proxy-Authorization: Basic {$auth}\r\n";
}
}
}
$options = array_merge_recursive($options, $defaultOptions);
return stream_context_create($options, $defaultParams);