archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.3'

Browse source
This commit is contained in:
Nikita Popov 2018-10-17 12:51:17 +02:00
commit ad6738e886
3 changed files with 2 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ext/mbstring/libmbfl/mbfl/mbfl_encoding.c
View file

@ -114,22 +114,8 @@
#endif #endif
static const char *mbfl_encoding_auto_aliases[] = {"unknown", NULL};
static const mbfl_encoding mbfl_encoding_auto = {
mbfl_no_encoding_auto,
"auto",
NULL,
(const char *(*)[])&mbfl_encoding_auto_aliases,
NULL,
0,
NULL,
NULL
};
static const mbfl_encoding *mbfl_encoding_ptr_list[] = { static const mbfl_encoding *mbfl_encoding_ptr_list[] = {
&mbfl_encoding_pass, &mbfl_encoding_pass,
&mbfl_encoding_auto,
&mbfl_encoding_wchar, &mbfl_encoding_wchar,
&mbfl_encoding_byte2be, &mbfl_encoding_byte2be,
&mbfl_encoding_byte2le, &mbfl_encoding_byte2le,

1
ext/mbstring/libmbfl/mbfl/mbfl_encoding.h
View file

@ -36,7 +36,6 @@
enum mbfl_no_encoding { enum mbfl_no_encoding {
mbfl_no_encoding_invalid = -1, mbfl_no_encoding_invalid = -1,
mbfl_no_encoding_pass, mbfl_no_encoding_pass,
mbfl_no_encoding_auto,
mbfl_no_encoding_wchar, mbfl_no_encoding_wchar,
mbfl_no_encoding_byte2be, mbfl_no_encoding_byte2be,
mbfl_no_encoding_byte2le, mbfl_no_encoding_byte2le,

4
ext/mbstring/tests/mb_preferred_mime_name.phpt
View file

@ -38,7 +38,7 @@ echo "== INVALID PARAMETER ==\n";
var_dump(mb_preferred_mime_name('BAD_NAME')); var_dump(mb_preferred_mime_name('BAD_NAME'));
// No preferred name // No preferred name
var_dump(mb_preferred_mime_name('auto')); var_dump(mb_preferred_mime_name('pass'));
?> ?>
--EXPECTF-- --EXPECTF--
Shift_JIS Shift_JIS
@ -55,5 +55,5 @@ UCS-4
Warning: mb_preferred_mime_name(): Unknown encoding "BAD_NAME" in %s on line %d Warning: mb_preferred_mime_name(): Unknown encoding "BAD_NAME" in %s on line %d
bool(false) bool(false)
Warning: mb_preferred_mime_name(): No MIME preferred name corresponding to "auto" in %s on line %d Warning: mb_preferred_mime_name(): No MIME preferred name corresponding to "pass" in %s on line %d
bool(false) bool(false)