Skip to content

Commit a4331a6

Browse files
nikicnikic
committed
Update iconv parameter names
And rename charset to encoding, including inside error messages. Closes GH-6234.
1 parent 6dac6a9 commit a4331a6

15 files changed

+50
-50
lines changed

‎ext/iconv/iconv.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1747,7 +1747,7 @@ static void _php_iconv_show_error(php_iconv_err_t err, const char *out_charset,
17471747
break;
17481748

17491749
case PHP_ICONV_ERR_WRONG_CHARSET:
1750-
php_error_docref(NULL, E_WARNING, "Wrong charset, conversion from \"%s\" to \"%s\" is not allowed",
1750+
php_error_docref(NULL, E_WARNING, "Wrong encoding, conversion from \"%s\" to \"%s\" is not allowed",
17511751
in_charset, out_charset);
17521752
break;
17531753

@@ -1799,7 +1799,7 @@ PHP_FUNCTION(iconv_strlen)
17991799
if (charset == NULL) {
18001800
charset = get_internal_encoding();
18011801
} else if (charset_len >= ICONV_CSNMAXLEN) {
1802-
php_error_docref(NULL, E_WARNING, "Charset parameter exceeds the maximum allowed length of %d characters", ICONV_CSNMAXLEN);
1802+
php_error_docref(NULL, E_WARNING, "Encoding parameter exceeds the maximum allowed length of %d characters", ICONV_CSNMAXLEN);
18031803
RETURN_FALSE;
18041804
}
18051805

@@ -1835,7 +1835,7 @@ PHP_FUNCTION(iconv_substr)
18351835
if (charset == NULL) {
18361836
charset = get_internal_encoding();
18371837
} else if (charset_len >= ICONV_CSNMAXLEN) {
1838-
php_error_docref(NULL, E_WARNING, "Charset parameter exceeds the maximum allowed length of %d characters", ICONV_CSNMAXLEN);
1838+
php_error_docref(NULL, E_WARNING, "Encoding parameter exceeds the maximum allowed length of %d characters", ICONV_CSNMAXLEN);
18391839
RETURN_FALSE;
18401840
}
18411841

@@ -1876,7 +1876,7 @@ PHP_FUNCTION(iconv_strpos)
18761876
if (charset == NULL) {
18771877
charset = get_internal_encoding();
18781878
} else if (charset_len >= ICONV_CSNMAXLEN) {
1879-
php_error_docref(NULL, E_WARNING, "Charset parameter exceeds the maximum allowed length of %d characters", ICONV_CSNMAXLEN);
1879+
php_error_docref(NULL, E_WARNING, "Encoding parameter exceeds the maximum allowed length of %d characters", ICONV_CSNMAXLEN);
18801880
RETURN_FALSE;
18811881
}
18821882

@@ -1937,7 +1937,7 @@ PHP_FUNCTION(iconv_strrpos)
19371937
if (charset == NULL) {
19381938
charset = get_internal_encoding();
19391939
} else if (charset_len >= ICONV_CSNMAXLEN) {
1940-
php_error_docref(NULL, E_WARNING, "Charset parameter exceeds the maximum allowed length of %d characters", ICONV_CSNMAXLEN);
1940+
php_error_docref(NULL, E_WARNING, "Encoding parameter exceeds the maximum allowed length of %d characters", ICONV_CSNMAXLEN);
19411941
RETURN_FALSE;
19421942
}
19431943

@@ -1996,7 +1996,7 @@ PHP_FUNCTION(iconv_mime_encode)
19961996

19971997
if ((pzval = zend_hash_str_find_deref(Z_ARRVAL_P(pref), "input-charset", sizeof("input-charset") - 1)) != NULL && Z_TYPE_P(pzval) == IS_STRING) {
19981998
if (Z_STRLEN_P(pzval) >= ICONV_CSNMAXLEN) {
1999-
php_error_docref(NULL, E_WARNING, "Charset parameter exceeds the maximum allowed length of %d characters", ICONV_CSNMAXLEN);
1999+
php_error_docref(NULL, E_WARNING, "Encoding parameter exceeds the maximum allowed length of %d characters", ICONV_CSNMAXLEN);
20002000
RETURN_FALSE;
20012001
}
20022002

@@ -2008,7 +2008,7 @@ PHP_FUNCTION(iconv_mime_encode)
20082008

20092009
if ((pzval = zend_hash_str_find_deref(Z_ARRVAL_P(pref), "output-charset", sizeof("output-charset") - 1)) != NULL && Z_TYPE_P(pzval) == IS_STRING) {
20102010
if (Z_STRLEN_P(pzval) >= ICONV_CSNMAXLEN) {
2011-
php_error_docref(NULL, E_WARNING, "Charset parameter exceeds the maximum allowed length of %d characters", ICONV_CSNMAXLEN);
2011+
php_error_docref(NULL, E_WARNING, "Encoding parameter exceeds the maximum allowed length of %d characters", ICONV_CSNMAXLEN);
20122012
RETURN_FALSE;
20132013
}
20142014

@@ -2077,7 +2077,7 @@ PHP_FUNCTION(iconv_mime_decode)
20772077
if (charset == NULL) {
20782078
charset = get_internal_encoding();
20792079
} else if (charset_len >= ICONV_CSNMAXLEN) {
2080-
php_error_docref(NULL, E_WARNING, "Charset parameter exceeds the maximum allowed length of %d characters", ICONV_CSNMAXLEN);
2080+
php_error_docref(NULL, E_WARNING, "Encoding parameter exceeds the maximum allowed length of %d characters", ICONV_CSNMAXLEN);
20812081
RETURN_FALSE;
20822082
}
20832083

@@ -2118,7 +2118,7 @@ PHP_FUNCTION(iconv_mime_decode_headers)
21182118
if (charset == NULL) {
21192119
charset = get_internal_encoding();
21202120
} else if (charset_len >= ICONV_CSNMAXLEN) {
2121-
php_error_docref(NULL, E_WARNING, "Charset parameter exceeds the maximum allowed length of %d characters", ICONV_CSNMAXLEN);
2121+
php_error_docref(NULL, E_WARNING, "Encoding parameter exceeds the maximum allowed length of %d characters", ICONV_CSNMAXLEN);
21222122
RETURN_FALSE;
21232123
}
21242124

@@ -2211,7 +2211,7 @@ PHP_FUNCTION(iconv)
22112211
}
22122212

22132213
if (in_charset_len >= ICONV_CSNMAXLEN || out_charset_len >= ICONV_CSNMAXLEN) {
2214-
php_error_docref(NULL, E_WARNING, "Charset parameter exceeds the maximum allowed length of %d characters", ICONV_CSNMAXLEN);
2214+
php_error_docref(NULL, E_WARNING, "Encoding parameter exceeds the maximum allowed length of %d characters", ICONV_CSNMAXLEN);
22152215
RETURN_FALSE;
22162216
}
22172217

@@ -2241,7 +2241,7 @@ PHP_FUNCTION(iconv_set_encoding)
22412241
}
22422242

22432243
if (ZSTR_LEN(charset) >= ICONV_CSNMAXLEN) {
2244-
php_error_docref(NULL, E_WARNING, "Charset parameter exceeds the maximum allowed length of %d characters", ICONV_CSNMAXLEN);
2244+
php_error_docref(NULL, E_WARNING, "Encoding parameter exceeds the maximum allowed length of %d characters", ICONV_CSNMAXLEN);
22452245
RETURN_FALSE;
22462246
}
22472247

‎ext/iconv/iconv.stub.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@
22

33
/** @generate-function-entries */
44

5-
function iconv_strlen(string $str, ?string $charset = null): int|false {}
5+
function iconv_strlen(string $string, ?string $encoding = null): int|false {}
66

7-
function iconv_substr(string $str, int $offset, ?int $length = null, ?string $charset = null): string|false {}
7+
function iconv_substr(string $string, int $offset, ?int $length = null, ?string $encoding = null): string|false {}
88

9-
function iconv_strpos(string $haystack, string $needle, int $offset = 0, ?string $charset = null): int|false {}
9+
function iconv_strpos(string $haystack, string $needle, int $offset = 0, ?string $encoding = null): int|false {}
1010

11-
function iconv_strrpos(string $haystack, string $needle, ?string $charset = null): int|false {}
11+
function iconv_strrpos(string $haystack, string $needle, ?string $encoding = null): int|false {}
1212

13-
function iconv_mime_encode(string $field_name, string $field_value, array $preference = []): string|false {}
13+
function iconv_mime_encode(string $field_name, string $field_value, array $options = []): string|false {}
1414

15-
function iconv_mime_decode(string $encoded_string, int $mode = 0, ?string $charset = null): string|false {}
15+
function iconv_mime_decode(string $string, int $mode = 0, ?string $encoding = null): string|false {}
1616

17-
function iconv_mime_decode_headers(string $headers, int $mode = 0, ?string $charset = null): array|false {}
17+
function iconv_mime_decode_headers(string $headers, int $mode = 0, ?string $encoding = null): array|false {}
1818

19-
function iconv(string $in_charset, string $out_charset, string $str): string|false {}
19+
function iconv(string $from_encoding, string $to_encoding, string $string): string|false {}
2020

21-
function iconv_set_encoding(string $type, string $charset): bool {}
21+
function iconv_set_encoding(string $type, string $encoding): bool {}
2222

2323
function iconv_get_encoding(string $type = "all"): array|string|false {}

‎ext/iconv/iconv_arginfo.h

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,58 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 4e26168b04450adf510a4e638184c46757679ac1 */
2+
* Stub hash: 5d05deb60466c6e1ee73b44ad0b09a032bc8410e */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_iconv_strlen, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
5-
ZEND_ARG_TYPE_INFO(0, str, IS_STRING, 0)
6-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, charset, IS_STRING, 1, "null")
5+
ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
6+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, encoding, IS_STRING, 1, "null")
77
ZEND_END_ARG_INFO()
88

99
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_iconv_substr, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
10-
ZEND_ARG_TYPE_INFO(0, str, IS_STRING, 0)
10+
ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
1111
ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0)
1212
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, length, IS_LONG, 1, "null")
13-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, charset, IS_STRING, 1, "null")
13+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, encoding, IS_STRING, 1, "null")
1414
ZEND_END_ARG_INFO()
1515

1616
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_iconv_strpos, 0, 2, MAY_BE_LONG|MAY_BE_FALSE)
1717
ZEND_ARG_TYPE_INFO(0, haystack, IS_STRING, 0)
1818
ZEND_ARG_TYPE_INFO(0, needle, IS_STRING, 0)
1919
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, offset, IS_LONG, 0, "0")
20-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, charset, IS_STRING, 1, "null")
20+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, encoding, IS_STRING, 1, "null")
2121
ZEND_END_ARG_INFO()
2222

2323
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_iconv_strrpos, 0, 2, MAY_BE_LONG|MAY_BE_FALSE)
2424
ZEND_ARG_TYPE_INFO(0, haystack, IS_STRING, 0)
2525
ZEND_ARG_TYPE_INFO(0, needle, IS_STRING, 0)
26-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, charset, IS_STRING, 1, "null")
26+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, encoding, IS_STRING, 1, "null")
2727
ZEND_END_ARG_INFO()
2828

2929
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_iconv_mime_encode, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
3030
ZEND_ARG_TYPE_INFO(0, field_name, IS_STRING, 0)
3131
ZEND_ARG_TYPE_INFO(0, field_value, IS_STRING, 0)
32-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, preference, IS_ARRAY, 0, "[]")
32+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 0, "[]")
3333
ZEND_END_ARG_INFO()
3434

3535
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_iconv_mime_decode, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
36-
ZEND_ARG_TYPE_INFO(0, encoded_string, IS_STRING, 0)
36+
ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
3737
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "0")
38-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, charset, IS_STRING, 1, "null")
38+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, encoding, IS_STRING, 1, "null")
3939
ZEND_END_ARG_INFO()
4040

4141
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_iconv_mime_decode_headers, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE)
4242
ZEND_ARG_TYPE_INFO(0, headers, IS_STRING, 0)
4343
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "0")
44-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, charset, IS_STRING, 1, "null")
44+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, encoding, IS_STRING, 1, "null")
4545
ZEND_END_ARG_INFO()
4646

4747
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_iconv, 0, 3, MAY_BE_STRING|MAY_BE_FALSE)
48-
ZEND_ARG_TYPE_INFO(0, in_charset, IS_STRING, 0)
49-
ZEND_ARG_TYPE_INFO(0, out_charset, IS_STRING, 0)
50-
ZEND_ARG_TYPE_INFO(0, str, IS_STRING, 0)
48+
ZEND_ARG_TYPE_INFO(0, from_encoding, IS_STRING, 0)
49+
ZEND_ARG_TYPE_INFO(0, to_encoding, IS_STRING, 0)
50+
ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
5151
ZEND_END_ARG_INFO()
5252

5353
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_iconv_set_encoding, 0, 2, _IS_BOOL, 0)
5454
ZEND_ARG_TYPE_INFO(0, type, IS_STRING, 0)
55-
ZEND_ARG_TYPE_INFO(0, charset, IS_STRING, 0)
55+
ZEND_ARG_TYPE_INFO(0, encoding, IS_STRING, 0)
5656
ZEND_END_ARG_INFO()
5757

5858
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_iconv_get_encoding, 0, 0, MAY_BE_ARRAY|MAY_BE_STRING|MAY_BE_FALSE)

‎ext/iconv/tests/iconv-charset-length-cve-2007-4840.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ var_dump(iconv($a, "b", "test"));
99
var_dump(iconv("x", $a, "test"));
1010
?>
1111
--EXPECTF--
12-
Warning: iconv(): Charset parameter exceeds the maximum allowed length of %d characters in %s on line %d
12+
Warning: iconv(): Encoding parameter exceeds the maximum allowed length of 64 characters in %s on line %d
1313
bool(false)
1414

15-
Warning: iconv(): Charset parameter exceeds the maximum allowed length of %d characters in %s on line %d
15+
Warning: iconv(): Encoding parameter exceeds the maximum allowed length of 64 characters in %s on line %d
1616
bool(false)

‎ext/iconv/tests/iconv_mime_decode-charset-length-cve-2007-4840.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ $a = str_repeat("/", 9000000);
88
var_dump(iconv_mime_decode("a", null, $a));
99
?>
1010
--EXPECTF--
11-
Warning: iconv_mime_decode(): Charset parameter exceeds the maximum allowed length of %d characters in %s on line %d
11+
Warning: iconv_mime_decode(): Encoding parameter exceeds the maximum allowed length of 64 characters in %s on line %d
1212
bool(false)

‎ext/iconv/tests/iconv_mime_decode_headers-charset-length-cve-2007-4840.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ $a = str_repeat("/", 9000000);
88
var_dump(iconv_mime_decode_headers("a", null, $a));
99
?>
1010
--EXPECTF--
11-
Warning: iconv_mime_decode_headers(): Charset parameter exceeds the maximum allowed length of %d characters in %s on line %d
11+
Warning: iconv_mime_decode_headers(): Encoding parameter exceeds the maximum allowed length of 64 characters in %s on line %d
1212
bool(false)

‎ext/iconv/tests/iconv_set_encoding-charset-length-cve-2007-4840.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ var_dump(iconv_set_encoding("output_encoding", $a));
1010
var_dump(iconv_set_encoding("internal_encoding", $a));
1111
?>
1212
--EXPECTF--
13-
Warning: iconv_set_encoding(): Charset parameter exceeds the maximum allowed length of %d characters in %s on line %d
13+
Warning: iconv_set_encoding(): Encoding parameter exceeds the maximum allowed length of 64 characters in %s on line %d
1414
bool(false)
1515

16-
Warning: iconv_set_encoding(): Charset parameter exceeds the maximum allowed length of %d characters in %s on line %d
16+
Warning: iconv_set_encoding(): Encoding parameter exceeds the maximum allowed length of 64 characters in %s on line %d
1717
bool(false)
1818

19-
Warning: iconv_set_encoding(): Charset parameter exceeds the maximum allowed length of %d characters in %s on line %d
19+
Warning: iconv_set_encoding(): Encoding parameter exceeds the maximum allowed length of 64 characters in %s on line %d
2020
bool(false)

