Author: Lars Hjemli <hjemli@gmail.com>
Merge branch 'rt/plain-binary' Signed-off-by: Lars Hjemli <hjemli@gmail.com>
ui-blob.c | 8 +++++++- ui-plain.c | 5 ++++-
diff --git a/ui-blob.c b/ui-blob.c index 3cda03d37992e987a3000613b01d6d7ac325db18..2ccd31d2a19e5df1651cf2efff5952254cb3a0ad 100644 --- a/ui-blob.c +++ b/ui-blob.c @@ -27,7 +27,7 @@ { unsigned char sha1[20]; enum object_type type; - unsigned char *buf; + char *buf; unsigned long size; struct commit *commit; const char *paths[] = {path, NULL}; @@ -67,6 +67,12 @@ } buf[size] = '\0'; ctx.page.mimetype = ctx.qry.mimetype; + if (!ctx.page.mimetype) { + if (buffer_is_binary(buf, size)) + ctx.page.mimetype = "application/octet-stream"; + else + ctx.page.mimetype = "text/plain"; + } ctx.page.filename = path; cgit_print_http_headers(&ctx); write(htmlfd, buf, size); diff --git a/ui-plain.c b/ui-plain.c index 5addd9e686539ca41f264394ecf6836aa739af4e..9a9ae7d5a80ccea3db7bea37a69405ca60e56edd 100644 --- a/ui-plain.c +++ b/ui-plain.c @@ -31,7 +31,10 @@ if (!buf) { html_status(404, "Not found", 0); return; } - ctx.page.mimetype = "text/plain"; + if (buffer_is_binary(buf, size)) + ctx.page.mimetype = "application/octet-stream"; + else + ctx.page.mimetype = "text/plain"; ctx.page.filename = fmt("%s", path); ctx.page.size = size; cgit_print_http_headers(&ctx);