summaryrefslogtreecommitdiff
path: root/main/main.c
diff options
context:
space:
mode:
authorMasaki Fujimoto <fujimoto@php.net>2003-08-11 05:24:42 +0000
committerMasaki Fujimoto <fujimoto@php.net>2003-08-11 05:24:42 +0000
commitab9dcec292eb8b7a928cd111044a6a3e374e2412 (patch)
tree85917557d38a4bd8d75028b24de38805d521b953 /main/main.c
parent4320c6994f0f84929141ea2543d95505e465b5d4 (diff)
downloadphp-git-ab9dcec292eb8b7a928cd111044a6a3e374e2412.tar.gz
- added script encoding support to Zend Engine 2.
this enables ZE2 to gracefully parse scripts written in UTF-8 (with BOM), UTF-16, UTF-32, Shift_JIS, ISO-2022-JP etc... (when configured with '--enable-zend-multibyte' and '--enable-mbstring')
Diffstat (limited to 'main/main.c')
-rw-r--r--main/main.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/main/main.c b/main/main.c
index ba1cef84c7..8131a891d5 100644
--- a/main/main.c
+++ b/main/main.c
@@ -90,10 +90,6 @@
#include "php_logos.h"
#include "php_streams.h"
-#if defined(ZEND_MULTIBYTE) && defined(HAVE_MBSTRING)
-#include "ext/mbstring/mbstring.h"
-#endif /* defined(ZEND_MULTIBYTE) && defined(HAVE_MBSTRING) */
-
#include "SAPI.h"
#include "rfc1867.h"
/* }}} */
@@ -1564,9 +1560,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