Skip to content

Commit 13a042c

Browse files
Merge branch '4.4' into 5.0
* 4.4: [DI] auto-register singly implemented interfaces by default [DI] fix overriding existing services with aliases for singly-implemented interfaces remove service when base class is missing do not depend on the QueryBuilder from the ORM [Security/Http] call auth listeners/guards eagerly when they "support" the request [Messenger] add tests to FailedMessagesShowCommand Fix the translation commands when a template contains a syntax error [Security] Fix clearing remember-me cookie after deauthentication [Validator] Update Slovenian translations [HttpClient] remove conflict rule with HttpKernel that prevents using the component in Symfony 3.4 [Config][ReflectionClassResource] Handle parameters with undefined constant as their default values fix dumping number-like string parameters Fix CI [Console] Fix autocomplete multibyte input support [Config] don't break on virtual stack frames in ClassExistenceResource more robust initialization from request Changing the multipart form-data behavior to use the form name as an array, which makes it recognizable as an array by PHP on the $_POST globals once it is coming from the HttpClient component
2 parents 1036bce + d20d7e1 commit 13a042c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

RequestContext.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ public function fromRequest(Request $request)
5757
$this->setMethod($request->getMethod());
5858
$this->setHost($request->getHost());
5959
$this->setScheme($request->getScheme());
60-
$this->setHttpPort($request->isSecure() ? $this->httpPort : $request->getPort());
61-
$this->setHttpsPort($request->isSecure() ? $request->getPort() : $this->httpsPort);
60+
$this->setHttpPort($request->isSecure() || null === $request->getPort() ? $this->httpPort : $request->getPort());
61+
$this->setHttpsPort($request->isSecure() && null !== $request->getPort() ? $request->getPort() : $this->httpsPort);
6262
$this->setQueryString($request->server->get('QUERY_STRING', ''));
6363

6464
return $this;

0 commit comments

Comments
 (0)