Skip to content

Commit f015f9b

Browse files
GirgiasGirgias
committed
Remove deprecated MBString INI settings
1 parent 58f51f8 commit f015f9b

11 files changed

+57
-309
lines changed

‎ext/mbstring/mbstring.c

Lines changed: 42 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -832,120 +832,6 @@ static PHP_INI_MH(OnUpdate_mbstring_detect_order)
832832
}
833833
/* }}} */
834834

835-
static int _php_mb_ini_mbstring_http_input_set(const char *new_value, size_t new_value_length) {
836-
const mbfl_encoding **list;
837-
size_t size;
838-
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) {
839-
return FAILURE;
840-
}
841-
if (MBSTRG(http_input_list)) {
842-
pefree(ZEND_VOIDP(MBSTRG(http_input_list)), 1);
843-
}
844-
MBSTRG(http_input_list) = list;
845-
MBSTRG(http_input_list_size) = size;
846-
return SUCCESS;
847-
}
848-
849-
/* {{{ static PHP_INI_MH(OnUpdate_mbstring_http_input) */
850-
static PHP_INI_MH(OnUpdate_mbstring_http_input)
851-
{
852-
if (new_value) {
853-
php_error_docref("ref.mbstring", E_DEPRECATED, "Use of mbstring.http_input is deprecated");
854-
}
855-
856-
if (!new_value || !ZSTR_VAL(new_value)) {
857-
const char *encoding = php_get_input_encoding();
858-
MBSTRG(http_input_set) = 0;
859-
_php_mb_ini_mbstring_http_input_set(encoding, strlen(encoding));
860-
return SUCCESS;
861-
}
862-
863-
MBSTRG(http_input_set) = 1;
864-
return _php_mb_ini_mbstring_http_input_set(ZSTR_VAL(new_value), ZSTR_LEN(new_value));
865-
}
866-
/* }}} */
867-
868-
static int _php_mb_ini_mbstring_http_output_set(const char *new_value) {
869-
const mbfl_encoding *encoding = php_mb_get_encoding_or_pass(new_value);
870-
if (!encoding) {
871-
return FAILURE;
872-
}
873-
874-
MBSTRG(http_output_encoding) = encoding;
875-
MBSTRG(current_http_output_encoding) = encoding;
876-
return SUCCESS;
877-
}
878-
879-
/* {{{ static PHP_INI_MH(OnUpdate_mbstring_http_output) */
880-
static PHP_INI_MH(OnUpdate_mbstring_http_output)
881-
{
882-
if (new_value) {
883-
php_error_docref("ref.mbstring", E_DEPRECATED, "Use of mbstring.http_output is deprecated");
884-
}
885-
886-
if (new_value == NULL || ZSTR_LEN(new_value) == 0) {
887-
MBSTRG(http_output_set) = 0;
888-
_php_mb_ini_mbstring_http_output_set(php_get_output_encoding());
889-
return SUCCESS;
890-
}
891-
892-
MBSTRG(http_output_set) = 1;
893-
return _php_mb_ini_mbstring_http_output_set(ZSTR_VAL(new_value));
894-
}
895-
/* }}} */
896-
897-
/* {{{ static _php_mb_ini_mbstring_internal_encoding_set */
898-
static int _php_mb_ini_mbstring_internal_encoding_set(const char *new_value, size_t new_value_length)
899-
{
900-
const mbfl_encoding *encoding;
901-
902-
if (!new_value || !new_value_length || !(encoding = mbfl_name2encoding(new_value))) {
903-
/* falls back to UTF-8 if an unknown encoding name is given */
904-
if (new_value) {
905-
php_error_docref("ref.mbstring", E_WARNING,
906-
"Unknown encoding \"%s\" in ini setting", new_value);
907-
}
908-
encoding = mbfl_no2encoding(mbfl_no_encoding_utf8);
909-
}
910-
MBSTRG(internal_encoding) = encoding;
911-
MBSTRG(current_internal_encoding) = encoding;
912-
#ifdef HAVE_MBREGEX
913-
{
914-
const char *enc_name = new_value;
915-
if (FAILURE == php_mb_regex_set_default_mbctype(enc_name)) {
916-
/* falls back to UTF-8 if an unknown encoding name is given */
917-
enc_name = "UTF-8";
918-
php_mb_regex_set_default_mbctype(enc_name);
919-
}
920-
php_mb_regex_set_mbctype(new_value);
921-
}
922-
#endif
923-
return SUCCESS;
924-
}
925-
/* }}} */
926-
927-
/* {{{ static PHP_INI_MH(OnUpdate_mbstring_internal_encoding) */
928-
static PHP_INI_MH(OnUpdate_mbstring_internal_encoding)
929-
{
930-
if (new_value) {
931-
php_error_docref("ref.mbstring", E_DEPRECATED, "Use of mbstring.internal_encoding is deprecated");
932-
}
933-
934-
if (OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage) == FAILURE) {
935-
return FAILURE;
936-
}
937-
938-
if (new_value && ZSTR_LEN(new_value)) {
939-
MBSTRG(internal_encoding_set) = 1;
940-
return _php_mb_ini_mbstring_internal_encoding_set(ZSTR_VAL(new_value), ZSTR_LEN(new_value));
941-
} else {
942-
const char *encoding = php_get_internal_encoding();
943-
MBSTRG(internal_encoding_set) = 0;
944-
return _php_mb_ini_mbstring_internal_encoding_set(encoding, strlen(encoding));
945-
}
946-
}
947-
/* }}} */
948-
949835
/* {{{ static PHP_INI_MH(OnUpdate_mbstring_substitute_character) */
950836
static PHP_INI_MH(OnUpdate_mbstring_substitute_character)
951837
{
@@ -1039,9 +925,6 @@ static PHP_INI_MH(OnUpdate_mbstring_http_output_conv_mimetypes)
1039925
PHP_INI_BEGIN()
1040926
PHP_INI_ENTRY("mbstring.language", "neutral", PHP_INI_ALL, OnUpdate_mbstring_language)
1041927
PHP_INI_ENTRY("mbstring.detect_order", NULL, PHP_INI_ALL, OnUpdate_mbstring_detect_order)
1042-
PHP_INI_ENTRY("mbstring.http_input", NULL, PHP_INI_ALL, OnUpdate_mbstring_http_input)
1043-
PHP_INI_ENTRY("mbstring.http_output", NULL, PHP_INI_ALL, OnUpdate_mbstring_http_output)
1044-
STD_PHP_INI_ENTRY("mbstring.internal_encoding", NULL, PHP_INI_ALL, OnUpdate_mbstring_internal_encoding, internal_encoding_name, zend_mbstring_globals, mbstring_globals)
1045928
PHP_INI_ENTRY("mbstring.substitute_character", NULL, PHP_INI_ALL, OnUpdate_mbstring_substitute_character)
1046929

1047930
STD_PHP_INI_BOOLEAN("mbstring.encoding_translation", "0",
@@ -1066,19 +949,54 @@ PHP_INI_END()
1066949

1067950
static void mbstring_internal_encoding_changed_hook(void) {
1068951
/* One of the internal_encoding / input_encoding / output_encoding ini settings changed. */
952+
const char *php_encoding = php_get_internal_encoding();
953+
const mbfl_encoding *encoding;
954+
1069955
if (!MBSTRG(internal_encoding_set)) {
1070-
const char *encoding = php_get_internal_encoding();
1071-
_php_mb_ini_mbstring_internal_encoding_set(encoding, strlen(encoding));
956+
if (!(encoding = mbfl_name2encoding(php_encoding))) {
957+
/* falls back to UTF-8 if an unknown encoding name is given */
958+
encoding = &mbfl_encoding_utf8;
959+
}
960+
MBSTRG(internal_encoding) = encoding;
961+
MBSTRG(current_internal_encoding) = encoding;
962+
#if HAVE_MBREGEX
963+
{
964+
const char *enc_name = php_encoding;
965+
if (FAILURE == php_mb_regex_set_default_mbctype(enc_name)) {
966+
/* falls back to UTF-8 if an unknown encoding name is given */
967+
enc_name = "UTF-8";
968+
php_mb_regex_set_default_mbctype(enc_name);
969+
}
970+
php_mb_regex_set_mbctype(enc_name);
971+
}
972+
#endif
1072973
}
1073974

1074975
if (!MBSTRG(http_output_set)) {
1075-
const char *encoding = php_get_output_encoding();
1076-
_php_mb_ini_mbstring_http_output_set(encoding);
976+
php_encoding = php_get_output_encoding();
977+
encoding = php_mb_get_encoding_or_pass(php_encoding);
978+
if (!encoding) {
979+
/* falls back to UTF-8 if an unknown encoding name is given */
980+
encoding = &mbfl_encoding_utf8;
981+
}
982+
MBSTRG(http_output_encoding) = encoding;
983+
MBSTRG(current_http_output_encoding) = encoding;
1077984
}
1078985

1079986
if (!MBSTRG(http_input_set)) {
1080-
const char *encoding = php_get_input_encoding();
1081-
_php_mb_ini_mbstring_http_input_set(encoding, strlen(encoding));
987+
php_encoding = php_get_input_encoding();
988+
const mbfl_encoding **list;
989+
size_t size;
990+
if (FAILURE == php_mb_parse_encoding_list(php_encoding, strlen(php_encoding), &list, &size,
991+
/* persistent */ 1, /* arg_num */ 0, /* allow_pass_encoding */ 1) || size == 0) {
992+
/* on failure leave as is */
993+
return;
994+
}
995+
if (MBSTRG(http_input_list)) {
996+
pefree(ZEND_VOIDP(MBSTRG(http_input_list)), 1);
997+
}
998+
MBSTRG(http_input_list) = list;
999+
MBSTRG(http_input_list_size) = size;
10821000
}
10831001
}
10841002

@@ -1090,7 +1008,7 @@ ZEND_TSRMLS_CACHE_UPDATE();
10901008
#endif
10911009

10921010
mbstring_globals->language = mbfl_no_language_uni;
1093-
mbstring_globals->internal_encoding = NULL;
1011+
mbstring_globals->internal_encoding = &mbfl_encoding_utf8;
10941012
mbstring_globals->current_internal_encoding = mbstring_globals->internal_encoding;
10951013
mbstring_globals->http_output_encoding = &mbfl_encoding_pass;
10961014
mbstring_globals->current_http_output_encoding = &mbfl_encoding_pass;

‎ext/mbstring/tests/bug48697.phpt

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,20 @@ Bug #48697 (mb_internal_encoding() value gets reset by parse_str() or mb_parse_s
44
<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
55
--FILE--
66
<?php
7-
ini_set('mbstring.internal_encoding', 'ISO-8859-15');
87
ini_set('mbstring.encoding_translation', true);
98
var_dump(mb_internal_encoding());
10-
mb_internal_encoding('UTF-8');
9+
mb_internal_encoding('ISO-8859-15');
1110
var_dump(mb_internal_encoding());
1211
parse_str('a=b', $ary);
1312
var_dump(mb_internal_encoding());
14-
mb_internal_encoding('UTF-8');
13+
mb_internal_encoding('ISO-8859-15');
1514
var_dump(mb_internal_encoding());
1615
parse_str('a=b', $ary);
1716
var_dump(mb_internal_encoding());
1817
?>
19-
--EXPECTF--
20-
Deprecated: ini_set(): Use of mbstring.internal_encoding is deprecated in %s on line %d
21-
string(11) "ISO-8859-15"
22-
string(5) "UTF-8"
23-
string(5) "UTF-8"
24-
string(5) "UTF-8"
18+
--EXPECT--
2519
string(5) "UTF-8"
20+
string(11) "ISO-8859-15"
21+
string(11) "ISO-8859-15"
22+
string(11) "ISO-8859-15"
23+
string(11) "ISO-8859-15"

‎ext/mbstring/tests/ini_encoding.phpt

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,10 @@ Encoding INI test
33
--SKIPIF--
44
<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
55
--INI--
6-
error_reporting=E_ALL & ~E_DEPRECATED
76
default_charset=Shift_JIS
87
internal_encoding=
98
input_encoding=
109
output_encoding=
11-
mbstring.internal_encoding=Shift_JIS
12-
mbstring.http_input=Shift_JIS
13-
mbstring.http_output=Shift_JIS
1410
--FILE--
1511
<?php
1612
echo "Getting INI\n";
@@ -19,54 +15,36 @@ var_dump(ini_get('internal_encoding'));
1915
var_dump(ini_get('input_encoding'));
2016
var_dump(ini_get('output_encoding'));
2117

22-
var_dump(ini_get('mbstring.internal_encoding'));
2318
var_dump(mb_internal_encoding());
24-
var_dump(ini_get('mbstring.http_input'));
25-
var_dump(ini_get('mbstring.http_output'));
2619

2720
echo "Setting INI\n";
2821
var_dump(ini_set('default_charset', 'UTF-8'));
2922
var_dump(ini_set('internal_encoding', 'UTF-8'));
3023
var_dump(ini_set('input_encoding', 'UTF-8'));
3124
var_dump(ini_set('output_encoding', 'UTF-8'));
32-
var_dump(ini_set('mbstring.internal_encoding', 'UTF-8'));
33-
var_dump(ini_set('mbstring.http_input', 'UTF-8'));
34-
var_dump(ini_set('mbstring.http_output', 'UTF-8'));
3525

3626
echo "Getting INI\n";
3727
var_dump(ini_get('default_charset'));
3828
var_dump(ini_get('internal_encoding'));
3929
var_dump(ini_get('input_encoding'));
4030
var_dump(ini_get('output_encoding'));
4131

42-
var_dump(ini_get('mbstring.internal_encoding'));
4332
var_dump(mb_internal_encoding());
44-
var_dump(ini_get('mbstring.http_input'));
45-
var_dump(ini_get('mbstring.http_output'));
4633
--EXPECT--
4734
Getting INI
4835
string(9) "Shift_JIS"
4936
string(0) ""
5037
string(0) ""
5138
string(0) ""
52-
string(9) "Shift_JIS"
5339
string(4) "SJIS"
54-
string(9) "Shift_JIS"
55-
string(9) "Shift_JIS"
5640
Setting INI
5741
string(9) "Shift_JIS"
5842
string(0) ""
5943
string(0) ""
6044
string(0) ""
61-
string(9) "Shift_JIS"
62-
string(9) "Shift_JIS"
63-
string(9) "Shift_JIS"
6445
Getting INI
6546
string(5) "UTF-8"
6647
string(5) "UTF-8"
6748
string(5) "UTF-8"
6849
string(5) "UTF-8"
6950
string(5) "UTF-8"
70-
string(5) "UTF-8"
71-
string(5) "UTF-8"
72-
string(5) "UTF-8"

‎ext/mbstring/tests/ini_encoding2.phpt

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,10 @@ Encoding INI test
33
--SKIPIF--
44
<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
55
--INI--
6-
error_reporting=E_ALL & ~E_DEPRECATED
76
default_charset=
87
internal_encoding=EUC-JP
98
input_encoding=
109
output_encoding=
11-
mbstring.internal_encoding=
12-
mbstring.http_input=
13-
mbstring.http_output=
1410
--FILE--
1511
<?php
1612
echo "Getting INI\n";
@@ -19,54 +15,36 @@ var_dump(ini_get('internal_encoding'));
1915
var_dump(ini_get('input_encoding'));
2016
var_dump(ini_get('output_encoding'));
2117

22-
var_dump(ini_get('mbstring.internal_encoding'));
2318
var_dump(mb_internal_encoding());
24-
var_dump(ini_get('mbstring.http_input'));
25-
var_dump(ini_get('mbstring.http_output'));
2619

2720
echo "Setting INI\n";
2821
var_dump(ini_set('default_charset', 'UTF-8'));
2922
var_dump(ini_set('internal_encoding', 'UTF-8'));
3023
var_dump(ini_set('input_encoding', 'UTF-8'));
3124
var_dump(ini_set('output_encoding', 'UTF-8'));
32-
var_dump(ini_set('mbstring.internal_encoding', 'UTF-8'));
33-
var_dump(ini_set('mbstring.http_input', 'UTF-8'));
34-
var_dump(ini_set('mbstring.http_output', 'UTF-8'));
3525

3626
echo "Getting INI\n";
3727
var_dump(ini_get('default_charset'));
3828
var_dump(ini_get('internal_encoding'));
3929
var_dump(ini_get('input_encoding'));
4030
var_dump(ini_get('output_encoding'));
4131

42-
var_dump(ini_get('mbstring.internal_encoding'));
4332
var_dump(mb_internal_encoding());
44-
var_dump(ini_get('mbstring.http_input'));
45-
var_dump(ini_get('mbstring.http_output'));
4633
--EXPECT--
4734
Getting INI
4835
string(0) ""
4936
string(6) "EUC-JP"
5037
string(0) ""
5138
string(0) ""
52-
string(0) ""
5339
string(6) "EUC-JP"
54-
string(0) ""
55-
string(0) ""
5640
Setting INI
5741
string(0) ""
5842
string(6) "EUC-JP"
5943
string(0) ""
6044
string(0) ""
61-
string(0) ""
62-
string(0) ""
63-
string(0) ""
6445
Getting INI
6546
string(5) "UTF-8"
6647
string(5) "UTF-8"
6748
string(5) "UTF-8"
6849
string(5) "UTF-8"
6950
string(5) "UTF-8"
70-
string(5) "UTF-8"
71-
string(5) "UTF-8"
72-
string(5) "UTF-8"

0 commit comments

Comments
 (0)