From ebbfc21a15a1f7e51c116d5381266edec8ee025e Mon Sep 17 00:00:00 2001 From: Derick Rethans Date: Tue, 12 Sep 2006 16:10:33 +0000 Subject: [PATCH] - 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. --- ext/filter/filter.c | 4 ++-- ext/filter/filter_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/filter/filter.c b/ext/filter/filter.c index 5766b190c1..70aa42ec0d 100644 --- a/ext/filter/filter.c +++ b/ext/filter/filter.c @@ -312,7 +312,7 @@ static void php_zval_filter(zval **value, long filter, long flags, zval *options 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 @@ PHP_FUNCTION(input_get) break; } } else { - filter_flags = FILTER_FLAG_SCALAR; + filter_flags = filter_flags | FILTER_FLAG_SCALAR; } zval_copy_ctor(return_value); /* Watch out for empty strings */ diff --git a/ext/filter/filter_private.h b/ext/filter/filter_private.h index 74342a90df..e18bcbe1c9 100644 --- a/ext/filter/filter_private.h +++ b/ext/filter/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 -- 2.40.0