mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-25 18:08:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

plain: don't append charset for binary MIME types

Browse Source 
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>
This commit is contained in:
John Keeping 2013-10-06 12:14:41 +01:00 committed by Jason A. Donenfeld
parent d76c438ead
commit 407f71cc06
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ui-plain.c
View File

@ -83,18 +83,23 @@ static int print_object(const unsigned char *sha1, const char *path)
mime = string_list_lookup(&ctx.cfg.mimetypes, ext); mime = string_list_lookup(&ctx.cfg.mimetypes, ext);
if (mime) { if (mime) {
ctx.page.mimetype = (char *)mime->util; ctx.page.mimetype = (char *)mime->util;
ctx.page.charset = NULL;
} else { } else {
ctx.page.mimetype = get_mimetype_from_file(ctx.cfg.mimetype_file, ext); ctx.page.mimetype = get_mimetype_from_file(ctx.cfg.mimetype_file, ext);
if (ctx.page.mimetype) if (ctx.page.mimetype) {
freemime = 1; freemime = 1;
ctx.page.charset = NULL;
}
} }
} }
if (!ctx.page.mimetype) { if (!ctx.page.mimetype) {
if (buffer_is_binary(buf, size)) if (buffer_is_binary(buf, size)) {
ctx.page.mimetype = "application/octet-stream"; ctx.page.mimetype = "application/octet-stream";
else ctx.page.charset = NULL;
} else {
ctx.page.mimetype = "text/plain"; ctx.page.mimetype = "text/plain";
} }
}
ctx.page.filename = path; ctx.page.filename = path;
ctx.page.size = size; ctx.page.size = size;
ctx.page.etag = sha1_to_hex(sha1); ctx.page.etag = sha1_to_hex(sha1);