com php-src: Remove the "auto" encoding: ext/mbstring/libmbfl/m bfl/mbfl_encoding.c ext/mbstring/libmbfl/mbfl/mbfl_enco ding.h
ext/mbstring/tests/mb_preferred_mime_name.ph pt
| From: | Nikita Popov | Date: | Wed, 17 Oct 2018 10:50:24 +0000 |
| Subject: | com php-src: Remove the "auto" encoding: ext/mbstring/libmbfl/m bfl/mbfl_encoding.c ext/mbstring/libmbfl/mbfl/mbfl_enco ding.h ext/mbstring/tests/mb_preferred_mime_name.ph pt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-103487@lists.php.net to get a copy of this message | ||
Commit: 1151554668557ae649d96743c3ccb2a3ea5b278f
Author: Nikita Popov <nikita.ppv@gmail.com> Wed, 17 Oct 2018 12:47:45 +0200
Parents: 56665a1b17b8877164473872b90b68d5ac311306
Branches: PHP-7.3 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1151554668557ae649d96743c3ccb2a3ea5b278f
Log:
Remove the "auto" encoding
"auto" is only meaningful in functions which accept an encoding
*list* and support encoding detection. These functions have
explicit checks for "auto". It cannot be used as a standalone
encoding in any meaningful capacity, so I'm dropping it entirely.
Changed paths:
M ext/mbstring/libmbfl/mbfl/mbfl_encoding.c
M ext/mbstring/libmbfl/mbfl/mbfl_encoding.h
M ext/mbstring/tests/mb_preferred_mime_name.phpt
Diff:
diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c
index 77c5dae..0949620 100644
--- a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c
+++ b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c
@@ -119,22 +119,8 @@
#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[] = {
&mbfl_encoding_pass,
- &mbfl_encoding_auto,
&mbfl_encoding_wchar,
&mbfl_encoding_byte2be,
&mbfl_encoding_byte2le,
diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h
index 2952977..c3a9c0a 100644
--- a/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h
+++ b/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h
@@ -36,7 +36,6 @@
enum mbfl_no_encoding {
mbfl_no_encoding_invalid = -1,
mbfl_no_encoding_pass,
- mbfl_no_encoding_auto,
mbfl_no_encoding_wchar,
mbfl_no_encoding_byte2be,
mbfl_no_encoding_byte2le,
diff --git a/ext/mbstring/tests/mb_preferred_mime_name.phpt
b/ext/mbstring/tests/mb_preferred_mime_name.phpt
index 1fa7342..df05027 100644
--- a/ext/mbstring/tests/mb_preferred_mime_name.phpt
+++ b/ext/mbstring/tests/mb_preferred_mime_name.phpt
@@ -38,7 +38,7 @@ echo "== INVALID PARAMETER ==\n";
var_dump(mb_preferred_mime_name('BAD_NAME'));
// No preferred name
-var_dump(mb_preferred_mime_name('auto'));
+var_dump(mb_preferred_mime_name('pass'));
?>
--EXPECTF--
Shift_JIS
@@ -55,5 +55,5 @@ UCS-4
Warning: mb_preferred_mime_name(): Unknown encoding "BAD_NAME" in %s on line %d
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)