Fix for bug #51192 (FILTER_VALIDATE_URL will invalidate a hostname that includes...

diff --git a/ext/filter/logical_filters.c b/ext/filter/logical_filters.c
index 0b27a641f2bb5e387d13825cab3a496a43433c49..52dcb504ecb488f9b31d0580712867c40c3bcf8a 100644 (file)
--- a/ext/filter/logical_filters.c
+++ b/ext/filter/logical_filters.c
@@ -467,7 +467,7 @@ void php_filter_validate_url(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
                s = url->host;
 
                while (s < e) {
-                       if (!isalnum((int)*(unsigned char *)s) && *s != '_' && *s != '.') {
+                       if (!isalnum((int)*(unsigned char *)s) && *s != '-' && *s != '.') {
                                goto bad_url;
                        }
                        s++;

diff --git a/ext/filter/tests/bug51192.phpt b/ext/filter/tests/bug51192.phpt
new file mode 100644 (file)
index 0000000..96c67ea
--- /dev/null
+++ b/ext/filter/tests/bug51192.phpt
@@ -0,0 +1,13 @@
+--TEST--
+bug 51192, FILTER_VALIDATE_URL will invalidate a hostname that includes '-'
+--SKIPIF--
+<?php if (!extension_loaded("filter")) die("skip"); ?>
+--FILE--
+<?php
+var_dump(filter_var('http://example.com/path', FILTER_VALIDATE_URL));
+var_dump(filter_var('http://exa-mple.com/path', FILTER_VALIDATE_URL));
+var_dump(filter_var('http://exa_mple.com/path', FILTER_VALIDATE_URL));
+--EXPECT--     
+string(23) "http://example.com/path"
+string(24) "http://exa-mple.com/path"
+bool(false)