Merge branch 'hotfix/3980' into develop

Forward port zendframework#3980
davidwindell · Mar 12, 2013 · bda2e66 · bda2e66
2 parents 1473c22 + 61d0dba
commit bda2e66
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/library/Zend/Uri/Http.php b/library/Zend/Uri/Http.php
@@ -33,7 +33,7 @@ class Http extends Uri
     /**
      * @see Uri::$validHostTypes
      */
-    protected $validHostTypes = self::HOST_DNS_OR_IPV4_OR_IPV6;
+    protected $validHostTypes = self::HOST_DNS_OR_IPV4_OR_IPV6_OR_REGNAME;
 
     /**
      * User name as provided in authority of URI

diff --git a/library/Zend/Uri/Uri.php b/library/Zend/Uri/Uri.php
@@ -42,6 +42,7 @@ class Uri implements UriInterface
     const HOST_DNS_OR_IPV4_OR_IPV6  = 0x0B; //01011
     const HOST_DNS_OR_IPVANY        = 0x0F; //01111
     const HOST_REGNAME              = 0x10; //10000
+    const HOST_DNS_OR_IPV4_OR_IPV6_OR_REGNAME = 0x13; //10011
     const HOST_ALL                  = 0x1F; //11111
 
     /**

diff --git a/tests/ZendTest/Uri/HttpTest.php b/tests/ZendTest/Uri/HttpTest.php
@@ -250,4 +250,10 @@ public function testGetPortDoesntModifyUrlHttps()
         $uri->getPort();
         $this->assertEquals($origUri, $uri->toString());
     }
+
+    public function testValidHostTypesWithUnderScore()
+    {
+        $uri = new HttpUri('http://zf2_app.local');
+        $this->assertTrue($uri->isValid());
+    }
 }