cvs: php4 /ext/mbstring mbstring.c mbstring.h
| From: | Moriyoshi Koizumi | Date: | Mon, 12 May 2003 13:26:16 +0000 |
| Subject: | cvs: php4 /ext/mbstring mbstring.c mbstring.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-20844@lists.php.net to get a copy of this message | ||
moriyoshi Mon May 12 09:26:16 2003 EDT
Modified files:
/php4/ext/mbstring mbstring.c mbstring.h
Log:
Applied the right fix for bug #23016
Index: php4/ext/mbstring/mbstring.c
diff -u php4/ext/mbstring/mbstring.c:1.174 php4/ext/mbstring/mbstring.c:1.175
--- php4/ext/mbstring/mbstring.c:1.174 Sun May 4 09:11:30 2003
+++ php4/ext/mbstring/mbstring.c Mon May 12 09:26:16 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.174 2003/05/04 13:11:30 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.175 2003/05/12 13:26:16 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module "mbstring"
@@ -635,15 +635,7 @@
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);
Index: php4/ext/mbstring/mbstring.h
diff -u php4/ext/mbstring/mbstring.h:1.51 php4/ext/mbstring/mbstring.h:1.52
--- php4/ext/mbstring/mbstring.h:1.51 Sat May 10 20:49:15 2003
+++ php4/ext/mbstring/mbstring.h Mon May 12 09:26:16 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.h,v 1.51 2003/05/11 00:49:15 moriyoshi Exp $ */
+/* $Id: mbstring.h,v 1.52 2003/05/12 13:26:16 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module "mbstring" (currently only for Japanese)
@@ -163,7 +163,7 @@
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)