Moved initialisation code to the proper place.

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index a7e14947e4547350f65254afdbd27da6e32d6cd4..3d9a67e229a42f58e84fb7f0489005dc521baf57 100644 (file)
--- 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 183531460a5480f981ea7e9408c36e7d6a77a5a5..bc50b9f05defb22d61c8b2998fa0ddf8bfaae099 100644 (file)
--- 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