From b4d87af9592b65ecfd2336cfe04655dad84a09d8 Mon Sep 17 00:00:00 2001
From: Jordan Alliot <jordan.alliot@gmail.com>
Date: Sat, 21 Jan 2012 16:29:17 +0100
Subject: [PATCH] Changed array_merge to array_merge_recursive

---
 src/Composer/Util/StreamContextFactory.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Composer/Util/StreamContextFactory.php b/src/Composer/Util/StreamContextFactory.php
index 8ca3ccd69..4ea31da4d 100644
--- a/src/Composer/Util/StreamContextFactory.php
+++ b/src/Composer/Util/StreamContextFactory.php
@@ -49,7 +49,7 @@ final class StreamContextFactory
             );
         }
 
-        $options = array_merge($options, $defaultOptions);
+        $options = array_merge_recursive($options, $defaultOptions);
         
         return stream_context_create($options, $defaultParams);
     }