[project @ 2005-04-01 02:25:11 by jmb]

application/xhtml+xml -> CONTENT_HTML
Fix minor issue with mimetype matching regexp.

svn path=/import/netsurf/; revision=1587
This commit is contained in:
John Mark Bell 2005-04-01 02:25:11 +00:00
parent e7e34b78c3
commit 92fa1133c9
2 changed files with 5 additions and 2 deletions

View File

@ -63,9 +63,12 @@ static const struct mime_entry mime_map[] = {
#ifdef WITH_DRAW #ifdef WITH_DRAW
{"application/drawfile", CONTENT_DRAW}, {"application/drawfile", CONTENT_DRAW},
{"application/x-drawfile", CONTENT_DRAW}, {"application/x-drawfile", CONTENT_DRAW},
#endif
#ifdef WITH_THEME_INSTALL #ifdef WITH_THEME_INSTALL
{"application/x-netsurf-theme", CONTENT_THEME}, {"application/x-netsurf-theme", CONTENT_THEME},
#endif #endif
{"application/xhtml+xml", CONTENT_HTML},
#ifdef WITH_DRAW
{"image/drawfile", CONTENT_DRAW}, {"image/drawfile", CONTENT_DRAW},
#endif #endif
#ifdef WITH_GIF #ifdef WITH_GIF

View File

@ -350,7 +350,7 @@ void fetchcache_callback(fetch_msg msg, void *p, const char *data,
void fetchcache_init(void) void fetchcache_init(void)
{ {
regcomp_wrapper(&re_content_type, regcomp_wrapper(&re_content_type,
"^([-0-9a-zA-Z_.]+/[-0-9a-zA-Z_.]+)[ \t]*" "^([-0-9a-zA-Z_.]+/[-0-9a-zA-Z_.+]+)[ \t]*"
"(;[ \t]*([-0-9a-zA-Z_.]+)=" "(;[ \t]*([-0-9a-zA-Z_.]+)="
"([-0-9a-zA-Z_.]+|\"([^\"]|[\\].)*\")[ \t]*)*$", "([-0-9a-zA-Z_.]+|\"([^\"]|[\\].)*\")[ \t]*)*$",
REG_EXTENDED); REG_EXTENDED);