diff options
| author | Moriyoshi Koizumi <moriyoshi@php.net> | 2008-09-13 19:53:01 +0000 |
|---|---|---|
| committer | Moriyoshi Koizumi <moriyoshi@php.net> | 2008-09-13 19:53:01 +0000 |
| commit | 111d815b4191fbc940d4b5f43729762d330a38c9 (patch) | |
| tree | 16c4c9cae07879b9bfecc1830903494b548742d5 | |
| parent | 8fe2cb8cedfe2d1e2f679caff9f63f6ad0f86dfa (diff) | |
| download | php-git-111d815b4191fbc940d4b5f43729762d330a38c9.tar.gz | |
- MFH: Reenable ini_set("mbstring.internal_encoding", VALUE) to work on runtime.
(noticed by Antony. Thanks!)
| -rw-r--r-- | ext/mbstring/mbstring.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 18e281d670..86ab553d99 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -1333,7 +1333,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 |