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 <[email protected]> --- ui-plain.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ui-plain.c b/ui-plain.c index 9c86542..23a2b6d 100644 --- a/ui-plain.c +++ b/ui-plain.c @@ -83,16 +83,20 @@ 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; -- 1.8.4.566.g73d370b _______________________________________________ CGit mailing list [email protected] http://lists.zx2c4.com/mailman/listinfo/cgit
