cvs: php-src /ext/filter logical_filters.c /ext/filter/tests bug44445.phpt

iliaa Tue Mar 18 23:32:56 2008 UTC Modified files: /php-src/ext/filter logical_filters.c /php-src/ext/filter/tests bug44445.phpt Log: MFB: Bug #44445 (email validator does not handle domains starting/ending with a -) http://cvs.php.net/viewvc.cgi/php-src/ext/filter/logical_filters.c?r1=1.27&r2=1.28&diff_format=u Index: php-src/ext/filter/logical_filters.c diff -u php-src/ext/filter/logical_filters.c:1.27 php-src/ext/filter/logical_filters.c:1.28 --- php-src/ext/filter/logical_filters.c:1.27 Mon Dec 31 07:12:09 2007 +++ php-src/ext/filter/logical_filters.c Tue Mar 18 23:32:56 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: logical_filters.c,v 1.27 2007/12/31 07:12:09 sebastian Exp $ */ +/* $Id: logical_filters.c,v 1.28 2008/03/18 23:32:56 iliaa Exp $ */ #include "php_filter.h" #include "filter_private.h" @@ -473,7 +473,7 @@ void php_filter_validate_email(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */ { /* From http://cvs.php.net/co.php/pear/HTML_QuickForm/QuickForm/Rule/Email.php?r=1.4 */ - const char regexp[] = "/^((\\\"[^\\\"\\f\\n\\r\\t\\b]+\\\")|([\\w\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\^\\\\|\\{\\}]+(\\.[\\w\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\^\\\\|\\{\\}]+)*))@((\\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9\\-])+\\.)+[A-Za-z\\-]+))$/D"; + const char regexp[] = "/^((\\\"[^\\\"\\f\\n\\r\\t\\b]+\\\")|([\\w\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\^\\\\|\\{\\}]+(\\.[\\w\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\^\\\\|\\{\\}]+)*))@((\\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9])(([A-Za-z0-9\\-])*([A-Za-z0-9]))?\\.)+[A-Za-z\\-]+))$/D"; pcre *re = NULL; pcre_extra *pcre_extra = NULL; http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/bug44445.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/filter/tests/bug44445.phpt diff -u /dev/null php-src/ext/filter/tests/bug44445.phpt:1.2 --- /dev/null Tue Mar 18 23:32:56 2008 +++ php-src/ext/filter/tests/bug44445.phpt Tue Mar 18 23:32:56 2008 @@ -0,0 +1,12 @@ +--TEST-- +Bug #44445 (email validator does not handle domains starting/ending with a -) +--SKIPIF-- +<?php if (!extension_loaded("filter")) die("skip"); ?> +--FILE-- +<?php +var_dump(filter_var("foo@-foo.com",FILTER_VALIDATE_EMAIL)); +var_dump(filter_var("foo@foo-.com",FILTER_VALIDATE_EMAIL)); +?> +--EXPECT-- +bool(false) +bool(false)