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

Merge remote-tracking branch 'nbaksalyar/proxy_fix'

pull/1241/merge
Jordi Boggiano 2012-10-21 16:25:56 +02:00
parent da8dc58444 8f0f1e3aac
commit ca1dcc4659
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,7 +70,7 @@ final class StreamContextFactory
// Preserve headers if already set in default options // Preserve headers if already set in default options
if (isset($defaultOptions['http']['header'])) { if (isset($defaultOptions['http']['header'])) {
$defaultOptions['http']['header'] .= "Proxy-Authorization: Basic {$auth}\r\n"; $defaultOptions['http']['header'][] = "Proxy-Authorization: Basic {$auth}";
} else { } else {
$options['http']['header'] = "Proxy-Authorization: Basic {$auth}\r\n"; $options['http']['header'] = "Proxy-Authorization: Basic {$auth}\r\n";
} }