From: Moriyoshi Koizumi <moriyoshi@php.net>
Date: Mon, 12 May 2003 13:26:16 +0000 (+0000)
Subject: Applied the right fix for bug #23016
X-Git-Tag: RELEASE_0_9b~23
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e500e957bad158f0b3c264cb8d1f77ab4a19a868;p=php

Applied the right fix for bug #23016
---

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 974a525e95..eec453b140 100644
--- 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 fed29fd729..09fa2cc387 100644
--- 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)