Use better default ports in urlRedirectAction

flojon · flojon · commit 64b54dc58798 · 2012-11-19T20:08:12.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
@@ -64,7 +64,7 @@ public function redirectAction($route, $permanent = false)
      *
      * @return Response A Response instance
      */
-    public function urlRedirectAction($path, $permanent = false, $scheme = null, $httpPort = 80, $httpsPort = 443)
+    public function urlRedirectAction($path, $permanent = false, $scheme = null, $httpPort = null, $httpsPort = null)
     {
         if (!$path) {
             return new Response(null, 410);
@@ -88,10 +88,28 @@ public function urlRedirectAction($path, $permanent = false, $scheme = null, $ht
         }
 
         $port = '';
-        if ('http' === $scheme && 80 != $httpPort) {
-            $port = ':'.$httpPort;
-        } elseif ('https' === $scheme && 443 != $httpsPort) {
-            $port = ':'.$httpsPort;
+        if ('http' === $scheme) {
+            if ($httpPort == null) {
+                if ('http' === $request->getScheme()) {
+                    $httpPort = $request->getPort();
+                } else {
+                    $httpPort = $this->container->getParameter('request_listener.http_port');
+                }
+            }
+            if ($httpPort != null && $httpPort != 80) {
+                $port = ":$httpPort";
+            }
+        } else if ('https' === $scheme) {
+            if ($httpsPort == null) {
+                if ('https' === $request->getScheme()) {
+                    $httpsPort = $request->getPort();
+                } else {
+                    $httpsPort = $this->container->getParameter('request_listener.https_port');
+                }
+            }
+            if ($httpsPort != null && $httpsPort != 443) {
+                $port = ":$httpsPort";
+            }
         }
 
         $url = $scheme.'://'.$request->getHost().$port.$request->getBaseUrl().$path.$qs;
