diff --git a/core/trunk/core/class/Url.php b/core/trunk/core/class/Url.php
index 2d4ad5db2881225a76a37ce60a3ba3145bb049a9..596bb8065241ff03c2d210e7d4cd520e561c9876 100644
--- a/core/trunk/core/class/Url.php
+++ b/core/trunk/core/class/Url.php
@@ -185,8 +185,12 @@ class Url
 
     private static function _buildHost()
     {
-        return array_key_exists('HTTP_X_FORWARDED_HOST', $_SERVER)
-                ? $_SERVER['HTTP_X_FORWARDED_HOST'] : $_SERVER['HTTP_HOST'];
+        if (array_key_exists('HTTP_X_FORWARDED_HOST', $_SERVER)) {
+            return $_SERVER['HTTP_X_FORWARDED_HOST'];
+        } else {
+            $hostParts = explode(':',$_SERVER['HTTP_HOST']);
+            return $hostParts[0];
+        }
     }
 
     private static function _buildPort()
diff --git a/core/trunk/core/tests/class/UrlTest.php b/core/trunk/core/tests/class/UrlTest.php
index a42b8b476427db6138a54a704db677bf9dba3289..8ed17f550841a51f5bbe7da5fd9385eeb2dfff3a 100644
--- a/core/trunk/core/tests/class/UrlTest.php
+++ b/core/trunk/core/tests/class/UrlTest.php
@@ -25,7 +25,7 @@ class UrlTest extends PHPUnit_Framework_TestCase
         $_SERVER['HTTPS'] = (strpos($url_parts[0], 's') !== false)
                                 ? 'on': '';
         $host_parts = explode(':', $url_parts[2]);
-        $_SERVER['HTTP_HOST'] = $host_parts[0];
+        $_SERVER['HTTP_HOST'] = $url_parts[2];
         if (count($host_parts) == 2) {
             $_SERVER['SERVER_PORT'] = $host_parts[1];
         } else {
diff --git a/core/trunk/core/tests/class/UrlWithProxyTest.php b/core/trunk/core/tests/class/UrlWithProxyTest.php
index ce41d0f54adb34e3eb69eaf6ba0f8f70825bf0b3..5f8eb6dd436655590e3fc3dc340a8ca4099f1aae 100644
--- a/core/trunk/core/tests/class/UrlWithProxyTest.php
+++ b/core/trunk/core/tests/class/UrlWithProxyTest.php
@@ -25,7 +25,7 @@ class UrlWithProxyTest extends PHPUnit_Framework_TestCase
         $_SERVER['HTTPS'] = (strpos($url_parts[0], 's') !== false)
         ? 'on': '';
         $host_parts = explode(':', $url_parts[2]);
-        $_SERVER['HTTP_HOST'] = $host_parts[0];
+        $_SERVER['HTTP_HOST'] = $url_parts[2];
         if (count($host_parts) == 2) {
             $_SERVER['SERVER_PORT'] = $host_parts[1];
         } else {