Merge branch '6.4' into 7.2

alexandre-daubois · alexandre-daubois · commit dc58f9480a74 · 2025-06-01T19:30:28.000+02:00
* 6.4:
  switch to Composer 2 metadata
  Fix `ContainerDebugCommandTest::testNoDumpedXML`
  doc: update UserInterface header comments
  Fix: Lack of recipient in case DSN does not have optional LIST_ID parameter.
  [PhpUnitBridge] Mark as dev package
  [DependencyInjection] Make `YamlDumper` quote resolved env vars if necessary
  Bump Symfony version to 6.4.23
  Update VERSION for 6.4.22
  Update CONTRIBUTORS for 6.4.22
  Update CHANGELOG for 6.4.22
  fixed Via regex
diff --git a/Request.php b/Request.php
@@ -1384,7 +1384,7 @@ public function isMethodCacheable(): bool
     public function getProtocolVersion(): ?string
     {
         if ($this->isFromTrustedProxy()) {
-            preg_match('~^(HTTP/)?([1-9]\.[0-9]) ~', $this->headers->get('Via') ?? '', $matches);
+            preg_match('~^(HTTP/)?([1-9]\.[0-9])\b~', $this->headers->get('Via') ?? '', $matches);
 
             if ($matches) {
                 return 'HTTP/'.$matches[2];
diff --git a/Tests/RequestTest.php b/Tests/RequestTest.php
@@ -2417,6 +2417,8 @@ public static function protocolVersionProvider()
             'trusted with via and protocol name' => ['HTTP/2.0', true, 'HTTP/1.0 fred, HTTP/1.1 nowhere.com (Apache/1.1)', 'HTTP/1.0'],
             'trusted with broken via' => ['HTTP/2.0', true, 'HTTP/1^0 foo', 'HTTP/2.0'],
             'trusted with partially-broken via' => ['HTTP/2.0', true, '1.0 fred, foo', 'HTTP/1.0'],
+            'trusted with simple via' => ['HTTP/2.0', true, 'HTTP/1.0', 'HTTP/1.0'],
+            'trusted with only version via' => ['HTTP/2.0', true, '1.0', 'HTTP/1.0'],
         ];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1384,7 +1384,7 @@ public function isMethodCacheable(): bool`
`1384`	`1384`	`public function getProtocolVersion(): ?string`
`1385`	`1385`	`{`
`1386`	`1386`	`if ($this->isFromTrustedProxy()) {`
`1387`		`- preg_match('~^(HTTP/)?([1-9]\.[0-9]) ~', $this->headers->get('Via') ?? '', $matches);`
	`1387`	`+ preg_match('~^(HTTP/)?([1-9]\.[0-9])\b~', $this->headers->get('Via') ?? '', $matches);`
`1388`	`1388`
`1389`	`1389`	`if ($matches) {`
`1390`	`1390`	`return 'HTTP/'.$matches[2];`
Original file line number	Diff line number	Diff line change
`@@ -2417,6 +2417,8 @@ public static function protocolVersionProvider()`
`2417`	`2417`	`'trusted with via and protocol name' => ['HTTP/2.0', true, 'HTTP/1.0 fred, HTTP/1.1 nowhere.com (Apache/1.1)', 'HTTP/1.0'],`
`2418`	`2418`	`'trusted with broken via' => ['HTTP/2.0', true, 'HTTP/1^0 foo', 'HTTP/2.0'],`
`2419`	`2419`	`'trusted with partially-broken via' => ['HTTP/2.0', true, '1.0 fred, foo', 'HTTP/1.0'],`
	`2420`	`+ 'trusted with simple via' => ['HTTP/2.0', true, 'HTTP/1.0', 'HTTP/1.0'],`
	`2421`	`+ 'trusted with only version via' => ['HTTP/2.0', true, '1.0', 'HTTP/1.0'],`
`2420`	`2422`	`];`
`2421`	`2423`	`}`
`2422`	`2424`