Skip to content

Commit d20d7e1

Browse files
Merge branch '4.3' into 4.4
* 4.3: [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 [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
2 parents 6d701c4 + ac3e212 commit d20d7e1

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)