From: Moriyoshi Koizumi <moriyoshi@php.net>
Date: Sat, 13 Sep 2008 19:50:26 +0000 (+0000)
Subject: - Reenable ini_set("mbstring.internal_encoding", VALUE) to work on runtime.
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~403
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=09e9f4cda1a3e8b2f9e1345d050a22e3552a3a50;p=php

- 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 4975f46774..dcf6fbccab 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -1165,7 +1165,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