cvs: php4 /ext/mbstring mbfilter.c

helly Sun Aug 4 16:50:54 2002 EDT Modified files: /php4/ext/mbstring mbfilter.c Log: -Correct mime_name for HTML-ENTITIES encoding is of cause US-ASCII -Full list of ASCII aliases Index: php4/ext/mbstring/mbfilter.c diff -u php4/ext/mbstring/mbfilter.c:1.36 php4/ext/mbstring/mbfilter.c:1.37 --- php4/ext/mbstring/mbfilter.c:1.36 Sun Aug 4 10:20:11 2002 +++ php4/ext/mbstring/mbfilter.c Sun Aug 4 16:50:53 2002 @@ -79,7 +79,7 @@ * */ -/* $Id: mbfilter.c,v 1.36 2002/08/04 14:20:11 helly Exp $ */ +/* $Id: mbfilter.c,v 1.37 2002/08/04 20:50:53 helly Exp $ */ #ifdef HAVE_CONFIG_H @@ -507,7 +507,7 @@ 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 @@ 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 };