Remove deprecated mbstring INI settings

Author: Girgias

ext/mbstring/mbstring.c

@@ -829,120 +829,6 @@ static PHP_INI_MH(OnUpdate_mbstring_detect_order)
 }
 /* }}} */
 
-static int _php_mb_ini_mbstring_http_input_set(const char *new_value, size_t new_value_length) {
-	const mbfl_encoding **list;
-	size_t size;
-	if (FAILURE == php_mb_parse_encoding_list(new_value, new_value_length, &list, &size, /* persistent */ 1, /* arg_num */ 0, /* allow_pass_encoding */ 1) || size == 0) {
-		return FAILURE;
-	}
-	if (MBSTRG(http_input_list)) {
-		pefree(MBSTRG(http_input_list), 1);
-	}
-	MBSTRG(http_input_list) = list;
-	MBSTRG(http_input_list_size) = size;
-	return SUCCESS;
-}
-
-/* {{{ static PHP_INI_MH(OnUpdate_mbstring_http_input) */
-static PHP_INI_MH(OnUpdate_mbstring_http_input)
-{
-	if (new_value) {
-		php_error_docref("ref.mbstring", E_DEPRECATED, "Use of mbstring.http_input is deprecated");
-	}
-
-	if (!new_value || !ZSTR_VAL(new_value)) {
-		const char *encoding = php_get_input_encoding();
-		MBSTRG(http_input_set) = 0;
-		_php_mb_ini_mbstring_http_input_set(encoding, strlen(encoding));
-		return SUCCESS;
-	}
-
-	MBSTRG(http_input_set) = 1;
-	return _php_mb_ini_mbstring_http_input_set(ZSTR_VAL(new_value), ZSTR_LEN(new_value));
-}
-/* }}} */
-
-static int _php_mb_ini_mbstring_http_output_set(const char *new_value) {
-	const mbfl_encoding *encoding = php_mb_get_encoding_or_pass(new_value);
-	if (!encoding) {
-		return FAILURE;
-	}
-
-	MBSTRG(http_output_encoding) = encoding;
-	MBSTRG(current_http_output_encoding) = encoding;
-	return SUCCESS;
-}
-
-/* {{{ static PHP_INI_MH(OnUpdate_mbstring_http_output) */
-static PHP_INI_MH(OnUpdate_mbstring_http_output)
-{
-	if (new_value) {
-		php_error_docref("ref.mbstring", E_DEPRECATED, "Use of mbstring.http_output is deprecated");
-	}
-
-	if (new_value == NULL || ZSTR_LEN(new_value) == 0) {
-		MBSTRG(http_output_set) = 0;
-		_php_mb_ini_mbstring_http_output_set(php_get_output_encoding());
-		return SUCCESS;
-	}
-
-	MBSTRG(http_output_set) = 1;
-	return _php_mb_ini_mbstring_http_output_set(ZSTR_VAL(new_value));
-}
-/* }}} */
-
-/* {{{ static _php_mb_ini_mbstring_internal_encoding_set */
-static int _php_mb_ini_mbstring_internal_encoding_set(const char *new_value, size_t new_value_length)
-{
-	const mbfl_encoding *encoding;
-
-	if (!new_value || !new_value_length || !(encoding = mbfl_name2encoding(new_value))) {
-		/* falls back to UTF-8 if an unknown encoding name is given */
-		if (new_value) {
-			php_error_docref("ref.mbstring", E_WARNING,
-				"Unknown encoding \"%s\" in ini setting", new_value);
-		}
-		encoding = mbfl_no2encoding(mbfl_no_encoding_utf8);
-	}
-	MBSTRG(internal_encoding) = encoding;
-	MBSTRG(current_internal_encoding) = encoding;
-#if HAVE_MBREGEX
-	{
-		const char *enc_name = new_value;
-		if (FAILURE == php_mb_regex_set_default_mbctype(enc_name)) {
-			/* falls back to UTF-8 if an unknown encoding name is given */
-			enc_name = "UTF-8";
-			php_mb_regex_set_default_mbctype(enc_name);
-		}
-		php_mb_regex_set_mbctype(new_value);
-	}
-#endif
-	return SUCCESS;
-}
-/* }}} */
-
-/* {{{ static PHP_INI_MH(OnUpdate_mbstring_internal_encoding) */
-static PHP_INI_MH(OnUpdate_mbstring_internal_encoding)
-{
-	if (new_value) {
-		php_error_docref("ref.mbstring", E_DEPRECATED, "Use of mbstring.internal_encoding is deprecated");
-	}
-
-	if (OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage) == FAILURE) {
-		return FAILURE;
-	}
-
-	if (new_value && ZSTR_LEN(new_value)) {
-		MBSTRG(internal_encoding_set) = 1;
-		return _php_mb_ini_mbstring_internal_encoding_set(ZSTR_VAL(new_value), ZSTR_LEN(new_value));
-	} else {
-		const char *encoding = php_get_internal_encoding();
-		MBSTRG(internal_encoding_set) = 0;
-		return _php_mb_ini_mbstring_internal_encoding_set(encoding, strlen(encoding));
-	}
-}
-/* }}} */
-
 /* {{{ static PHP_INI_MH(OnUpdate_mbstring_substitute_character) */
 static PHP_INI_MH(OnUpdate_mbstring_substitute_character)
 {
@@ -1036,9 +922,6 @@ static PHP_INI_MH(OnUpdate_mbstring_http_output_conv_mimetypes)
 PHP_INI_BEGIN()
 	PHP_INI_ENTRY("mbstring.language", "neutral", PHP_INI_ALL, 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)
-	STD_PHP_INI_ENTRY("mbstring.internal_encoding", NULL, PHP_INI_ALL, OnUpdate_mbstring_internal_encoding, internal_encoding_name, zend_mbstring_globals, mbstring_globals)
 	PHP_INI_ENTRY("mbstring.substitute_character", NULL, PHP_INI_ALL, OnUpdate_mbstring_substitute_character)
 
 	STD_PHP_INI_BOOLEAN("mbstring.encoding_translation", "0",
@@ -1061,24 +944,6 @@ PHP_INI_BEGIN()
 PHP_INI_END()
 /* }}} */
 
-static void mbstring_internal_encoding_changed_hook(void) {
-	/* One of the internal_encoding / input_encoding / output_encoding ini settings changed. */
-	if (!MBSTRG(internal_encoding_set)) {
-		const char *encoding = php_get_internal_encoding();
-		_php_mb_ini_mbstring_internal_encoding_set(encoding, strlen(encoding));
-	}
-
-	if (!MBSTRG(http_output_set)) {
-		const char *encoding = php_get_output_encoding();
-		_php_mb_ini_mbstring_http_output_set(encoding);
-	}
-
-	if (!MBSTRG(http_input_set)) {
-		const char *encoding = php_get_input_encoding();
-		_php_mb_ini_mbstring_http_input_set(encoding, strlen(encoding));
-	}
-}
-
 /* {{{ module global initialize handler */
 static PHP_GINIT_FUNCTION(mbstring)
 {
@@ -1087,7 +952,7 @@ ZEND_TSRMLS_CACHE_UPDATE();
 #endif
 
 	mbstring_globals->language = mbfl_no_language_uni;
-	mbstring_globals->internal_encoding = NULL;
+	mbstring_globals->internal_encoding = &mbfl_encoding_utf8;
 	mbstring_globals->current_internal_encoding = mbstring_globals->internal_encoding;
 	mbstring_globals->http_output_encoding = &mbfl_encoding_pass;
 	mbstring_globals->current_http_output_encoding = &mbfl_encoding_pass;
@@ -1142,6 +1007,59 @@ static PHP_GSHUTDOWN_FUNCTION(mbstring)
 }
 /* }}} */
 
+static void mbstring_internal_encoding_changed_hook(void) {
+	/* One of the internal_encoding / input_encoding / output_encoding ini settings changed. */
+	const char *php_encoding = php_get_internal_encoding();
+	const mbfl_encoding *encoding;
+
+	if (!MBSTRG(internal_encoding_set)) {
+		if (!(encoding = mbfl_name2encoding(php_encoding))) {
+			/* falls back to UTF-8 if an unknown encoding name is given */
+			encoding = &mbfl_encoding_utf8;
+		}
+		MBSTRG(internal_encoding) = encoding;
+		MBSTRG(current_internal_encoding) = encoding;
+		#if HAVE_MBREGEX
+		{
+			const char *enc_name = php_encoding;
+			if (FAILURE == php_mb_regex_set_default_mbctype(enc_name)) {
+				/* falls back to UTF-8 if an unknown encoding name is given */
+				enc_name = "UTF-8";
+				php_mb_regex_set_default_mbctype(enc_name);
+			}
+			php_mb_regex_set_mbctype(enc_name);
+		}
+		#endif
+	}
+
+	if (!MBSTRG(http_output_set)) {
+		php_encoding = php_get_output_encoding();
+		encoding = php_mb_get_encoding_or_pass(php_encoding);
+		if (!encoding) {
+			/* falls back to UTF-8 if an unknown encoding name is given */
+			encoding = &mbfl_encoding_utf8;
+		}
+		MBSTRG(http_output_encoding) = encoding;
+		MBSTRG(current_http_output_encoding) = encoding;
+	}
+
+	if (!MBSTRG(http_input_set)) {
+		php_encoding = php_get_input_encoding();
+		const mbfl_encoding **list;
+		size_t size;
+		if (FAILURE == php_mb_parse_encoding_list(php_encoding, strlen(php_encoding), &list, &size,
+				/* persistent */ 1, /* arg_num */ 0, /* allow_pass_encoding */ 1) || size == 0) {
+			/* on failure leave as is */
+			return;
+		}
+		if (MBSTRG(http_input_list)) {
+			pefree(MBSTRG(http_input_list), 1);
+		}
+		MBSTRG(http_input_list) = list;
+		MBSTRG(http_input_list_size) = size;
+	}
+}
+
 /* {{{ PHP_MINIT_FUNCTION(mbstring) */
 PHP_MINIT_FUNCTION(mbstring)
 {

ext/mbstring/tests/bug48697.phpt

@@ -4,22 +4,20 @@ Bug #48697 (mb_internal_encoding() value gets reset by parse_str() or mb_parse_s
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --FILE--
 <?php
-ini_set('mbstring.internal_encoding', 'ISO-8859-15');
 ini_set('mbstring.encoding_translation', true);
 var_dump(mb_internal_encoding());
-mb_internal_encoding('UTF-8');
+mb_internal_encoding('ISO-8859-15');
 var_dump(mb_internal_encoding());
 parse_str('a=b', $ary);
 var_dump(mb_internal_encoding());
-mb_internal_encoding('UTF-8');
+mb_internal_encoding('ISO-8859-15');
 var_dump(mb_internal_encoding());
 parse_str('a=b', $ary);
 var_dump(mb_internal_encoding());
 ?>
---EXPECTF--
-Deprecated: ini_set(): Use of mbstring.internal_encoding is deprecated in %s on line %d
-string(11) "ISO-8859-15"
-string(5) "UTF-8"
-string(5) "UTF-8"
-string(5) "UTF-8"
+--EXPECT--
 string(5) "UTF-8"
+string(11) "ISO-8859-15"
+string(11) "ISO-8859-15"
+string(11) "ISO-8859-15"
+string(11) "ISO-8859-15"

ext/mbstring/tests/ini_encoding.phpt

@@ -3,14 +3,10 @@ Encoding INI test
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --INI--
-error_reporting=E_ALL & ~E_DEPRECATED
 default_charset=Shift_JIS
 internal_encoding=
 input_encoding=
 output_encoding=
-mbstring.internal_encoding=Shift_JIS
-mbstring.http_input=Shift_JIS
-mbstring.http_output=Shift_JIS
 --FILE--
 <?php
 echo "Getting INI\n";
@@ -19,54 +15,36 @@ var_dump(ini_get('internal_encoding'));
 var_dump(ini_get('input_encoding'));
 var_dump(ini_get('output_encoding'));
 
-var_dump(ini_get('mbstring.internal_encoding'));
 var_dump(mb_internal_encoding());
-var_dump(ini_get('mbstring.http_input'));
-var_dump(ini_get('mbstring.http_output'));
 
 echo "Setting INI\n";
 var_dump(ini_set('default_charset', 'UTF-8'));
 var_dump(ini_set('internal_encoding', 'UTF-8'));
 var_dump(ini_set('input_encoding', 'UTF-8'));
 var_dump(ini_set('output_encoding', 'UTF-8'));
-var_dump(ini_set('mbstring.internal_encoding', 'UTF-8'));
-var_dump(ini_set('mbstring.http_input', 'UTF-8'));
-var_dump(ini_set('mbstring.http_output', 'UTF-8'));
 
 echo "Getting INI\n";
 var_dump(ini_get('default_charset'));
 var_dump(ini_get('internal_encoding'));
 var_dump(ini_get('input_encoding'));
 var_dump(ini_get('output_encoding'));
 
-var_dump(ini_get('mbstring.internal_encoding'));
 var_dump(mb_internal_encoding());
-var_dump(ini_get('mbstring.http_input'));
-var_dump(ini_get('mbstring.http_output'));
 --EXPECT--
 Getting INI
 string(9) "Shift_JIS"
 string(0) ""
 string(0) ""
 string(0) ""
-string(9) "Shift_JIS"
 string(4) "SJIS"
-string(9) "Shift_JIS"
-string(9) "Shift_JIS"
 Setting INI
 string(9) "Shift_JIS"
 string(0) ""
 string(0) ""
 string(0) ""
-string(9) "Shift_JIS"
-string(9) "Shift_JIS"
-string(9) "Shift_JIS"
 Getting INI
 string(5) "UTF-8"
 string(5) "UTF-8"
 string(5) "UTF-8"
 string(5) "UTF-8"
 string(5) "UTF-8"
-string(5) "UTF-8"
-string(5) "UTF-8"
-string(5) "UTF-8"

ext/mbstring/tests/ini_encoding2.phpt

@@ -3,14 +3,10 @@ Encoding INI test
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --INI--
-error_reporting=E_ALL & ~E_DEPRECATED
 default_charset=
 internal_encoding=EUC-JP
 input_encoding=
 output_encoding=
-mbstring.internal_encoding=
-mbstring.http_input=
-mbstring.http_output=
 --FILE--
 <?php
 echo "Getting INI\n";
@@ -19,54 +15,36 @@ var_dump(ini_get('internal_encoding'));
 var_dump(ini_get('input_encoding'));
 var_dump(ini_get('output_encoding'));
 
-var_dump(ini_get('mbstring.internal_encoding'));
 var_dump(mb_internal_encoding());
-var_dump(ini_get('mbstring.http_input'));
-var_dump(ini_get('mbstring.http_output'));
 
 echo "Setting INI\n";
 var_dump(ini_set('default_charset', 'UTF-8'));
 var_dump(ini_set('internal_encoding', 'UTF-8'));
 var_dump(ini_set('input_encoding', 'UTF-8'));
 var_dump(ini_set('output_encoding', 'UTF-8'));
-var_dump(ini_set('mbstring.internal_encoding', 'UTF-8'));
-var_dump(ini_set('mbstring.http_input', 'UTF-8'));
-var_dump(ini_set('mbstring.http_output', 'UTF-8'));
 
 echo "Getting INI\n";
 var_dump(ini_get('default_charset'));
 var_dump(ini_get('internal_encoding'));
 var_dump(ini_get('input_encoding'));
 var_dump(ini_get('output_encoding'));
 
-var_dump(ini_get('mbstring.internal_encoding'));
 var_dump(mb_internal_encoding());
-var_dump(ini_get('mbstring.http_input'));
-var_dump(ini_get('mbstring.http_output'));
 --EXPECT--
 Getting INI
 string(0) ""
 string(6) "EUC-JP"
 string(0) ""
 string(0) ""
-string(0) ""
 string(6) "EUC-JP"
-string(0) ""
-string(0) ""
 Setting INI
 string(0) ""
 string(6) "EUC-JP"
 string(0) ""
 string(0) ""
-string(0) ""
-string(0) ""
-string(0) ""
 Getting INI
 string(5) "UTF-8"
 string(5) "UTF-8"
 string(5) "UTF-8"
 string(5) "UTF-8"
 string(5) "UTF-8"
-string(5) "UTF-8"
-string(5) "UTF-8"
-string(5) "UTF-8"