From 7d7700804278bc92c8a5e401ae88d2451180abbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Remko=20Tron=C3=A7on?= Date: Sat, 25 Jul 2009 11:45:18 +0200 Subject: ui-plain: Return 'application/octet-stream' for binary files. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Remko Tronçon Signed-off-by: Lars Hjemli --- ui-plain.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ui-plain.c b/ui-plain.c index 5addd9e..9a9ae7d 100644 --- a/ui-plain.c +++ b/ui-plain.c @@ -31,7 +31,10 @@ static void print_object(const unsigned char *sha1, const char *path) 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); -- cgit v1.2.3 From 596eb8fcb09697dd1b880123074d2ce6fdea03c0 Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Sat, 25 Jul 2009 11:51:19 +0200 Subject: ui-blob: return 'application/octet-stream' for binary blobs Signed-off-by: Lars Hjemli --- ui-blob.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ui-blob.c b/ui-blob.c index 3cda03d..2ccd31d 100644 --- a/ui-blob.c +++ b/ui-blob.c @@ -27,7 +27,7 @@ void cgit_print_blob(const char *hex, char *path, const char *head) 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 @@ void cgit_print_blob(const char *hex, char *path, const char *head) 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); -- cgit v1.2.3