cvs: php4(PHP_4_3) /ext/mbstring mbstring.c mbstring.h
| From: | Moriyoshi Koizumi | Date: | Mon, 12 May 2003 13:31:16 +0000 |
| Subject: | cvs: php4(PHP_4_3) /ext/mbstring mbstring.c mbstring.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-20846@lists.php.net to get a copy of this message | ||
moriyoshi Mon May 12 09:31:16 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/mbstring mbstring.c mbstring.h
Log:
MFH(r-1.175, r-1.53): applied the right fix for bug #23016
Index: php4/ext/mbstring/mbstring.c
diff -u php4/ext/mbstring/mbstring.c:1.142.2.15 php4/ext/mbstring/mbstring.c:1.142.2.16
--- php4/ext/mbstring/mbstring.c:1.142.2.15 Sun May 4 09:12:26 2003
+++ php4/ext/mbstring/mbstring.c Mon May 12 09:31:16 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.142.2.15 2003/05/04 13:12:26 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.142.2.16 2003/05/12 13:31:16 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module "mbstring"
@@ -698,15 +698,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");
- }
-
- OnUpdateInt(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)){
sapi_unregister_post_entry(php_post_entries);
Index: php4/ext/mbstring/mbstring.h
diff -u php4/ext/mbstring/mbstring.h:1.40.2.4 php4/ext/mbstring/mbstring.h:1.40.2.5
--- php4/ext/mbstring/mbstring.h:1.40.2.4 Sat May 10 16:55:44 2003
+++ php4/ext/mbstring/mbstring.h Mon May 12 09:31:16 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.h,v 1.40.2.4 2003/05/10 20:55:44 moriyoshi Exp $ */
+/* $Id: mbstring.h,v 1.40.2.5 2003/05/12 13:31:16 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module "mbstring" (currently only for Japanese)
@@ -164,7 +164,7 @@
int current_filter_illegal_mode;
int current_filter_illegal_substchar;
long func_overload;
- long encoding_translation;
+ zend_bool encoding_translation;
mbfl_buffer_converter *outconv;
#if HAVE_MBREGEX && defined(PHP_MBREGEX_GLOBALS)
PHP_MBREGEX_GLOBALS