summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoriyoshi Koizumi <moriyoshi@php.net>2002-11-10 19:05:51 +0000
committerMoriyoshi Koizumi <moriyoshi@php.net>2002-11-10 19:05:51 +0000
commita1d6dccb59d0350562708895fe57c91bce70a8be (patch)
tree8a2f8386f8f26ba4b36a46681f06b225489a309f
parentb8d56f5ec219d19d289088fcd27a21c30eeb575e (diff)
downloadphp-git-a1d6dccb59d0350562708895fe57c91bce70a8be.tar.gz
These changes seems to have bad effect on htmlentities().
Remove it.
-rw-r--r--ext/mbstring/mbstring.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 6a2e261f90..f12ba36b40 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -82,8 +82,6 @@
MUTEX_T mbregex_locale_mutex = NULL;
#endif
-#define PHP_MB_DEFAULT_ENCODING "ISO-8859-1"
-
/* {{{ php_mbstr_default_identify_list[] */
#if defined(HAVE_MBSTR_JA)
static const enum mbfl_no_encoding php_mbstr_default_identify_list[] = {
@@ -734,7 +732,7 @@ PHP_INI_BEGIN()
PHP_INI_ENTRY("mbstring.detect_order", NULL, PHP_INI_ALL, OnUpdate_mbstring_detect_order)
PHP_INI_ENTRY("mbstring.http_input", NULL, PHP_INI_ALL, OnUpdate_mbstring_http_input)
PHP_INI_ENTRY("mbstring.http_output", NULL, PHP_INI_ALL, OnUpdate_mbstring_http_output)
- PHP_INI_ENTRY("mbstring.internal_encoding", PHP_MB_DEFAULT_ENCODING, PHP_INI_ALL, OnUpdate_mbstring_internal_encoding)
+ PHP_INI_ENTRY("mbstring.internal_encoding", NULL, PHP_INI_ALL, OnUpdate_mbstring_internal_encoding)
#ifdef ZEND_MULTIBYTE
PHP_INI_ENTRY("mbstring.script_encoding", NULL, PHP_INI_ALL, OnUpdate_mbstring_script_encoding)
#endif /* ZEND_MULTIBYTE */