Merge branch '5.4' into 6.4

nicolas-grekas · nicolas-grekas · commit d2737ec7f403 · 2024-11-13T19:54:33.000+01:00
* 5.4:
  [HttpFoundation] Revert risk change
  [HttpClient] Fix catching some invalid Location headers
diff --git a/Request.php b/Request.php
@@ -374,11 +374,9 @@ public static function create(string $uri, string $method = 'GET', array $parame
             if ('https' === $components['scheme']) {
                 $server['HTTPS'] = 'on';
                 $server['SERVER_PORT'] = 443;
-            } elseif ('http' === $components['scheme']) {
+            } else {
                 unset($server['HTTPS']);
                 $server['SERVER_PORT'] = 80;
-            } else {
-                throw new BadRequestException('Invalid URI: http(s) scheme expected.');
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -374,11 +374,9 @@ public static function create(string $uri, string $method = 'GET', array $parame`
`374`	`374`	`if ('https' === $components['scheme']) {`
`375`	`375`	`$server['HTTPS'] = 'on';`
`376`	`376`	`$server['SERVER_PORT'] = 443;`
`377`		`- } elseif ('http' === $components['scheme']) {`
	`377`	`+ } else {`
`378`	`378`	`unset($server['HTTPS']);`
`379`	`379`	`$server['SERVER_PORT'] = 80;`
`380`		`- } else {`
`381`		`- throw new BadRequestException('Invalid URI: http(s) scheme expected.');`
`382`	`380`	`}`
`383`	`381`	`}`
`384`	`382`