Merge branch 'v1.x'

amphp · Jan 4, 2020 · 2c3d572 · 2c3d572
2 parents ac67815 + b1d83bc
commit 2c3d572
Show file tree

Hide file tree

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

diff --git a/test/Driver/Http1DriverTest.php b/test/Driver/Http1DriverTest.php
@@ -218,7 +218,21 @@ public function testIdentityBodyParseEmit(): \Generator
         $this->assertSame($originalBody, $body);
     }
 
-    public function testChunkedBodyParseEmit(): \Generator
+    /**
+     * provide multiple chunk-sizes to test with.
+     * @return \Generator
+     */
+    public function chunkSizeProvider(): \Generator
+    {
+        for ($i = 1; $i < 11; $i++) {
+            yield [$i];
+        }
+    }
+
+    /**
+     * @dataProvider chunkSizeProvider
+     */
+    public function testChunkedBodyParseEmit(int $chunkSize): \Generator
     {
         $msg =
             "POST https://test.local:1337/post-endpoint HTTP/1.0\r\n" .
@@ -251,10 +265,10 @@ public function testChunkedBodyParseEmit(): \Generator
             $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(null);
+                $promise = $parser->send("");
             }
         }