4 files changed, 41 insertions, 1 deletions

diff --git a/cgit.c b/cgit.c
index 2039ab1..4f414c3 100644
--- a/cgit.c
+++ b/cgit.c
@@ -19,2 +19,10 @@ const char *cgit_version = CGIT_VERSION;
 
+void add_mimetype(const char *name, const char *value)
+{
+        struct string_list_item *item;
+
+        item = string_list_insert(xstrdup(name), &ctx.cfg.mimetypes);
+        item->util = xstrdup(value);
+}
+
 void config_cb(const char *name, const char *value)
@@ -103,2 +111,4 @@ void config_cb(const char *name, const char *value)
                 ctx.cfg.local_time = atoi(value);
+        else if (!prefixcmp(name, "mimetype."))
+                add_mimetype(name + 9, value);
         else if (!strcmp(name, "repo.group"))
@@ -215,2 +225,3 @@ static void prepare_context(struct cgit_context *ctx)
         ctx->page.etag = NULL;
+        memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list));
 }
diff --git a/cgit.h b/cgit.h
index 8c64efe..9259f33 100644
--- a/cgit.h
+++ b/cgit.h
@@ -17,2 +17,3 @@
 #include <archive.h>
+#include <string-list.h>
 #include <xdiff-interface.h>
@@ -176,2 +177,3 @@ struct cgit_config {
         int summary_tags;
+        struct string_list mimetypes;
 };
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index a207fe0..7256ec0 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -149,2 +149,6 @@ max-stats::
 
+mimetype.<ext>::
+        Set the mimetype for the specified filename extension. This is used
+        by the `plain` command when returning blob content.
+
 module-link::
@@ -327,2 +331,15 @@ snapshots=tar.gz tar.bz2 zip
 ##
+## List of common mimetypes
+##
+
+mimetype.git=image/git
+mimetype.html=text/html
+mimetype.jpg=image/jpeg
+mimetype.jpeg=image/jpeg
+mimetype.pdf=application/pdf
+mimetype.png=image/png
+mimetype.svg=image/svg+xml
+
+
+##
 ## List of repositories.
diff --git a/ui-plain.c b/ui-plain.c
index 93a3a05..27c6dae 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -19,4 +19,5 @@ 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;
 
@@ -33,2 +34,10 @@ static void print_object(const unsigned char *sha1, const char *path)
         }
+        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))
@@ -37,2 +46,3 @@ static void print_object(const unsigned char *sha1, const char *path)
                 ctx.page.mimetype = "text/plain";
+        }
         ctx.page.filename = fmt("%s", path);