Merge branch 'hotfix/3167'

Close zendframework/zendframework#3167 Fixes zendframework/zendframework#3161
zendframework · Dec 11, 2012 · 098e166 · 098e166
commit 098e166
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/src/Helper/ServerUrl.php b/src/Helper/ServerUrl.php
@@ -180,6 +180,15 @@ protected function detectHost()
         }
 
         if (isset($_SERVER['HTTP_HOST']) && !empty($_SERVER['HTTP_HOST'])) {
+            // Detect if the port is set in SERVER_PORT and included in HTTP_HOST
+            if (isset($_SERVER['SERVER_PORT'])) {
+                $portStr = ':' . $_SERVER['SERVER_PORT'];
+                if (substr($_SERVER['HTTP_HOST'], 0-strlen($portStr), strlen($portStr)) == $portStr) {
+                    $this->setHost(substr($_SERVER['HTTP_HOST'], 0, 0-strlen($portStr)));
+                    return;
+                }
+            }
+
             $this->setHost($_SERVER['HTTP_HOST']);
             return;
         }

diff --git a/test/Helper/ServerUrlTest.php b/test/Helper/ServerUrlTest.php
@@ -91,6 +91,15 @@ public function testConstructorWithHostIncludingPortAndHttpsTrue()
         $this->assertEquals('https://example.com:8181', $url->__invoke());
     }
 
+    public function testConstructorWithHttpHostIncludingPortAndPortSet()
+    {
+        $_SERVER['HTTP_HOST'] = 'example.com:8181';
+        $_SERVER['SERVER_PORT'] = 8181;
+
+        $url = new Helper\ServerUrl();
+        $this->assertEquals('http://example.com:8181', $url->__invoke());
+    }
+
     public function testConstructorWithHttpHostAndServerNameAndPortSet()
     {
         $_SERVER['HTTP_HOST'] = 'example.com';