Merge pull request #615 from mhujer/gh-612

Zend_Validate_Hostname allows "0" subdomain
zendframework · Sep 2, 2015 · f61d12c · f61d12c
2 parents e8164ff + b73d490
commit f61d12c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/library/Zend/Validate/Hostname.php b/library/Zend/Validate/Hostname.php
@@ -1459,7 +1459,7 @@ public function isValid($value)
                     $check = 0;
                     foreach ($domainParts as $domainPart) {
                         // If some domain part is empty (i.e. zend..com), it's invalid
-                        if (empty($domainPart)) {
+                        if (empty($domainPart) && $domainPart !== '0') {
                             $this->_error(self::INVALID_HOSTNAME);
                             return false;
                         }

diff --git a/tests/Zend/Validate/HostnameTest.php b/tests/Zend/Validate/HostnameTest.php
@@ -536,4 +536,14 @@ public function testGermanSmallLetterSharpS()
         $validator = new Zend_Validate_Hostname();
         $this->assertTrue($validator->isValid('straße.de'));
     }
+
+    /**
+     * @group GH-612
+     */
+    public function testZeroSubdomain()
+    {
+        $validator = new Zend_Validate_Hostname();
+        $this->assertTrue($validator->isValid('1.pool.ntp.org'));
+        $this->assertTrue($validator->isValid('0.pool.ntp.org'));
+    }
 }