fixed Via regex

thecaliskan · Emre Çalışkan · commit 4bfb8da9f74b · 2025-05-26T12:17:58.000+03:00
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -1466,7 +1466,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/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -2402,6 +2402,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
`@@ -1466,7 +1466,7 @@ public function isMethodCacheable(): bool`
`1466`	`1466`	`public function getProtocolVersion(): ?string`
`1467`	`1467`	`{`
`1468`	`1468`	`if ($this->isFromTrustedProxy()) {`
`1469`		`- preg_match('~^(HTTP/)?([1-9]\.[0-9]) ~', $this->headers->get('Via') ?? '', $matches);`
	`1469`	`+ preg_match('~^(HTTP/)?([1-9]\.[0-9])\b~', $this->headers->get('Via') ?? '', $matches);`
`1470`	`1470`
`1471`	`1471`	`if ($matches) {`
`1472`	`1472`	`return 'HTTP/'.$matches[2];`
Original file line number	Diff line number	Diff line change
`@@ -2402,6 +2402,8 @@ public static function protocolVersionProvider()`
`2402`	`2402`	`'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'],`
`2403`	`2403`	`'trusted with broken via' => ['HTTP/2.0', true, 'HTTP/1^0 foo', 'HTTP/2.0'],`
`2404`	`2404`	`'trusted with partially-broken via' => ['HTTP/2.0', true, '1.0 fred, foo', 'HTTP/1.0'],`
	`2405`	`+ 'trusted with simple via' => ['HTTP/2.0', true, 'HTTP/1.0', 'HTTP/1.0'],`
	`2406`	`+ 'trusted with only version via' => ['HTTP/2.0', true, '1.0', 'HTTP/1.0'],`
`2405`	`2407`	`];`
`2406`	`2408`	`}`
`2407`	`2409`