From 58e7da4400c3acfd76b1436a34fc64d4da1a18db Mon Sep 17 00:00:00 2001 From: Adam Harvey Date: Wed, 3 Mar 2010 09:25:50 +0000 Subject: [PATCH] Fix for bug #51192 (FILTER_VALIDATE_URL will invalidate a hostname that includes '-'). Original patch by solar@azrael.ws. --- ext/filter/logical_filters.c | 2 +- ext/filter/tests/bug51192.phpt | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 ext/filter/tests/bug51192.phpt diff --git a/ext/filter/logical_filters.c b/ext/filter/logical_filters.c index 318a740627..61f5bc0b4e 100644 --- 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 index 0000000000..96c67eae1d --- /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-- + +--FILE-- +