bug #78 Fix populating default port and headers in HttpFoundationFactory (mleczakm)

nicolas-grekas · nicolas-grekas · commit df735ece618a · 2020-06-25T10:20:21.000+02:00
This PR was merged into the 2.0-dev branch. Discussion ---------- Fix populating default port and headers in HttpFoundationFactory These are few dirty hacks which are required to get symfony up and running as Roadrunner psr7 worker: - overriding headers need to be removed to be able to send basic auth headers. - setting `$_SERVER['https']` to true is required for properly handling non-proxied requests, handled with encryption directly from Roadrunner - same as symfony/psr-http-message-bridge#77 - setting default server port fixes error with interpreting no port defined in url as `0` Commits ------- 4f30401 Fix populating default port and headers in HttpFoundationFactory
diff --git a/Factory/HttpFoundationFactory.php b/Factory/HttpFoundationFactory.php
@@ -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;
     }
