#29: Request not using CURLOPT_POSTFIELDS have content-length set to 0

Author: mekras

src/Client.php

@@ -317,20 +317,21 @@ private function addRequestBodyOptions(RequestInterface $request, array $options
     private function createHeaders(RequestInterface $request, array $options)
     {
         $curlHeaders = [];
-        $headers = array_keys($request->getHeaders());
-        foreach ($headers as $name) {
+        $headers = $request->getHeaders();
+        foreach ($headers as $name => $values) {
             $header = strtolower($name);
             if ('expect' === $header) {
                 // curl-client does not support "Expect-Continue", so dropping "expect" headers
                 continue;
             }
             if ('content-length' === $header) {
-                $values = [0];
                 if (array_key_exists(CURLOPT_POSTFIELDS, $options)) {
+                    // Small body content length can be calculated here.
                     $values = [strlen($options[CURLOPT_POSTFIELDS])];
+                } elseif (!array_key_exists(CURLOPT_READFUNCTION, $options)) {
+                    // Else if there is no body, forcing "Content-length" to 0
+                    $values = [0];
                 }
-            } else {
-                $values = $request->getHeader($name);
             }
             foreach ($values as $value) {
                 $curlHeaders[] = $name . ': ' . $value;

tests/HttpClientTestCase.php

@@ -78,17 +78,21 @@ public function testSendLargeFile()
         $request = self::$messageFactory->createRequest(
             'POST',
             PHPUnitUtility::getUri(),
-            [],
+            ['content-length' => 1024 * 2048],
             $body
         );
 
         $response = $this->httpAdapter->sendRequest($request);
         $this->assertResponse(
             $response,
             [
-                'body' => 'Ok',
+                'body' => 'Ok'
             ]
         );
+
+        $request = $this->getRequest();
+        self::assertArrayHasKey('CONTENT_LENGTH', $request['SERVER']);
+        self::assertEquals($body->getSize(), $request['SERVER']['CONTENT_LENGTH']);
     }
 
     /**