diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2003-02-19 19:41:09 +0000 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2003-02-19 19:41:09 +0000 |
| commit | 7429c2dc3f72ed9a6a41ccefc68595e76319cdae (patch) | |
| tree | 5a1cf40f32cb245cc33b043339464da15507462c /ext/mbstring | |
| parent | 0458bb5e2b31e571b83e6aa674073c28fb8c4fbf (diff) | |
| download | php-git-7429c2dc3f72ed9a6a41ccefc68595e76319cdae.tar.gz | |
Input Filter support. See README.input_filter for details.
@- Input Filter support added. See README.input_filter. (Rasmus)
Diffstat (limited to 'ext/mbstring')
| -rw-r--r-- | ext/mbstring/mb_gpc.c | 5 | ||||
| -rw-r--r-- | ext/mbstring/mbstring.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ext/mbstring/mb_gpc.c b/ext/mbstring/mb_gpc.c index 028612baa6..61e6dd93d9 100644 --- a/ext/mbstring/mb_gpc.c +++ b/ext/mbstring/mb_gpc.c @@ -169,7 +169,7 @@ MBSTRING_API SAPI_TREAT_DATA_FUNC(mbstr_treat_data) break; } - _php_mb_encoding_handler_ex(array_ptr, res, separator, 0, 0 TSRMLS_CC); + _php_mb_encoding_handler_ex(arg, array_ptr, res, separator, 0, 0 TSRMLS_CC); if (MBSTRG(http_input_identify) != mbfl_no_encoding_invalid) { switch(arg){ @@ -199,7 +199,7 @@ MBSTRING_API SAPI_TREAT_DATA_FUNC(mbstr_treat_data) /* }}} */ /* {{{ int _php_mb_encoding_handler_ex() */ -int _php_mb_encoding_handler_ex(zval *arg, char *res, char *separator, int force_register_globals, int report_errors TSRMLS_DC) +int _php_mb_encoding_handler_ex(int data_type, zval *arg, char *res, char *separator, int force_register_globals, int report_errors TSRMLS_DC) { char *var, *val, *s1, *s2; char *strtok_buf = NULL, **val_list = NULL; @@ -342,6 +342,7 @@ int _php_mb_encoding_handler_ex(zval *arg, char *res, char *separator, int force val_len = len_list[n]; } n++; + val_len = sapi_module.input_filter(data_type, var, val, val_len TSRMLS_CC); /* add variable to symbol table */ php_register_variable_safe(var, val, val_len, array_ptr TSRMLS_CC); if (convd != NULL){ diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 3f9558efc7..c228cf29b6 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -1281,7 +1281,7 @@ PHP_FUNCTION(mb_parse_str) encstr = estrndup(encstr, encstr_len); - RETVAL_BOOL(_php_mb_encoding_handler_ex(track_vars_array, encstr, separator, (track_vars_array == NULL), 1 TSRMLS_CC)); + RETVAL_BOOL(_php_mb_encoding_handler_ex(PARSE_STRING, track_vars_array, encstr, separator, (track_vars_array == NULL), 1 TSRMLS_CC)); if (encstr != NULL) efree(encstr); if (separator != NULL) efree(separator); |