ZF-9899: Applying Patch from Richard Tuin

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@23413 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/Controller/Request/Http.php

@@ -1033,7 +1033,10 @@ class Zend_Controller_Request_Http extends Zend_Controller_Request_Abstract
         $name   = $this->getServer('SERVER_NAME');
         $port   = $this->getServer('SERVER_PORT');
 
-        if (($scheme == self::SCHEME_HTTP && $port == 80) || ($scheme == self::SCHEME_HTTPS && $port == 443)) {
+        if(null === $name) {
+            return '';
+        }
+        elseif (($scheme == self::SCHEME_HTTP && $port == 80) || ($scheme == self::SCHEME_HTTPS && $port == 443)) {
             return $name;
         } else {
             return $name . ':' . $port;

tests/Zend/Controller/Request/HttpTest.php

@@ -949,6 +949,15 @@ class Zend_Controller_Request_HttpTest extends PHPUnit_Framework_TestCase
 
         $this->assertEquals( '/module/controller/action', $pathInfo, $pathInfo);
     }
+
+    /**
+     * @group ZF-9899
+     */
+    public function testHostNameShouldBeEmpty()
+    {
+        $request = new Zend_Controller_Request_Http();
+        $this->assertEquals('', $request->getHttpHost(), 'HttpHost should be :');
+    }
     
 }