Merge pull request #71 from WyriHaximus/fix-for-67-3rd-round

Ensure checking for 0 length chunk, when we should check for it
reactphp · Dec 2, 2016 · 4428d56 · 4428d56
2 parents f26f91c + 26f43a2
commit 4428d56
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 9 deletions.
diff --git a/src/ChunkedStreamDecoder.php b/src/ChunkedStreamDecoder.php
@@ -87,6 +87,14 @@ protected function iterateBuffer()
         }
 
         if ($this->nextChunkIsLength) {
+            if (substr($this->buffer, 0, 3) === "0\r\n") {
+                // We've reached the end of the stream
+                $this->reachedEnd = true;
+                $this->emit('end');
+                $this->close();
+                return false;
+            }
+
             $crlfPosition = strpos($this->buffer, static::CRLF);
             if ($crlfPosition === false && strlen($this->buffer) > 1024) {
                 $this->emit('error', [
@@ -131,13 +139,6 @@ protected function iterateBuffer()
 
         $this->nextChunkIsLength = true;
         $this->buffer = substr($this->buffer, 2);
-
-        if (substr($this->buffer, 0, 3) === "0\r\n") {
-            $this->reachedEnd = true;
-            $this->emit('end');
-            $this->close();
-            return false;
-        }
         return true;
     }
 
@@ -183,6 +184,8 @@ public function close()
     /** @internal */
     public function handleEnd()
     {
+        $this->handleData('');
+
         if ($this->closed) {
             return;
         }

diff --git a/tests/DecodeChunkedStreamTest.php b/tests/DecodeChunkedStreamTest.php
@@ -58,8 +58,8 @@ public function testChunkedEncoding(array $strings, $expected = "Wikipedia in\r\
         $response->on('data', function ($data) use (&$buffer) {
             $buffer .= $data;
         });
-        $response->on('error', function (Exception $exception) {
-            throw $exception;
+        $response->on('error', function ($error) {
+            $this->fail((string)$error);
         });
         foreach ($strings as $string) {
             $stream->write($string);
@@ -104,6 +104,9 @@ public function testHandleEnd()
         $ended = false;
         $stream = new ThroughStream();
         $response = new ChunkedStreamDecoder($stream);
+        $response->on('error', function ($error) {
+            $this->fail((string)$error);
+        });
         $response->on('end', function () use (&$ended) {
             $ended = true;
         });
@@ -132,6 +135,9 @@ public function testHandleEndTrailers()
         $ended = false;
         $stream = new ThroughStream();
         $response = new ChunkedStreamDecoder($stream);
+        $response->on('error', function ($error) {
+            $this->fail((string)$error);
+        });
         $response->on('end', function () use (&$ended) {
             $ended = true;
         });
@@ -140,4 +146,23 @@ public function testHandleEndTrailers()
 
         $this->assertTrue($ended);
     }
+
+    public function testHandleEndEnsureNoError()
+    {
+        $ended = false;
+        $stream = new ThroughStream();
+        $response = new ChunkedStreamDecoder($stream);
+        $response->on('error', function ($error) {
+            $this->fail((string)$error);
+        });
+        $response->on('end', function () use (&$ended) {
+            $ended = true;
+        });
+
+        $stream->write("4\r\nWiki\r\n");
+        $stream->write("0\r\n\r\n");
+        $stream->end();
+
+        $this->assertTrue($ended);
+    }
 }