From b484bc253a567d0bb5f807d9f846c73807c2e6a3 Mon Sep 17 00:00:00 2001 From: Moriyoshi Koizumi Date: Fri, 16 May 2003 19:28:17 +0000 Subject: [PATCH] Moved initialisation code to the proper place. --- ext/mbstring/mbstring.c | 4 +++- main/main.c | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index a7e14947e4..3d9a67e229 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -929,7 +929,9 @@ PHP_RINIT_FUNCTION(mbstring) #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; } /* }}} */ diff --git a/main/main.c b/main/main.c index 183531460a..bc50b9f05d 100644 --- a/main/main.c +++ b/main/main.c @@ -1677,9 +1677,6 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file TSRMLS_DC) } 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 -- 2.40.0