Request->getPort() should prefer HTTP_HOST over SERVER_PORT

Dennis Hotson · fabpot · commit 65814bae27d6 · 2013-09-07T08:11:05.000+02:00
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -887,6 +887,14 @@ public function getPort()
             }
         }
 
+        if ($host = $this->headers->get('HOST')) {
+            if (preg_match('/:(\d+)$/', $host, $matches)) {
+                return intval($matches[1]);
+            }
+
+            return 'https' === $this->getScheme() ? 443 : 80;
+        }
+
         return $this->server->get('SERVER_PORT');
     }
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -1540,6 +1540,18 @@ public function testTrustedHosts()
         // trusted hosts
         $request->headers->set('host', 'trusted.com');
         $this->assertEquals('trusted.com', $request->getHost());
+        $this->assertEquals(80, $request->getPort());
+
+        $request->server->set('HTTPS', true);
+        $request->headers->set('host', 'trusted.com');
+        $this->assertEquals('trusted.com', $request->getHost());
+        $this->assertEquals(443, $request->getPort());
+        $request->server->set('HTTPS', false);
+
+        $request->headers->set('host', 'trusted.com:8000');
+        $this->assertEquals('trusted.com', $request->getHost());
+        $this->assertEquals(8000, $request->getPort());
+
         $request->headers->set('host', 'subdomain.trusted.com');
         $this->assertEquals('subdomain.trusted.com', $request->getHost());
 

Original file line number	Diff line number	Diff line change
`@@ -887,6 +887,14 @@ public function getPort()`
`887`	`887`	`}`
`888`	`888`	`}`
`889`	`889`
	`890`	`+ if ($host = $this->headers->get('HOST')) {`
	`891`	`+ if (preg_match('/:(\d+)$/', $host, $matches)) {`
	`892`	`+ return intval($matches[1]);`
	`893`	`+ }`
	`894`	`+`
	`895`	`+ return 'https' === $this->getScheme() ? 443 : 80;`
	`896`	`+ }`
	`897`	`+`
`890`	`898`	`return $this->server->get('SERVER_PORT');`
`891`	`899`	`}`
`892`	`900`