2 files changed, 11 insertions, 2 deletions
diff --git a/ui-blob.c b/ui-blob.c
index 3cda03d..2ccd31d 100644
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -29,3 +29,3 @@ void cgit_print_blob(const char *hex, char *path, const char *head)
 	enum object_type type;
-	unsigned char *buf;
+	char *buf;
 	unsigned long size;
@@ -69,2 +69,8 @@ void cgit_print_blob(const char *hex, char *path, const char *head)
 	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;
diff --git a/ui-plain.c b/ui-plain.c
index 5addd9e..9a9ae7d 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -33,3 +33,6 @@ static void print_object(const unsigned char *sha1, const char *path)
 	}
-	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);