Merge pull request #123 from clue-labs/whitespace-chunks

WyriHaximus · web-flow · commit f8ac7aff574c · 2018-02-07T19:38:25.000+01:00
Ignore excessive whitespace in chunk header
diff --git a/src/ChunkedStreamDecoder.php b/src/ChunkedStreamDecoder.php
@@ -103,7 +103,7 @@ protected function iterateBuffer()
                 list($lengthChunk) = explode(';', $lengthChunk, 2);
             }
             if ($lengthChunk !== '') {
-                $lengthChunk = ltrim($lengthChunk, "0");
+                $lengthChunk = ltrim(trim($lengthChunk), "0");
                 if ($lengthChunk === '') {
                     // We've reached the end of the stream
                     $this->reachedEnd = true;
diff --git a/tests/DecodeChunkedStreamTest.php b/tests/DecodeChunkedStreamTest.php
@@ -76,6 +76,13 @@ public function provideChunkedEncoding()
             ],
             'uppercase-chunk' => [
                 ["4\r\nWiki\r\n5\r\npedia\r\nE\r\n in\r\n\r\nchunks.\r\n0\r\n\r\n"],
+            ],
+            'extra-space-in-length-chunk' => [
+                [" 04 \r\nWiki\r\n5\r\npedia\r\nE\r\n in\r\n\r\nchunks.\r\n0\r\n\r\n"],
+            ],
+            'only-whitespace-is-final-chunk' => [
+                ["   \r\n\r\n"],
+                ""
             ]
         ];
     }

Original file line number 8000	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ protected function iterateBuffer()`
`103`	`103`	`list($lengthChunk) = explode(';', $lengthChunk, 2);`
`104`	`104`	`}`
`105`	`105`	`if ($lengthChunk !== '') {`
`106`		`- $lengthChunk = ltrim($lengthChunk, "0");`
	`106`	`+ $lengthChunk = ltrim(trim($lengthChunk), "0");`
`107`	`107`	`if ($lengthChunk === '') {`
`108`	`108`	`// We've reached the end of the stream`
`109`	`109`	`$this->reachedEnd = true;`
Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,13 @@ public function provideChunkedEncoding()`
`76`	`76`	`],`
`77`	`77`	`'uppercase-chunk' => [`
`78`	`78`	`["4\r\nWiki\r\n5\r\npedia\r\nE\r\n in\r\n\r\nchunks.\r\n0\r\n\r\n"],`
	`79`	`+ ],`
	`80`	`+ 'extra-space-in-length-chunk' => [`
	`81`	`+ [" 04 \r\nWiki\r\n5\r\npedia\r\nE\r\n in\r\n\r\nchunks.\r\n0\r\n\r\n"],`
	`82`	`+ ],`
	`83`	`+ 'only-whitespace-is-final-chunk' => [`
	`84`	`+ [" \r\n\r\n"],`
	`85`	`+ ""`
`79`	`86`	`]`
`80`	`87`	`];`
`81`	`88`	`}`