Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain na…

…mes) (cherry picked from commit c149d4ee4be81ecf005eafd43ede06e70aa4c985)
dereckson · Sep 16, 2013 · 18b54a2 · 18b54a2
1 parent 8a936e8
commit 18b54a2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/ext/filter/logical_filters.c b/ext/filter/logical_filters.c
@@ -484,10 +484,6 @@ void php_filter_validate_url(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
 			}
 			s++;
 		}
-
-		if (*(e - 1) == '.') {
-			goto bad_url;
-		}
 	}
 
 	if (

diff --git a/ext/filter/tests/bug64441.phpt b/ext/filter/tests/bug64441.phpt
@@ -0,0 +1,11 @@
+--TEST--
+bug 64441, FILTER_VALIDATE_URL will invalidate a hostname that ended by dot
+--SKIPIF--
+<?php if (!extension_loaded("filter")) die("skip"); ?>
+--FILE--
+<?php
+var_dump(filter_var('http://example.com./', FILTER_VALIDATE_URL));
+var_dump(filter_var('http://example.com/', FILTER_VALIDATE_URL));
+--EXPECT--
+string(20) "http://example.com./"
+string(19) "http://example.com/"
-Original file line number
+Diff line change
@@ Expand Up @@
     			}
     			s++;
     		}
-    		if (*(e - 1) == '.') {
-    			goto bad_url;
-    		}
     	}
     	if (
@@ Expand Down @@