Skip to content

Commit

Permalink
Merge branch '6.4' into 7.1
Browse files Browse the repository at this point in the history
* 6.4:
  [HttpFoundation] Fix test
  [HttpFoundation] Revert risk change
  [Notifier] Fix GoIpTransport
  [HttpClient] Fix catching some invalid Location headers
  • Loading branch information
nicolas-grekas committed Nov 13, 2024
2 parents 2251578 + 431771b commit 8276584
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
4 changes: 1 addition & 3 deletions Request.php
Original file line number Diff line number Diff line change
Expand Up @@ -324,11 +324,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.');
}
}

Expand Down
1 change: 0 additions & 1 deletion Tests/RequestTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,6 @@ public function testCreateWithRequestUri()
* [" foo"]
* ["foo "]
* ["//"]
* ["foo:bar"]
*/
public function testCreateWithBadRequestUri(string $uri)
{
Expand Down

0 comments on commit 8276584

Please sign in to comment.