Merge branch 'hotfix/zf2-508'

Conflicts: README.md
zendframework · Aug 31, 2012 · b61d89d · b61d89d
2 parents 7d231f0 + a1fbb6f
commit b61d89d
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/src/Helper/ServerUrl.php b/src/Helper/ServerUrl.php
@@ -50,7 +50,14 @@ public function __construct()
         }
         $this->setScheme($scheme);
 
-        if (isset($_SERVER['HTTP_HOST']) && !empty($_SERVER['HTTP_HOST'])) {
+        if (isset($_SERVER['HTTP_X_FORWARDED_HOST']) && !empty($_SERVER['HTTP_X_FORWARDED_HOST'])) {
+            $host = $_SERVER['HTTP_X_FORWARDED_HOST'];
+            if (strpos($host, ',') !== false) {
+                $hosts = explode(',', $host);
+                $host = trim(array_pop($hosts));
+            }
+            $this->setHost($host);
+        } elseif (isset($_SERVER['HTTP_HOST']) && !empty($_SERVER['HTTP_HOST'])) {
             $this->setHost($_SERVER['HTTP_HOST']);
         } elseif (isset($_SERVER['SERVER_NAME'], $_SERVER['SERVER_PORT'])) {
             $name = $_SERVER['SERVER_NAME'];

diff --git a/test/Helper/ServerUrlTest.php b/test/Helper/ServerUrlTest.php
@@ -161,4 +161,26 @@ public function testServerUrlWithPort()
         $url = new Helper\ServerUrl();
         $this->assertEquals('https://example.com', $url->__invoke());
     }
+
+    /**
+     * @group ZF2-508
+     */
+    public function testServerUrlWithProxy()
+    {
+        $_SERVER['HTTP_HOST'] = 'proxyserver.com';
+        $_SERVER['HTTP_X_FORWARDED_HOST'] = 'www.firsthost.org';
+        $url = new Helper\ServerUrl();
+        $this->assertEquals('http://www.firsthost.org', $url->__invoke());
+    }
+
+    /**
+     * @group ZF2-508
+     */
+    public function testServerUrlWithMultipleProxies()
+    {
+        $_SERVER['HTTP_HOST'] = 'proxyserver.com';
+        $_SERVER['HTTP_X_FORWARDED_HOST'] = 'www.firsthost.org, www.secondhost.org';
+        $url = new Helper\ServerUrl();
+        $this->assertEquals('http://www.secondhost.org', $url->__invoke());
+    }
 }