felipe          Wed Jun 10 19:05:49 2009 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/filter logical_filters.c 
    /php-src/ext/filter/tests   bug46973.phpt 
  Log:
  - MFH: Fix the fix (Bug #46973 - IPv6 address filter rejects valid address)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/logical_filters.c?r1=1.1.2.33&r2=1.1.2.34&diff_format=u
Index: php-src/ext/filter/logical_filters.c
diff -u php-src/ext/filter/logical_filters.c:1.1.2.33 
php-src/ext/filter/logical_filters.c:1.1.2.34
--- php-src/ext/filter/logical_filters.c:1.1.2.33       Tue Mar 31 11:22:19 2009
+++ php-src/ext/filter/logical_filters.c        Wed Jun 10 19:05:49 2009
@@ -17,7 +17,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: logical_filters.c,v 1.1.2.33 2009/03/31 11:22:19 mattwil Exp $ */
+/* $Id: logical_filters.c,v 1.1.2.34 2009/06/10 19:05:49 felipe Exp $ */
 
 #include "php_filter.h"
 #include "filter_private.h"
@@ -570,7 +570,7 @@
                        }
                        if (*str == ':') {
                                if (compressed || --blocks == 0) {
-                                       return ipv4 != NULL;
+                                       return 0;
                                }                       
                                if (++str == end || (ipv4 && ipv4 == str)) {
                                        return 1;
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/bug46973.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/filter/tests/bug46973.phpt
diff -u php-src/ext/filter/tests/bug46973.phpt:1.1.4.2 
php-src/ext/filter/tests/bug46973.phpt:1.1.4.3
--- php-src/ext/filter/tests/bug46973.phpt:1.1.4.2      Wed Dec 31 15:39:48 2008
+++ php-src/ext/filter/tests/bug46973.phpt      Wed Jun 10 19:05:49 2009
@@ -9,6 +9,6 @@
  
 ?>
 --EXPECTF--
-string(28) "1fff::a88:85a3::172.31.128.1"
+bool(false)
 string(39) "3ffe:6a88:85a3:08d3:1319:8a2e:0370:7344"
-string(28) "1fff::a88:85a3::172.31.128.1"
+bool(false)



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to