From: Moriyoshi Koizumi <moriyoshi@php.net>
Date: Sun, 10 Nov 2002 20:53:36 +0000 (+0000)
Subject: Changed the default settings so that it shouldn't affect htmlentities()
X-Git-Tag: php-4.3.0RC1~138
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3e21044d81fff8aef132bf8c01948a2feabecdda;p=php

Changed the default settings so that it shouldn't affect htmlentities()
---

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index f12ba36b40..b314a3daaa 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -728,11 +728,11 @@ static PHP_INI_MH(OnUpdate_mbstring_encoding_translation)
 
 /* {{{ php.ini directive registration */
 PHP_INI_BEGIN()
-	 PHP_INI_ENTRY("mbstring.language", NULL, PHP_INI_SYSTEM | PHP_INI_PERDIR, OnUpdate_mbstring_language)
+	 PHP_INI_ENTRY("mbstring.language", "none", PHP_INI_SYSTEM | PHP_INI_PERDIR, OnUpdate_mbstring_language)
 	 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", NULL, PHP_INI_ALL, OnUpdate_mbstring_internal_encoding)
+	 PHP_INI_ENTRY("mbstring.http_input", "pass", PHP_INI_ALL, OnUpdate_mbstring_http_input)
+	 PHP_INI_ENTRY("mbstring.http_output", "pass", PHP_INI_ALL, OnUpdate_mbstring_http_output)
+	 PHP_INI_ENTRY("mbstring.internal_encoding", "none", 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 */
@@ -750,10 +750,10 @@ PHP_INI_END()
 static void
 php_mb_init_globals(zend_mbstring_globals *pglobals TSRMLS_DC)
 {
-	MBSTRG(language) = mbfl_no_language_english;
-	MBSTRG(current_language) = mbfl_no_language_english;
-	MBSTRG(internal_encoding) = mbfl_no_encoding_8859_1;
-	MBSTRG(current_internal_encoding) = mbfl_no_encoding_8859_1;
+	MBSTRG(language) = mbfl_no_language_uni;
+	MBSTRG(current_language) = MBSTRG(language);
+	MBSTRG(internal_encoding) = mbfl_no_encoding_pass;
+	MBSTRG(current_internal_encoding) = MBSTRG(internal_encoding);
 #ifdef ZEND_MULTIBYTE
 	MBSTRG(script_encoding_list) = NULL;
 	MBSTRG(script_encoding_list_size) = 0;