iliaa Sun Mar 1 17:36:09 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/ext/filter logical_filters.c
Log:
MFB: Fixed bug #47435 (FILTER_FLAG_NO_PRIV_RANGE does not work with ipv6
addresses in the filter extension)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1431&r2=1.2027.2.547.2.1432&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1431 php-src/NEWS:1.2027.2.547.2.1432
--- php-src/NEWS:1.2027.2.547.2.1431 Sun Mar 1 17:35:25 2009
+++ php-src/NEWS Sun Mar 1 17:36:09 2009
@@ -3,6 +3,9 @@
?? ??? 2009, PHP 5.2.10
- Fixed memory corruptions while reading properties of zip files. (Ilia)
+- Fixed bug #47435 (FILTER_FLAG_NO_PRIV_RANGE does not work with ipv6
+ addresses in the filter extension). (Ilia)
+
26 Feb 2009, PHP 5.2.9
- Changed __call() to be invoked on private/protected method access, similar to
properties and __get(). (Andrei)
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/logical_filters.c?r1=1.1.2.28&r2=1.1.2.29&diff_format=u
Index: php-src/ext/filter/logical_filters.c
diff -u php-src/ext/filter/logical_filters.c:1.1.2.28
php-src/ext/filter/logical_filters.c:1.1.2.29
--- php-src/ext/filter/logical_filters.c:1.1.2.28 Mon Feb 2 23:51:58 2009
+++ php-src/ext/filter/logical_filters.c Sun Mar 1 17:36:09 2009
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: logical_filters.c,v 1.1.2.28 2009/02/02 23:51:58 iliaa Exp $ */
+/* $Id: logical_filters.c,v 1.1.2.29 2009/03/01 17:36:09 iliaa Exp $ */
#include "php_filter.h"
#include "filter_private.h"
@@ -655,6 +655,12 @@
if (res < 1) {
RETURN_VALIDATION_FAILED
}
+ /* Check flags */
+ if (flags & FILTER_FLAG_NO_PRIV_RANGE) {
+ if (Z_STRLEN_P(value) >=2 &&
(!strncasecmp("FC", Z_STRVAL_P(value), 2) || !strncasecmp("FD",
Z_STRVAL_P(value), 2))) {
+ RETURN_VALIDATION_FAILED
+ }
+ }
}
break;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
