symfony
diff --git a/‎Factory/HttpFoundationFactory.php
Copy file name to clipboardExpand all lines: Factory/HttpFoundationFactory.php
+2-2Lines changed: 2 additions & 2 deletions b/‎Factory/HttpFoundationFactory.php
Copy file name to clipboardExpand all lines: Factory/HttpFoundationFactory.php
+2-2Lines changed: 2 additions & 2 deletions
@@ -49,7 +49,7 @@ public function createRequest(ServerRequestInterface $psrRequest, bool $streamed
 
         if ($uri instanceof UriInterface) {
             $server['SERVER_NAME'] = $uri->getHost();
-            $server['SERVER_PORT'] = $uri->getPort();
+            $server['SERVER_PORT'] = $uri->getPort() ?: ('https' === $uri->getScheme() ? 443 : 80);
             $server['REQUEST_URI'] = $uri->getPath();
             $server['QUERY_STRING'] = $uri->getQuery();
 
@@ -74,7 +74,7 @@ public function createRequest(ServerRequestInterface $psrRequest, bool $streamed
             $server,
             $streamed ? $psrRequest->getBody()->detach() : $psrRequest->getBody()->__toString()
         );
-        $request->headers->replace($psrRequest->getHeaders());
+        $request->headers->add($psrRequest->getHeaders());
 
         return $request;
     }