diff options
| author | Marcus Boerger <helly@php.net> | 2002-08-04 20:50:53 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2002-08-04 20:50:53 +0000 |
| commit | 367ca8e2ae7bbdc145562266756189047961928e (patch) | |
| tree | a282fa192a819c1041d3814013f40bd0d0cc7712 | |
| parent | ef8eb9220659913e912875792cd46c1b902ae85f (diff) | |
| download | php-git-367ca8e2ae7bbdc145562266756189047961928e.tar.gz | |
-Correct mime_name for HTML-ENTITIES encoding is of cause US-ASCII
-Full list of ASCII aliases
| -rw-r--r-- | ext/mbstring/mbfilter.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ext/mbstring/mbfilter.c b/ext/mbstring/mbfilter.c index 87e645e835..2bf816279a 100644 --- a/ext/mbstring/mbfilter.c +++ b/ext/mbstring/mbfilter.c @@ -507,7 +507,7 @@ static const char *mbfl_encoding_html_ent_aliases[] = {"HTML", "html", NULL}; static const mbfl_encoding mbfl_encoding_html_ent = { mbfl_no_encoding_html_ent, "HTML-ENTITIES", - "html", + "US-ASCII", (const char *(*)[])&mbfl_encoding_html_ent_aliases, NULL, /* mblen_table_html, Do not use table instead calulate length based on entities actually used */ MBFL_ENCTYPE_HTML_ENT @@ -689,11 +689,14 @@ static const mbfl_encoding mbfl_encoding_utf7imap = { MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE }; + +static const char *mbfl_encoding_ascii_aliases[] = {"ANSI_X3.4-1968", "iso-ir-6", "ANSI_X3.4-1986", "ISO_646.irv:1991", "US-ASCII", "ISO646-US", "us", "IBM367", "cp367", "csASCII", NULL}; + static const mbfl_encoding mbfl_encoding_ascii = { mbfl_no_encoding_ascii, "ASCII", - "US-ASCII", - NULL, + "US-ASCII", /* preferred MIME name */ + (const char *(*)[])&mbfl_encoding_ascii_aliases, NULL, MBFL_ENCTYPE_SBCS }; |