Merge branch 'rt/plain-binary'

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

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
@@ -22,17 +22,17 @@ static int walk_tree(const unsigned char *sha1, const char *base,int baselen,
         return 0;
 }
 
 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};
 
         if (hex) {
                 if (get_sha1_hex(hex, sha1)){
                         cgit_print_error(fmt("Bad hex value: %s", hex));
                         return;
@@ -62,12 +62,18 @@ void cgit_print_blob(const char *hex, char *path, const char *head)
         buf = read_sha1_file(sha1, &type, &size);
         if (!buf) {
                 cgit_print_error(fmt("Error reading object %s", hex));
                 return;
         }
 
         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 5addd9e..9a9ae7d 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -26,17 +26,20 @@ static void print_object(const unsigned char *sha1, const char *path)
                 return;
         }
 
         buf = read_sha1_file(sha1, &type, &size);
         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);
         html_raw(buf, size);
         match = 1;
 }
 
 static int walk_tree(const unsigned char *sha1, const char *base, int baselen,