Merge branch 'master' of git://github.com/zendframework/zf2

src/Client/Adapter/Curl.php

@@ -134,6 +134,9 @@ public function setOptions($options = array())
                     $this->setCurlOption(CURLOPT_PROXYPORT, $v);
                     break;
                 default:
+                    if (is_array($v) && isset($this->config[$option]) && is_array($this->config[$option])) {
+                        $v = ArrayUtils::merge($this->config[$option], $v);
+                    }
                     $this->config[$option] = $v;
                     break;
             }

src/Headers.php

@@ -286,7 +286,7 @@ public function has($name)
     }
 
     /**
-     * Advance the pointer for this object as an interator
+     * Advance the pointer for this object as an iterator
      *
      * @return void
      */

src/Response/Stream.php

@@ -26,7 +26,7 @@ class Stream extends Response
     protected $contentLength = null;
 
     /**
-     * The portion of the body that has alredy been streamed
+     * The portion of the body that has already been streamed
      *
      * @var int
      */

test/Client/CurlTest.php

@@ -254,6 +254,30 @@ public function testSetCurlOptions()
         );
     }
 
+    /**
+     * @group 4213
+     */
+    public function testSetOptionsMergesCurlOptions()
+    {
+        $adapter = new Adapter\Curl();
+
+        $adapter->setOptions(array(
+            'curloptions' => array(
+                'foo' => 'bar',
+            ),
+        ));
+        $adapter->setOptions(array(
+            'curloptions' => array(
+                'bar' => 'baz',
+            ),
+        ));
+
+        $this->assertEquals(
+            array('curloptions' => array('foo' => 'bar', 'bar' => 'baz')),
+            $this->readAttribute($adapter, 'config')
+        );
+    }
+
     public function testWorkWithProxyConfiguration()
     {
         $adapter = new Adapter\Curl();