moriyoshi Sat Sep 13 19:53:53 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/mbstring mbstring.c
Log:
- MFH: Reenable ini_set("mbstring.internal_encoding", VALUE) to work on
runtime.
(noticed by Antony. Thanks!)
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.40&r2=1.224.2.22.2.41&diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.40
php-src/ext/mbstring/mbstring.c:1.224.2.22.2.41
--- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.40 Fri Sep 12 23:56:06 2008
+++ php-src/ext/mbstring/mbstring.c Sat Sep 13 19:53:53 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.224.2.22.2.40 2008/09/12 23:56:06 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.224.2.22.2.41 2008/09/13 19:53:53 moriyoshi Exp $ */
/*
* PHP 4 Multibyte String module "mbstring"
@@ -735,7 +735,8 @@
/* {{{ 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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
