diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2012-02-08 00:52:16 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2012-02-08 00:52:16 +0000 |
| commit | 3e2e110a86f53b391fb2d6f20487e7510de4336c (patch) | |
| tree | 415612e933ef6bfae7f61f2137e549d2b1333603 /content/mimesniff.c | |
| parent | e2bb4aa4e01f0e3b6c4134081bd9a9bbcfe2e757 (diff) | |
| download | netsurf-3e2e110a86f53b391fb2d6f20487e7510de4336c.tar.gz netsurf-3e2e110a86f53b391fb2d6f20487e7510de4336c.tar.bz2 | |
Bypass full type sniffer if only images are acceptable
svn path=/trunk/netsurf/; revision=13436
Diffstat (limited to 'content/mimesniff.c')
| -rw-r--r-- | content/mimesniff.c | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/content/mimesniff.c b/content/mimesniff.c index 62dfb02bb..5b2c14fb5 100644 --- a/content/mimesniff.c +++ b/content/mimesniff.c @@ -62,6 +62,7 @@ static lwc_string *application_x_gzip; static lwc_string *application_postscript; static lwc_string *application_pdf; static lwc_string *video_mp4; +static lwc_string *image_svg; nserror mimesniff_init(void) { @@ -97,6 +98,7 @@ nserror mimesniff_init(void) SINIT(application_postscript, "application/postscript"); SINIT(application_pdf, "application/pdf"); SINIT(video_mp4, "video/mp4"); + SINIT(image_svg, "image/svg+xml"); #undef SINIT return NSERROR_OK; @@ -104,6 +106,7 @@ nserror mimesniff_init(void) void mimesniff_fini(void) { + lwc_string_unref(image_svg); lwc_string_unref(video_mp4); lwc_string_unref(application_pdf); lwc_string_unref(application_postscript); @@ -636,7 +639,7 @@ static nserror mimesniff__compute_feed_or_html(const uint8_t *data, /* See mimesniff.h for documentation */ nserror mimesniff_compute_effective_type(llcache_handle *handle, const uint8_t *data, size_t len, bool sniff_allowed, - lwc_string **effective_type) + bool image_only, lwc_string **effective_type) { #define S(s) { s, SLEN(s) } static const struct tt_s { @@ -683,6 +686,22 @@ nserror mimesniff_compute_effective_type(llcache_handle *handle, return NSERROR_OK; } + if (image_only) { + lwc_string *official_type; + + if (lwc_string_caseless_isequal(ct->media_type, image_svg, + &match) == lwc_error_ok && match) { + *effective_type = lwc_string_ref(image_svg); + http_content_type_destroy(ct); + return NSERROR_OK; + } + + official_type = lwc_string_ref(ct->media_type); + http_content_type_destroy(ct); + return mimesniff__compute_image(official_type, + data, len, effective_type); + } + content_type_header_len = strlen(content_type_header); /* Look for text types */ |