Merge pull request #29 from aaa2000/endless-head

Endless head

Author: Nyholm

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## Unreleased
+
+### Fixed
+
+- A HEAD request with the curl handler can be endless
 
 ## 1.0.0 - 2016-07-18
 

src/Client.php

@@ -72,7 +72,8 @@ private function createRequest(RequestInterface $request)
 
         $options['version'] = $request->getProtocolVersion();
         $options['headers'] = $request->getHeaders();
-        $options['body'] = (string) $request->getBody();
+        $body = (string) $request->getBody();
+        $options['body'] = '' === $body ? null : $body;
 
         return $this->client->createRequest(
             $request->getMethod(),

tests/HttpAdapterTest.php

@@ -3,6 +3,7 @@
 namespace Http\Adapter\Guzzle5\Tests;
 
 use GuzzleHttp\Client as GuzzleClient;
+use GuzzleHttp\Psr7\Request;
 use Http\Adapter\Guzzle5\Client;
 use Http\Client\Tests\HttpClientTest;
 use Http\Message\MessageFactory\GuzzleMessageFactory;
@@ -29,4 +30,16 @@ protected function createHttpAdapter()
      * @return object
      */
     abstract protected function createHandler();
+
+    /**
+     * @group integration
+     * @group network
+     */
+    public function testHeadRequestShouldEnd()
+    {
+        // It works with the PHP Built-in web server via $request = new Request('GET', $this->getUri());
+        $request = new Request('HEAD', 'https://httpbin.org/');
+        $this->httpAdapter->sendRequest($request);
+        $this->addToAssertionCount(1);
+    }
 }