diff options
author | John Keeping <john@keeping.me.uk> | 2013-10-06 13:14:41 +0200 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2014-01-08 14:59:38 +0100 |
commit | 407f71cc061564d63b7358dd36a5bfebda05b15a (patch) | |
tree | 9691450ae35a95e27fe0ff9d782a84675cad7681 /ui-plain.c | |
parent | d76c438eada18cd3fd2980c9555f542cbe636479 (diff) | |
download | cgit-407f71cc061564d63b7358dd36a5bfebda05b15a.tar.gz cgit-407f71cc061564d63b7358dd36a5bfebda05b15a.tar.xz |
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=<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 <john@keeping.me.uk>
Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
Diffstat (limited to 'ui-plain.c')
-rw-r--r-- | ui-plain.c | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -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; |