Expose Transfer-Encoding: chunked header and fix chunked HEAD response

Author: clue

src/Client/Response.php

@@ -3,7 +3,6 @@
 namespace React\Http\Client;
 
 use Evenement\EventEmitter;
-use React\Http\Io\ChunkedDecoder;
 use React\Stream\ReadableStreamInterface;
 use React\Stream\Util;
 use React\Stream\WritableStreamInterface;
@@ -33,11 +32,6 @@ public function __construct(ReadableStreamInterface $stream, $protocol, $version
         $this->reasonPhrase = $reasonPhrase;
         $this->headers = $headers;
 
-        if (strtolower($this->getHeaderLine('Transfer-Encoding')) === 'chunked') {
-            $this->stream = new ChunkedDecoder($stream);
-            $this->removeHeader('Transfer-Encoding');
-        }
-
         $this->stream->on('data', array($this, 'handleData'));
         $this->stream->on('error', array($this, 'handleError'));
         $this->stream->on('end', array($this, 'handleEnd'));
@@ -69,16 +63,6 @@ public function getHeaders()
         return $this->headers;
     }
 
-    private function removeHeader($name)
-    {
-        foreach ($this->headers as $key => $value) {
-            if (strcasecmp($name, $key) === 0) {
-                unset($this->headers[$key]);
-                break;
-            }
-        }
-    }
-
     private function getHeader($name)
     {
         $name = strtolower($name);

src/Io/Sender.php

@@ -110,9 +110,12 @@ public function send(RequestInterface $request)
 
         $requestStream->on('response', function (ResponseStream $responseStream) use ($deferred, $request) {
             $length = null;
+            $body = $responseStream;
             $code = $responseStream->getCode();
             if ($request->getMethod() === 'HEAD' || ($code >= 100 && $code < 200) || $code == 204 || $code == 304) {
                 $length = 0;
+            } elseif (\strtolower($responseStream->getHeaderLine('Transfer-Encoding')) === 'chunked') {
+                $body = new ChunkedDecoder($body);
             } elseif ($responseStream->hasHeader('Content-Length')) {
                 $length = (int) $responseStream->getHeaderLine('Content-Length');
             }
@@ -121,7 +124,7 @@ public function send(RequestInterface $request)
             $deferred->resolve(new Response(
                 $responseStream->getCode(),
                 $responseStream->getHeaders(),
-                new ReadableBodyStream($responseStream, $length),
+                new ReadableBodyStream($body, $length),
                 $responseStream->getVersion(),
                 $responseStream->getReasonPhrase()
             ));

tests/Client/ResponseTest.php

@@ -99,70 +99,5 @@ public function closedResponseShouldNotBeResumedOrPaused()
             $response->getHeaders()
         );
     }
-
-    /** @test */
-    public function chunkedEncodingResponse()
-    {
-        $stream = new ThroughStream();
-        $response = new Response(
-            $stream,
-            'http',
-            '1.0',
-            '200',
-            'ok',
-            array(
-                'content-type' => 'text/plain',
-                'transfer-encoding' => 'chunked',
-            )
-        );
-
-        $buffer = '';
-        $response->on('data', function ($data) use (&$buffer) {
-            $buffer.= $data;
-        });
-        $this->assertSame('', $buffer);
-        $stream->write("4; abc=def\r\n");
-        $this->assertSame('', $buffer);
-        $stream->write("Wiki\r\n");
-        $this->assertSame('Wiki', $buffer);
-
-        $this->assertSame(
-            array(
-                'content-type' => 'text/plain',
-            ),
-            $response->getHeaders()
-        );
-    }
-
-    /** @test */
-    public function doubleChunkedEncodingResponseWillBePassedAsIs()
-    {
-        $stream = new ThroughStream();
-        $response = new Response(
-            $stream,
-            'http',
-            '1.0',
-            '200',
-            'ok',
-            array(
-                'content-type' => 'text/plain',
-                'transfer-encoding' => array(
-                    'chunked',
-                    'chunked'
-                )
-            )
-        );
-
-        $this->assertSame(
-            array(
-                'content-type' => 'text/plain',
-                'transfer-encoding' => array(
-                    'chunked',
-                    'chunked'
-                )
-            ),
-            $response->getHeaders()
-        );
-    }
 }
 

tests/FunctionalBrowserTest.php

@@ -462,7 +462,7 @@ public function testPostString()
         $this->assertEquals('hello world', $data['data']);
     }
 
-    public function testReceiveStreamUntilConnectionsEndsForHttp10()
+    public function testRequestStreamReturnsResponseBodyUntilConnectionsEndsForHttp10()
     {
         $response = Block\await($this->browser->withProtocolVersion('1.0')->get($this->base . 'stream/1'), $this->loop);
 
@@ -473,21 +473,47 @@ public function testReceiveStreamUntilConnectionsEndsForHttp10()
         $this->assertStringEndsWith('}', (string) $response->getBody());
     }
 
-    public function testReceiveStreamChunkedForHttp11()
+    public function testRequestStreamReturnsResponseWithTransferEncodingChunkedAndResponseBodyDecodedForHttp11()
     {
-        $response = Block\await($this->browser->request('GET', $this->base . 'stream/1'), $this->loop);
+        $response = Block\await($this->browser->get($this->base . 'stream/1'), $this->loop);
 
         $this->assertEquals('1.1', $response->getProtocolVersion());
 
-        // underlying http-client automatically decodes and doesn't expose header
-        // @link https://github.com/reactphp/http-client/pull/58
-        // $this->assertEquals('chunked', $response->getHeaderLine('Transfer-Encoding'));
-        $this->assertFalse($response->hasHeader('Transfer-Encoding'));
+        $this->assertEquals('chunked', $response->getHeaderLine('Transfer-Encoding'));
 
         $this->assertStringStartsWith('{', (string) $response->getBody());
         $this->assertStringEndsWith('}', (string) $response->getBody());
     }
 
+    public function testRequestStreamWithHeadRequestReturnsEmptyResponseBodWithTransferEncodingChunkedForHttp11()
+    {
+        $response = Block\await($this->browser->head($this->base . 'stream/1'), $this->loop);
+
+        $this->assertEquals('1.1', $response->getProtocolVersion());
+
+        $this->assertEquals('chunked', $response->getHeaderLine('Transfer-Encoding'));
+        $this->assertEquals('', (string) $response->getBody());
+    }
+
+    public function testRequestStreamReturnsResponseWithResponseBodyUndecodedWhenResponseHasDoubleTransferEncoding()
+    {
+        $socket = new \React\Socket\Server(0, $this->loop);
+        $socket->on('connection', function (\React\Socket\ConnectionInterface $connection) {
+            $connection->on('data', function () use ($connection) {
+                $connection->end("HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked, chunked\r\nConnection: close\r\n\r\nhello");
+            });
+        });
+
+        $this->base = str_replace('tcp:', 'http:', $socket->getAddress()) . '/';
+
+        $response = Block\await($this->browser->get($this->base . 'stream/1'), $this->loop);
+
+        $this->assertEquals('1.1', $response->getProtocolVersion());
+
+        $this->assertEquals('chunked, chunked', $response->getHeaderLine('Transfer-Encoding'));
+        $this->assertEquals('hello', (string) $response->getBody());
+    }
+
     public function testReceiveStreamAndExplicitlyCloseConnectionEvenWhenServerKeepsConnectionOpen()
     {
         $closed = new \React\Promise\Deferred();