Skip to content

Commit 8276584

Browse files
Merge branch '6.4' into 7.1
* 6.4: [HttpFoundation] Fix test [HttpFoundation] Revert risk change [Notifier] Fix GoIpTransport [HttpClient] Fix catching some invalid Location headers
2 parents 2251578 + 431771b commit 8276584

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

Diff for: Request.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -324,11 +324,9 @@ public static function create(string $uri, string $method = 'GET', array $parame
324324
if ('https' === $components['scheme']) {
325325
$server['HTTPS'] = 'on';
326326
$server['SERVER_PORT'] = 443;
327-
} elseif ('http' === $components['scheme']) {
327+
} else {
328328
unset($server['HTTPS']);
329329
$server['SERVER_PORT'] = 80;
330-
} else {
331-
throw new BadRequestException('Invalid URI: http(s) scheme expected.');
332330
}
333331
}
334332

Diff for: Tests/RequestTest.php

-1
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,6 @@ public function testCreateWithRequestUri()
311311
* [" foo"]
312312
* ["foo "]
313313
* ["//"]
314-
* ["foo:bar"]
315314
*/
316315
public function testCreateWithBadRequestUri(string $uri)
317316
{

0 commit comments

Comments
 (0)