cvs: php4(PHP_4_3) /ext/mbstring mbstring.c /main main.c
| From: | Moriyoshi Koizumi | Date: | Fri, 16 May 2003 19:28:18 +0000 |
| Subject: | cvs: php4(PHP_4_3) /ext/mbstring mbstring.c /main main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-20970@lists.php.net to get a copy of this message | ||
moriyoshi Fri May 16 15:28:18 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/mbstring mbstring.c
/php4/main main.c
Log:
Moved initialisation code to the proper place.
Index: php4/ext/mbstring/mbstring.c
diff -u php4/ext/mbstring/mbstring.c:1.142.2.16 php4/ext/mbstring/mbstring.c:1.142.2.17
--- php4/ext/mbstring/mbstring.c:1.142.2.16 Mon May 12 09:31:16 2003
+++ php4/ext/mbstring/mbstring.c Fri May 16 15:28:17 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.142.2.16 2003/05/12 13:31:16 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.142.2.17 2003/05/16 19:28:17 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module "mbstring"
@@ -929,7 +929,9 @@
#if HAVE_MBREGEX
MBSTRG(regex_default_options) = MBRE_OPTION_POSIXLINE;
#endif
-
+#if defined(ZEND_MULTIBYTE) && defined(HAVE_MBSTRING)
+ php_mb_set_zend_encoding(TSRMLS_C);
+#endif /* ZEND_MULTIBYTE && HAVE_MBSTRING */
return SUCCESS;
}
/* }}} */
Index: php4/main/main.c
diff -u php4/main/main.c:1.512.2.32 php4/main/main.c:1.512.2.33
--- php4/main/main.c:1.512.2.32 Tue May 13 19:09:27 2003
+++ php4/main/main.c Fri May 16 15:28:17 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.512.2.32 2003/05/13 23:09:27 sas Exp $ */
+/* $Id: main.c,v 1.512.2.33 2003/05/16 19:28:17 moriyoshi Exp $ */
/* {{{ includes
*/
@@ -1677,9 +1677,6 @@
} else {
append_file_p = NULL;
}
-#if defined(ZEND_MULTIBYTE) && defined(HAVE_MBSTRING)
- php_mb_set_zend_encoding(TSRMLS_C);
-#endif /* ZEND_MULTIBYTE && HAVE_MBSTRING */
#ifdef PHP_WIN32
zend_unset_timeout(TSRMLS_C);
#endif