From 407f71cc061564d63b7358dd36a5bfebda05b15a Mon Sep 17 00:00:00 2001 From: John Keeping Date: Sun, 6 Oct 2013 12:14:41 +0100 Subject: plain: don't append charset for binary MIME types When outputting the Content-Type HTTP header we print the MIME type and then append "; charset=" if the charset variable is non-null. We don't want a charset when we have selected "application/octet-stream" or when the user has specified a custom MIME type, since they may have specified their own charset. To avoid this, make sure we set the page's charset to NULL in ui-plain before we generate the HTTP headers. Signed-off-by: John Keeping Signed-off-by: Lukas Fleischer --- ui-plain.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/ui-plain.c b/ui-plain.c index 9c86542..c9ec403 100644 --- a/ui-plain.c +++ b/ui-plain.c @@ -83,17 +83,22 @@ static int print_object(const unsigned char *sha1, const char *path) mime = string_list_lookup(&ctx.cfg.mimetypes, ext); if (mime) { ctx.page.mimetype = (char *)mime->util; + ctx.page.charset = NULL; } else { ctx.page.mimetype = get_mimetype_from_file(ctx.cfg.mimetype_file, ext); - if (ctx.page.mimetype) + if (ctx.page.mimetype) { freemime = 1; + ctx.page.charset = NULL; + } } } if (!ctx.page.mimetype) { - if (buffer_is_binary(buf, size)) + if (buffer_is_binary(buf, size)) { ctx.page.mimetype = "application/octet-stream"; - else + ctx.page.charset = NULL; + } else { ctx.page.mimetype = "text/plain"; + } } ctx.page.filename = path; ctx.page.size = size; -- cgit 1.4.1