Merge branch 'rt/plain-binary'

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

1 files changed, 7 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
@@ -26,9 +26,9 @@ 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};
 
@@ -66,8 +66,14 @@ 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);
 }