Merge branch 'feature/http-client-refactor' of https://github.com/SocalNick/zf2 into hotfix/http-client-extension-refactor

Author: weierophinney

src/Client.php

@@ -821,23 +821,10 @@ public function send(Request $request = null)
                 throw new Client\Exception\RuntimeException('Adapter does not support streaming');
             }
 
-            // Open the connection, send the request and read the response
-            $this->adapter->connect($uri->getHost(), $uri->getPort(), $secure);
+            // calling protected method to allow extending classes
+            // to wrap the interaction with the adapter
+            $response = $this->doRequest($uri, $method, $secure, $headers, $body);
 
-            if($this->config['outputstream']) {
-                if($this->adapter instanceof Client\Adapter\Stream) {
-                    $stream = $this->openTempStream();
-                    $this->adapter->setOutputStream($stream);
-                } else {
-                    throw new Exception\RuntimeException('Adapter does not support streaming');
-                }
-            }
-
-            // HTTP connection
-            $this->lastRawRequest = $this->adapter->write($method,
-                $uri, $this->config['httpversion'], $headers, $body);
-
-            $response = $this->adapter->read();
             if (! $response) {
                 throw new Exception\RuntimeException('Unable to read response, or response is empty');
             }
@@ -1274,6 +1261,39 @@ protected function flattenParametersArray($parray, $prefix = null)
         return $parameters;
     }
 
+    /**
+     * Separating this from send method allows subclasses to wrap
+     * the interaction with the adapter
+     *
+     * @param Http $uri
+     * @param string $secure
+     * @param string $method
+     * @param array $headers
+     * @param string $body
+     * @return string the raw response
+     * @throws Exception\RuntimeException
+     */
+    protected function doRequest(Http $uri, $method, $secure = false, $headers = array(), $body = '')
+    {
+        // Open the connection, send the request and read the response
+        $this->adapter->connect($uri->getHost(), $uri->getPort(), $secure);
+
+        if($this->config['outputstream']) {
+            if($this->adapter instanceof Client\Adapter\Stream) {
+                $stream = $this->openTempStream();
+                $this->adapter->setOutputStream($stream);
+            } else {
+                throw new Exception\RuntimeException('Adapter does not support streaming');
+            }
+        }
+
+        // HTTP connection
+        $this->lastRawRequest = $this->adapter->write($method,
+            $uri, $this->config['httpversion'], $headers, $body);
+
+        return $this->adapter->read();
+    }
+
     /**
      * Returns length of binary string in bytes
      *

src/Client/Adapter/Curl.php

@@ -365,7 +365,11 @@ public function write($method, $uri, $httpVersion = 1.1, $headers = array(), $bo
 
         // set additional headers
         $headers['Accept'] = '';
-        curl_setopt($this->curl, CURLOPT_HTTPHEADER, $headers);
+        $curlHeaders = array();
+        foreach ($headers as $key => $value) {
+            $curlHeaders[] = $key . ': ' . $value;
+        }
+        curl_setopt($this->curl, CURLOPT_HTTPHEADER, $curlHeaders);
 
         /**
          * Make sure POSTFIELDS is set after $curlMethod is set: