- MFH: Reenable ini_set("mbstring.internal_encoding", VALUE) to work on runtime.

    (noticed by Antony. Thanks!)

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 7badd335818cd5ac1bd8359907b32c956dc5a0f9..f29fd419ddfd453d1d14e337279ca0911576b961 100644 (file)
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -735,7 +735,8 @@ static int _php_mb_ini_mbstring_internal_encoding_set(const char *new_value, uin
 /* {{{ static PHP_INI_MH(OnUpdate_mbstring_internal_encoding) */
 static PHP_INI_MH(OnUpdate_mbstring_internal_encoding)
 {
-       if (stage == PHP_INI_STAGE_STARTUP || stage == PHP_INI_STAGE_SHUTDOWN) {
+       if (stage == PHP_INI_STAGE_STARTUP || stage == PHP_INI_STAGE_SHUTDOWN
+                       || stage == PHP_INI_STAGE_RUNTIME) {
                return _php_mb_ini_mbstring_internal_encoding_set(new_value, new_value_length TSRMLS_CC);
        } else {
                /* the corresponding mbstring globals needs to be set according to the