symfony
diff --git a/‎src/Symfony/Component/Routing/RequestContext.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/RequestContext.php
+2-2Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/Routing/RequestContext.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/RequestContext.php
+2-2Lines changed: 2 additions & 2 deletions
@@ -57,8 +57,8 @@ public function fromRequest(Request $request)
         $this->setMethod($request->getMethod());
         $this->setHost($request->getHost());
         $this->setScheme($request->getScheme());
-        $this->setHttpPort($request->isSecure() ? $this->httpPort : $request->getPort());
-        $this->setHttpsPort($request->isSecure() ? $request->getPort() : $this->httpsPort);
+        $this->setHttpPort($request->isSecure() || null === $request->getPort() ? $this->httpPort : $request->getPort());
+        $this->setHttpsPort($request->isSecure() && null !== $request->getPort() ? $request->getPort() : $this->httpsPort);
         $this->setQueryString($request->server->get('QUERY_STRING', ''));
 
         return $this;