derick Tue Sep 12 16:10:33 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/filter filter.c filter_private.h
Log:
- Make passing filter flags as LONG work again.
- Make super globals filtering work again (as quick workaround).
#- Will merge to head later... need to get things sorted out first.
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.52.2.14&r2=1.52.2.15&diff_format=u
Index: php-src/ext/filter/filter.c
diff -u php-src/ext/filter/filter.c:1.52.2.14
php-src/ext/filter/filter.c:1.52.2.15
--- php-src/ext/filter/filter.c:1.52.2.14 Thu Aug 31 22:34:32 2006
+++ php-src/ext/filter/filter.c Tue Sep 12 16:10:33 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filter.c,v 1.52.2.14 2006/08/31 22:34:32 pajoye Exp $ */
+/* $Id: filter.c,v 1.52.2.15 2006/09/12 16:10:33 derick Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -274,7 +274,7 @@
{
php_info_print_table_start();
php_info_print_table_row( 2, "Input Validation and Filtering",
"enabled" );
- php_info_print_table_row( 2, "Revision", "$Revision: 1.52.2.14 $");
+ php_info_print_table_row( 2, "Revision", "$Revision: 1.52.2.15 $");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
@@ -312,7 +312,7 @@
filter_func = php_find_filter(FILTER_DEFAULT);
}
- SEPARATE_ZVAL(value);
+ /* Comment this out until there is a better solution:
SEPARATE_ZVAL(value); */
/* Here be strings */
convert_to_string(*value);
@@ -634,7 +634,7 @@
break;
}
} else {
- filter_flags = FILTER_FLAG_SCALAR;
+ filter_flags = filter_flags | FILTER_FLAG_SCALAR;
}
zval_copy_ctor(return_value); /* Watch out for empty strings */
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter_private.h?r1=1.12.2.2&r2=1.12.2.3&diff_format=u
Index: php-src/ext/filter/filter_private.h
diff -u php-src/ext/filter/filter_private.h:1.12.2.2
php-src/ext/filter/filter_private.h:1.12.2.3
--- php-src/ext/filter/filter_private.h:1.12.2.2 Thu Aug 31 22:34:32 2006
+++ php-src/ext/filter/filter_private.h Tue Sep 12 16:10:33 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filter_private.h,v 1.12.2.2 2006/08/31 22:34:32 pajoye Exp $ */
+/* $Id: filter_private.h,v 1.12.2.3 2006/09/12 16:10:33 derick Exp $ */
#ifndef FILTER_PRIVATE_H
#define FILTER_PRIVATE_H
@@ -24,7 +24,7 @@
#define FILTER_FLAG_NONE 0x0000
#define FILTER_FLAG_ARRAY 0x1000000
-#define FILTER_FLAG_SCALAR 0x2000000
+#define FILTER_FLAG_SCALAR 0x2000000
#define FILTER_FLAG_ALLOW_OCTAL 0x0001
#define FILTER_FLAG_ALLOW_HEX 0x0002
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
