bug #54910 [HttpFoundation] filter out empty HTTP header parts (xabbuh)

This PR was merged into the 5.4 branch. Discussion ---------- [HttpFoundation] filter out empty HTTP header parts | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #54868 | License | MIT Commits ------- 7d6d8cd97f filter out empty HTTP header parts
symfony · May 15, 2024 · 53be869 · 53be869
2 parents e13c456 + fdd485e
commit 53be869
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/HeaderUtils.php b/HeaderUtils.php
@@ -286,7 +286,11 @@ private static function groupParts(array $matches, string $separators, bool $fir
         }
 
         foreach ($partMatches as $matches) {
-            $parts[] = '' === $separators ? self::unquote($matches[0][0]) : self::groupParts($matches, $separators, false);
+            if ('' === $separators && '' !== $unquoted = self::unquote($matches[0][0])) {
+                $parts[] = $unquoted;
+            } elseif ($groupedParts = self::groupParts($matches, $separators, false)) {
+                $parts[] = $groupedParts;
+            }
         }
 
         return $parts;

diff --git a/Tests/AcceptHeaderTest.php b/Tests/AcceptHeaderTest.php
@@ -41,6 +41,8 @@ public static function provideFromStringData()
     {
         return [
             ['', []],
+            [';;;', []],
+            ['0', [new AcceptHeaderItem('0')]],
             ['gzip', [new AcceptHeaderItem('gzip')]],
             ['gzip,deflate,sdch', [new AcceptHeaderItem('gzip'), new AcceptHeaderItem('deflate'), new AcceptHeaderItem('sdch')]],
             ["gzip, deflate\t,sdch", [new AcceptHeaderItem('gzip'), new AcceptHeaderItem('deflate'), new AcceptHeaderItem('sdch')]],