summaryrefslogtreecommitdiff
path: root/content
diff options
context:
space:
mode:
Diffstat (limited to 'content')
-rw-r--r--content/content.c3
-rw-r--r--content/fetchcache.c4
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);