From f79255df29503eca455c2cf045cd332c805b3730 Mon Sep 17 00:00:00 2001 From: Rob Bast Date: Wed, 20 Jan 2016 21:35:06 +0100 Subject: [PATCH] make sure passed options are merged into defaults before checking --- src/Composer/Util/RemoteFilesystem.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Composer/Util/RemoteFilesystem.php b/src/Composer/Util/RemoteFilesystem.php index 5f2d0bfa5..da5dcd25f 100644 --- a/src/Composer/Util/RemoteFilesystem.php +++ b/src/Composer/Util/RemoteFilesystem.php @@ -623,6 +623,10 @@ class RemoteFilesystem ) ); + if (isset($options['ssl'])) { + $defaults['ssl'] = array_merge_recursive($defaults['ssl'], $options['ssl']); + } + /** * Attempt to find a local cafile or throw an exception if none pre-set * The user may go download one if this occurs.