From 35a08667353905933892f79ea04cdfdb51ad769a Mon Sep 17 00:00:00 2001 From: Derick Rethans Date: Wed, 26 Oct 2005 14:37:08 +0000 Subject: [PATCH] - Allow settable default flags for the filters. --- ext/filter/filter.c | 17 +++++++++++++++-- ext/filter/php_filter.h | 1 + 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ext/filter/filter.c b/ext/filter/filter.c index 11e88f86ee..fbddb9d3fd 100644 --- a/ext/filter/filter.c +++ b/ext/filter/filter.c @@ -127,8 +127,21 @@ static PHP_INI_MH(UpdateDefaultFilter) /* {{{ PHP_INI */ + +static PHP_INI_MH(OnUpdateFlags) +{ + if (!new_value) { + IF_G(default_filter_flags) = 0; + } else { + IF_G(default_filter_flags) = atoi(new_value); + } + return SUCCESS; +} + + PHP_INI_BEGIN() - STD_PHP_INI_ENTRY("filter.default", "string", PHP_INI_ALL, UpdateDefaultFilter, default_filter, zend_filter_globals, filter_globals) + STD_PHP_INI_ENTRY("filter.default", "string", PHP_INI_ALL, UpdateDefaultFilter, default_filter, zend_filter_globals, filter_globals) + PHP_INI_ENTRY("filter.default_flags", NULL, PHP_INI_ALL, OnUpdateFlags) PHP_INI_END() /* }}} */ @@ -346,7 +359,7 @@ static unsigned int php_sapi_filter(int arg, char *var, char **val, unsigned int if (val_len) { if (! (IF_G(default_filter) == FS_UNSAFE_RAW)) { - php_zval_filter(&new_var, IF_G(default_filter), 0, NULL, NULL/*charset*/ TSRMLS_CC); + php_zval_filter(&new_var, IF_G(default_filter), IF_G(default_filter_flags), NULL, NULL/*charset*/ TSRMLS_CC); } } diff --git a/ext/filter/php_filter.h b/ext/filter/php_filter.h index 4fced62274..c3f40c7382 100644 --- a/ext/filter/php_filter.h +++ b/ext/filter/php_filter.h @@ -62,6 +62,7 @@ ZEND_BEGIN_MODULE_GLOBALS(filter) zval *server_array; zval *session_array; long default_filter; + long default_filter_flags; ZEND_END_MODULE_GLOBALS(filter) #ifdef ZTS -- 2.40.0