Merge pull request #381 from clue-labs/chunked-decoder

Expose `Transfer-Encoding: chunked` response header and fix chunked responses for `HEAD` requests

Author: WyriHaximus

src/Client/ChunkedStreamDecoder.php

@@ -32,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 ChunkedStreamDecoder($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'));
@@ -68,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/Client/Response.php

@@ -116,7 +116,7 @@ public function handleData($data)
                 }
 
                 if ($hexValue !== '') {
-                    $hexValue = \ltrim($hexValue, "0");
+                    $hexValue = \ltrim(\trim($hexValue), "0");
                     if ($hexValue === '') {
                         $hexValue = "0";
                     }
@@ -155,16 +155,19 @@ public function handleData($data)
                 $this->headerCompleted = false;
                 $this->transferredSize = 0;
                 $this->buffer = (string)\substr($this->buffer, 2);
+            } elseif ($this->chunkSize === 0) {
+                // end chunk received, skip all trailer data
+                $this->buffer = (string)\substr($this->buffer, $positionCrlf);
             }
 
-            if ($positionCrlf !== 0 && $this->chunkSize === $this->transferredSize && \strlen($this->buffer) > 2) {
-                // the first 2 characters are not CLRF, send error event
-                $this->handleError(new Exception('Chunk does not end with a CLRF'));
+            if ($positionCrlf !== 0 && $this->chunkSize !== 0 && $this->chunkSize === $this->transferredSize && \strlen($this->buffer) > 2) {
+                // the first 2 characters are not CRLF, send error event
+                $this->handleError(new Exception('Chunk does not end with a CRLF'));
                 return;
             }
 
             if ($positionCrlf !== 0 && \strlen($this->buffer) < 2) {
-                // No CLRF found, wait for additional data which could be a CLRF
+                // No CRLF found, wait for additional data which could be a CRLF
                 return;
             }
         }

src/Io/ChunkedDecoder.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()
             ));