Merge branch 'develop' of github.com:basdenooijer/solarium into release/2.2.0

library/Solarium/Client/Adapter/ZendHttp.php

@@ -154,6 +154,7 @@ class Solarium_Client_Adapter_ZendHttp extends Solarium_Client_Adapter
 
         $client->setMethod($request->getMethod());
         $client->setUri($this->getBaseUri() . $request->getUri());
+        $client->setHeaders($request->getHeaders());
         $client->setRawData($request->getRawData());
 
         $response = $client->request();

tests/Solarium/Client/Adapter/ZendHttpTest.php

@@ -88,10 +88,14 @@ class Solarium_Client_Adapter_ZendHttpTest extends PHPUnit_Framework_TestCase
         $rawData = 'xyz';
         $responseData = 'abc';
         $handler = 'myhandler';
+        $headers = array(
+            'Content-Type: application/x-www-form-urlencoded'
+        );
 
         $request = new Solarium_Client_Request();
         $request->setMethod($method);
         $request->setHandler($handler);
+        $request->setHeaders($headers);
         $request->setRawData($rawData);
 
         $response = new Zend_Http_Response(200, array('status' => 'HTTP 1.1 200 OK'), $responseData);
@@ -103,6 +107,9 @@ class Solarium_Client_Adapter_ZendHttpTest extends PHPUnit_Framework_TestCase
         $mock->expects($this->once())
                  ->method('setUri')
                  ->with($this->equalTo('http://127.0.0.1:8983/solr/myhandler?'));
+        $mock->expects($this->once())
+                 ->method('setHeaders')
+                 ->with($this->equalTo($headers));
         $mock->expects($this->once())
                  ->method('setRawData')
                  ->with($this->equalTo($rawData));