1 files changed, 15 insertions, 1 deletions

diff --git a/ui-plain.c b/ui-plain.c
index e08b15b..a4ce077 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -4,49 +4,63 @@
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
 
 char *curr_rev;
 char *match_path;
 int match;
 
 static void print_object(const unsigned char *sha1, const char *path)
 {
         enum object_type type;
-        char *buf;
+        char *buf, *ext;
         unsigned long size;
+        struct string_list_item *mime;
 
         type = sha1_object_info(sha1, &size);
         if (type == OBJ_BAD) {
                 html_status(404, "Not found", 0);
                 return;
         }
 
         buf = read_sha1_file(sha1, &type, &size);
         if (!buf) {
                 html_status(404, "Not found", 0);
                 return;
         }
+        ctx.page.mimetype = NULL;
+        ext = strrchr(path, '.');
+        if (ext && *(++ext)) {
+                mime = string_list_lookup(ext, &ctx.cfg.mimetypes);
+                if (mime)
+                        ctx.page.mimetype = (char *)mime->util;
+        }
+        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 = fmt("%s", path);
         ctx.page.size = size;
+        ctx.page.etag = sha1_to_hex(sha1);
         cgit_print_http_headers(&ctx);
         html_raw(buf, size);
         match = 1;
 }
 
 static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
                      const char *pathname, unsigned mode, int stage,
                      void *cbdata)
 {
         if (S_ISDIR(mode))
                 return READ_TREE_RECURSIVE;
 
         if (S_ISREG(mode) && !strncmp(base, match_path, baselen) &&
             !strcmp(pathname, match_path + baselen))
                 print_object(sha1, pathname);