‎ext/iconv/tests/iconv_strlen-charset-length-cve-2007-4840.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ $a = str_repeat("/", 9791999);
88
var_dump(iconv_strlen(1, $a));
99
?>
1010
--EXPECTF--
11-
Warning: iconv_strlen(): Charset parameter exceeds the maximum allowed length of %d characters in %s on line %d
11+
Warning: iconv_strlen(): Encoding parameter exceeds the maximum allowed length of 64 characters in %s on line %d
1212
bool(false)

‎ext/iconv/tests/iconv_strlen_error2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ var_dump(iconv_strlen($string, $encoding));
2323
--EXPECTF--
2424
*** Testing iconv_strlen() : error ***
2525

26-
Warning: iconv_strlen(): Wrong charset, conversion from "unknown-encoding" to "UCS-4LE" is not allowed in %s on line %d
26+
Warning: iconv_strlen(): Wrong encoding, conversion from "unknown-encoding" to "UCS-4LE" is not allowed in %s on line %d
2727
bool(false)

‎ext/iconv/tests/iconv_strpos-charset-length-cve-2007-4840.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ $a = str_repeat("/", 9000000);
88
var_dump(iconv_strpos("a", "b", 0, $a));
99
?>
1010
--EXPECTF--
11-
Warning: iconv_strpos(): Charset parameter exceeds the maximum allowed length of %d characters in %s on line %d
11+
Warning: iconv_strpos(): Encoding parameter exceeds the maximum allowed length of 64 characters in %s on line %d
1212
bool(false)

‎ext/iconv/tests/iconv_strpos_error2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ echo "Done";
2424
--EXPECTF--
2525
*** Testing iconv_strpos() : error conditions ***
2626

27-
Warning: iconv_strpos(): Wrong charset, conversion from "unknown-encoding" to "UCS-4LE" is not allowed in %s on line %d
27+
Warning: iconv_strpos(): Wrong encoding, conversion from "unknown-encoding" to "UCS-4LE" is not allowed in %s on line %d
2828
bool(false)
2929
Done

‎ext/iconv/tests/iconv_strrpos-charset-length-cve-2007-4840.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ $a = str_repeat("/", 9000000);
88
var_dump(iconv_strrpos("a", "b", $a));
99
?>
1010
--EXPECTF--
11-
Warning: iconv_strrpos(): Charset parameter exceeds the maximum allowed length of %d characters in %s on line %d
11+
Warning: iconv_strrpos(): Encoding parameter exceeds the maximum allowed length of 64 characters in %s on line %d
1212
bool(false)

‎ext/iconv/tests/iconv_strrpos_error2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ echo "Done";
2525
--EXPECTF--
2626
*** Testing iconv_strrpos() : error conditions ***
2727

28-
Warning: iconv_strrpos(): Wrong charset, conversion from "unknown-encoding" to "UCS-4LE" is not allowed in %s on line %d
28+
Warning: iconv_strrpos(): Wrong encoding, conversion from "unknown-encoding" to "UCS-4LE" is not allowed in %s on line %d
2929
bool(false)
3030
Done

‎ext/iconv/tests/iconv_substr-charset-length-cve-2007-4783.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ $b = str_repeat('/', 2798349);
99
var_dump(iconv_substr($a, 0, 1, $b));
1010
?>
1111
--EXPECTF--
12-
Warning: iconv_substr(): Charset parameter exceeds the maximum allowed length of %d characters in %s on line %d
12+
Warning: iconv_substr(): Encoding parameter exceeds the maximum allowed length of 64 characters in %s on line %d
1313
bool(false)

‎ext/iconv/tests/iconv_substr_error2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ echo "Done";
2525
--EXPECTF--
2626
*** Testing iconv_substr() : error conditions ***
2727

28-
Warning: iconv_substr(): Wrong charset, conversion from "unknown-encoding" to "UCS-4LE" is not allowed in %s on line %d
28+
Warning: iconv_substr(): Wrong encoding, conversion from "unknown-encoding" to "UCS-4LE" is not allowed in %s on line %d
2929
bool(false)
3030
Done

0 commit comments

Comments
 (0)