2 files changed, 10 insertions, 1 deletions
diff --git a/ui-blob.c b/ui-blob.c
index 3cda03d..2ccd31d 100644
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -28,5 +28,5 @@ 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;
@@ -68,4 +68,10 @@ 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);
diff --git a/ui-plain.c b/ui-plain.c
index 5addd9e..9a9ae7d 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -32,4 +32,7 @@ static void print_object(const unsigned char *sha1, const char *path)
 		return;
 	}
+	if (buffer_is_binary(buf, size))
+		ctx.page.mimetype = "application/octet-stream";
+	else
 	ctx.page.mimetype = "text/plain";
 	ctx.page.filename = fmt("%s", path);