From b48436eb77e3b32a201f3bb4f5b63d45d6820586 Mon Sep 17 00:00:00 2001 From: Moriyoshi Koizumi Date: Sun, 15 Mar 2009 20:44:17 +0000 Subject: [PATCH] - MFH: Fix a bug that mbstring.internal_encoding doesn't take effect within the request encoding converter. --- ext/mbstring/mb_gpc.c | 5 +++++ ext/mbstring/mbstring.c | 13 +++++-------- ext/mbstring/mbstring.h | 3 +++ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ext/mbstring/mb_gpc.c b/ext/mbstring/mb_gpc.c index e67b717696..0fe465a078 100644 --- a/ext/mbstring/mb_gpc.c +++ b/ext/mbstring/mb_gpc.c @@ -59,6 +59,11 @@ MBSTRING_API SAPI_TREAT_DATA_FUNC(mbstr_treat_data) enum mbfl_no_encoding detected; php_mb_encoding_handler_info_t info; + { + char *value = zend_ini_string("mbstring.internal_encoding", sizeof("mbstring.internal_encoding"), 0); + _php_mb_ini_mbstring_internal_encoding_set(value, value ? strlen(value): 0 TSRMLS_CC); + } + if (!MBSTRG(encoding_translation)) { php_default_treat_data(arg, str, destArray TSRMLS_CC); return; diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index ec3b1d0690..6dae29cee6 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -656,7 +656,7 @@ static PHP_INI_MH(OnUpdate_mbstring_http_output) /* }}} */ /* {{{ static _php_mb_ini_mbstring_internal_encoding_set */ -static int _php_mb_ini_mbstring_internal_encoding_set(const char *new_value, uint new_value_length TSRMLS_DC) +int _php_mb_ini_mbstring_internal_encoding_set(const char *new_value, uint new_value_length TSRMLS_DC) { enum mbfl_no_encoding no_encoding; const char *enc_name = NULL; @@ -826,7 +826,6 @@ static PHP_INI_MH(OnUpdate_mbstring_encoding_translation) if (MBSTRG(encoding_translation)) { sapi_unregister_post_entry(php_post_entries TSRMLS_CC); sapi_register_post_entries(mbstr_post_entries TSRMLS_CC); - sapi_register_treat_data(mbstr_treat_data); } else { sapi_unregister_post_entry(mbstr_post_entries TSRMLS_CC); sapi_register_post_entries(php_post_entries TSRMLS_CC); @@ -927,9 +926,12 @@ PHP_MINIT_FUNCTION(mbstring) REGISTER_INI_ENTRIES(); + /* This is a global handler. Should not be set in a per-request handler. */ + sapi_register_treat_data(mbstr_treat_data); + + /* Post handlers are stored in the thread-local context. */ if (MBSTRG(encoding_translation)) { sapi_register_post_entries(mbstr_post_entries TSRMLS_CC); - sapi_register_treat_data(mbstr_treat_data); } REGISTER_LONG_CONSTANT("MB_OVERLOAD_MAIL", MB_OVERLOAD_MAIL, CONST_CS | CONST_PERSISTENT); @@ -968,11 +970,6 @@ PHP_RINIT_FUNCTION(mbstring) zend_function *func, *orig; const struct mb_overload_def *p; - { - char *value = zend_ini_string("mbstring.internal_encoding", sizeof("mbstring.internal_encoding"), 0); - _php_mb_ini_mbstring_internal_encoding_set(value, value ? strlen(value): 0 TSRMLS_CC); - } - MBSTRG(current_internal_encoding) = MBSTRG(internal_encoding); MBSTRG(current_http_output_encoding) = MBSTRG(http_output_encoding); MBSTRG(current_filter_illegal_mode) = MBSTRG(filter_illegal_mode); diff --git a/ext/mbstring/mbstring.h b/ext/mbstring/mbstring.h index b56b6af47f..4258ddb216 100644 --- a/ext/mbstring/mbstring.h +++ b/ext/mbstring/mbstring.h @@ -159,6 +159,9 @@ MBSTRING_API int php_mb_gpc_encoding_detector(char **arg_string, int *arg_length MBSTRING_API int php_mb_stripos(int mode, char *old_haystack, int old_haystack_len, char *old_needle, int old_needle_len, long offset, char *from_encoding TSRMLS_DC); +/* internal use only */ +int _php_mb_ini_mbstring_internal_encoding_set(const char *new_value, uint new_value_length TSRMLS_DC); + ZEND_BEGIN_MODULE_GLOBALS(mbstring) enum mbfl_no_language language; enum mbfl_no_encoding internal_encoding; -- 2.40.0