Merge branch 'hotfix/zend-uri-ipv6-support' of https://github.com/she…

…vron/zf2 into hotfix/zf2-366
zendframework · Jun 20, 2012 · c32640e · c32640e
commit c32640e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/Http.php b/src/Http.php
@@ -39,7 +39,7 @@ class Http extends Uri
     /**
      * @see Uri::$validHostTypes
      */
-    protected $validHostTypes = self::HOST_DNSORIPV4;
+    protected $validHostTypes = self::HOST_DNSORIPV6;
 
     /**
      * User name as provided in authority of URI

diff --git a/src/Uri.php b/src/Uri.php
@@ -39,6 +39,7 @@ class Uri
     const HOST_IPVANY    = 7;
     const HOST_DNSNAME   = 8;
     const HOST_DNSORIPV4 = 9;
+    const HOST_DNSORIPV6 = 10;
     const HOST_REGNAME   = 16;
     const HOST_ALL       = 31;