diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2005-04-01 02:25:11 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2005-04-01 02:25:11 +0000 |
commit | 92fa1133c954fc3bf615fc19058abcb29702349f (patch) | |
tree | 7a925041a557caa5cb02e2d10e8aa0f0861e7454 | |
parent | e7e34b78c3c843cac7343aeb9a34090d4003d32f (diff) | |
download | netsurf-92fa1133c954fc3bf615fc19058abcb29702349f.tar.gz netsurf-92fa1133c954fc3bf615fc19058abcb29702349f.tar.bz2 |
[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
-rw-r--r-- | content/content.c | 3 | ||||
-rw-r--r-- | content/fetchcache.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/content/content.c b/content/content.c index 2edec37b0..0a2a80a02 100644 --- a/content/content.c +++ b/content/content.c @@ -63,9 +63,12 @@ static const struct mime_entry mime_map[] = { #ifdef WITH_DRAW {"application/drawfile", CONTENT_DRAW}, {"application/x-drawfile", CONTENT_DRAW}, +#endif #ifdef WITH_THEME_INSTALL {"application/x-netsurf-theme", CONTENT_THEME}, #endif + {"application/xhtml+xml", CONTENT_HTML}, +#ifdef WITH_DRAW {"image/drawfile", CONTENT_DRAW}, #endif #ifdef WITH_GIF diff --git a/content/fetchcache.c b/content/fetchcache.c index 4714d8002..61f391e84 100644 --- a/content/fetchcache.c +++ b/content/fetchcache.c @@ -75,7 +75,7 @@ struct content * fetchcache(const char *url, struct content *c; char *url1; char *hash; - + if ((url1 = strdup(url)) == NULL) return NULL; @@ -350,7 +350,7 @@ void fetchcache_callback(fetch_msg msg, void *p, const char *data, void fetchcache_init(void) { 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_.]+)=" "([-0-9a-zA-Z_.]+|\"([^\"]|[\\].)*\")[ \t]*)*$", REG_EXTENDED); |