Merge branch 'hotfix/5065' into develop

Forward port zendframework/zendframework#5065

src/Client.php

@@ -1154,9 +1154,10 @@ protected function prepareHeaders($body, $uri)
         }
 
         // Merge the headers of the request (if any)
-        $requestHeaders = $this->getRequest()->getHeaders()->toArray();
-        foreach ($requestHeaders as $key => $value) {
-            $headers[$key] = $value;
+        // here we need right 'http field' and not lowercase letters
+        $requestHeaders = $this->getRequest()->getHeaders();
+        foreach ($requestHeaders as $requestHeaderElement) {
+            $headers[$requestHeaderElement->getFieldName()] = $requestHeaderElement->getFieldValue();
         }
         return $headers;
     }

test/ClientTest.php

@@ -11,6 +11,7 @@
 namespace ZendTest\Http;
 
 use ReflectionClass;
+use Zend\Uri\Http;
 use Zend\Http\Client;
 use Zend\Http\Cookies;
 use Zend\Http\Exception;
@@ -393,4 +394,30 @@ public function testUsageOfCustomResponseCustomCode()
         $this->assertEquals(497, $response->getStatusCode());
         $this->assertEquals('Whatever content', $response->getContent());
     }
+
+    public function testPrepareHeadersCreateRightHttpField()
+    {
+        $body = json_encode(array('foofoo'=>'barbar'));
+
+        $client = new Client();
+        $prepareHeadersReflection = new \ReflectionMethod($client, 'prepareHeaders');
+        $prepareHeadersReflection->setAccessible(true);
+
+        $request= new Request();
+        $request->getHeaders()->addHeaderLine('content-type','application/json');
+        $request->getHeaders()->addHeaderLine('content-length',strlen($body));
+        $client->setRequest($request);
+
+        $client->setEncType('application/json');
+
+        $this->assertSame($client->getRequest(),$request);
+
+        $headers = $prepareHeadersReflection->invoke($client,$body,new Http('http://localhost:5984'));
+
+        $this->assertArrayNotHasKey('content-type', $headers);
+        $this->assertArrayHasKey('Content-Type', $headers);
+
+        $this->assertArrayNotHasKey('content-length', $headers);
+        $this->assertArrayHasKey('Content-Length', $headers);
+    }
 }