Fix bug related to HTTP content chunking (#292)

amphp · Jan 4, 2020 · b1d83bc · b1d83bc
1 parent a4936b0
commit b1d83bc
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 11 deletions.
diff --git a/src/Driver/Http1Driver.php b/src/Driver/Http1Driver.php
@@ -660,15 +660,13 @@ function (int $bodySize) use (&$maxBodySize) {
                             if ($bufferLength >= $chunkLengthRemaining + 2) {
                                 $buffer .= yield $emitter->emit(\substr($buffer, 0, $chunkLengthRemaining));
                                 $buffer = \substr($buffer, $chunkLengthRemaining + 2);
-                            } else {
-                                $buffer = yield $emitter->emit($buffer);
-                                $chunkLengthRemaining -= $bufferLength;
-                            }
 
-                            if ($bufferLength >= $chunkLengthRemaining + 2) {
                                 $chunkLengthRemaining = null;
                                 continue 2; // next chunk (chunked loop)
                             }
+
+                            $buffer = yield $emitter->emit($buffer);
+                            $chunkLengthRemaining -= $bufferLength;
                         }
                     }
 

diff --git a/test/Driver/Http1DriverTest.php b/test/Driver/Http1DriverTest.php
@@ -20,6 +20,7 @@
 use Amp\PHPUnit\TestCase;
 use Amp\Promise;
 use Amp\Success;
+use Generator;
 use League\Uri;
 
 class Http1DriverTest extends TestCase
@@ -218,7 +219,21 @@ public function testIdentityBodyParseEmit()
         $this->assertSame($originalBody, $body);
     }
 
-    public function testChunkedBodyParseEmit()
+    /**
+     * provide multiple chunk-sizes to test with.
+     * @return Generator
+     */
+    public function chunkSizeProvider()
+    {
+        for ($i = 1; $i < 11; $i++) {
+            yield [$i];
+        }
+    }
+
+    /**
+     * @dataProvider chunkSizeProvider
+     */
+    public function testChunkedBodyParseEmit(int $chunkSize)
     {
         $msg =
             "POST https://test.local:1337/post-endpoint HTTP/1.0\r\n" .
@@ -251,13 +266,13 @@ public function testChunkedBodyParseEmit()
             $this->createCallback(0)
         );
 
-        for ($i = 0, $c = \strlen($msg); $i < $c; $i++) {
-            $promise = $parser->send($msg[$i]);
+        foreach (\str_split($msg, $chunkSize) as $chunk) {
+            $promise = $parser->send($chunk);
+            while ($promise instanceof Promise) {
+                $promise = $parser->send("");
+            }
         }
 
-        while ($promise instanceof Promise) {
-            $promise = $parser->send("");
-        }
 
         $this->assertInstanceOf(Request::class, $request);