Applied the right fix for bug #23016

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 974a525e95530e8c37c78c1d93e0880d0d13eade..eec453b14064a44c8523fe869da68ea5c38fbaa8 100644 (file)
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -635,15 +635,7 @@ static PHP_INI_MH(OnUpdate_mbstring_encoding_translation)
           return FAILURE;
        }
 
-       if (!strncasecmp(new_value, "off", sizeof("off"))) {
-               new_value = "0";
-               new_value_length = sizeof("0");
-       } else if (!strncasecmp(new_value, "on", sizeof("on"))) {
-               new_value = "1";
-               new_value_length = sizeof("1");
-       }
-
-       OnUpdateLong(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
+       OnUpdateBool(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
 
        if (MBSTRG(encoding_translation)){
                _php_mb_enable_encoding_translation(1);

diff --git a/ext/mbstring/mbstring.h b/ext/mbstring/mbstring.h
index fed29fd729f70d2c4ff578d738fa1d5045f7de9f..09fa2cc38790be02bea608e170e0af4f38a81964 100644 (file)
--- a/ext/mbstring/mbstring.h
+++ b/ext/mbstring/mbstring.h
@@ -163,7 +163,7 @@ ZEND_BEGIN_MODULE_GLOBALS(mbstring)
        int filter_illegal_substchar;
        int current_filter_illegal_mode;
        int current_filter_illegal_substchar;
-       long func_overload;
+       zend_bool func_overload;
        long encoding_translation;
        mbfl_buffer_converter *outconv;
 #if HAVE_MBREGEX && defined(PHP_MBREGEX_GLOBALS)