Do not drain on HEAD requests

guzzle · Jun 30, 2016 · 1af7d30 · 1af7d30
1 parent 1fa6184
commit 1af7d30
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/src/Handler/StreamHandler.php b/src/Handler/StreamHandler.php
@@ -118,7 +118,9 @@ private function createResponse(
             }
         }
 
-        if ($sink !== $stream) {
+        // Do not drain when the request is a HEAD request because they have
+        // no body.
+        if ($sink !== $stream && strcasecmp('HEAD', $request->getMethod())) {
             $this->drain(
                 $stream,
                 $sink,

diff --git a/tests/Handler/StreamHandlerTest.php b/tests/Handler/StreamHandlerTest.php
@@ -160,6 +160,25 @@ public function testDrainsResponseAndReadsOnlyContentLengthBytes()
         fclose($stream);
     }
 
+    public function testDoesNotDrainWhenHeadRequest()
+    {
+        Server::flush();
+        // Say the content-length is 8, but return no response.
+        Server::enqueue([
+            new Response(200, [
+                'Foo' => 'Bar',
+                'Content-Length' => 8,
+            ], '')
+        ]);
+        $handler = new StreamHandler();
+        $request = new Request('HEAD', Server::$url);
+        $response = $handler($request, [])->wait();
+        $body = $response->getBody();
+        $stream = $body->detach();
+        $this->assertEquals('', stream_get_contents($stream));
+        fclose($stream);
+    }
+
     public function testAutomaticallyDecompressGzip()
     {
         Server::flush();