From 308e2ff4cb08d7b5992071b9c3dcde6c6109770b Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Wed, 5 Dec 2012 16:57:54 +0100 Subject: [PATCH] Add support for headers as strings to avoid regressions, refs #1387 --- src/Composer/Util/StreamContextFactory.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Composer/Util/StreamContextFactory.php b/src/Composer/Util/StreamContextFactory.php index 5c335ce9c..02ff62a7b 100644 --- a/src/Composer/Util/StreamContextFactory.php +++ b/src/Composer/Util/StreamContextFactory.php @@ -70,6 +70,9 @@ final class StreamContextFactory // Preserve headers if already set in default options if (isset($defaultOptions['http']['header'])) { + if (is_string($defaultOptions['http']['header'])) { + $defaultOptions['http']['header'] = array($defaultOptions['http']['header']); + } $defaultOptions['http']['header'][] = "Proxy-Authorization: Basic {$auth}"; } else { $options['http']['header'] = array("Proxy-Authorization: Basic {$auth}");