4 files changed, 10 insertions, 1 deletions
diff --git a/cgit.h b/cgit.h
index 163f355..6c7a941 100644
--- a/cgit.h
+++ b/cgit.h
@@ -39,24 +39,29 @@
 /*
 * Limits used for relative dates
 */
 #define TM_MIN    60
 #define TM_HOUR  (TM_MIN * 60)
 #define TM_DAY   (TM_HOUR * 24)
 #define TM_WEEK  (TM_DAY * 7)
 #define TM_YEAR  (TM_DAY * 365)
 #define TM_MONTH (TM_YEAR / 12.0)
+/*
+ * Default encoding
+ */
+#define PAGE_ENCODING "UTF-8"
 typedef void (*configfn)(const char *name, const char *value);
 typedef void (*filepair_fn)(struct diff_filepair *pair);
 typedef void (*linediff_fn)(char *line, int len);
 struct cacheitem {
        char *name;
        struct stat st;
        int ttl;
        int fd;
 };
 struct repoinfo {
@@ -81,24 +86,25 @@ struct repolist {
 };
 struct commitinfo {
        struct commit *commit;
        char *author;
        char *author_email;
        unsigned long author_date;
        char *committer;
        char *committer_email;
        unsigned long committer_date;
        char *subject;
        char *msg;
+        char *msg_encoding;
 };
 struct taginfo {
        char *tagger;
        char *tagger_email;
        int tagger_date;
        char *msg;
 };
 struct refinfo {
        const char *refname;
        struct object *object;
diff --git a/parsing.c b/parsing.c
index 30e7648..0412a9c 100644
--- a/parsing.c
+++ b/parsing.c
@@ -190,24 +190,25 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
 {
        struct commitinfo *ret;
        char *p = commit->buffer, *t = commit->buffer;
        ret = xmalloc(sizeof(*ret));
        ret->commit = commit;
        ret->author = NULL;
        ret->author_email = NULL;
        ret->committer = NULL;
        ret->committer_email = NULL;
        ret->subject = NULL;
        ret->msg = NULL;
+        ret->msg_encoding = NULL;
        if (p == NULL)
                return ret;
        if (strncmp(p, "tree ", 5))
                die("Bad commit: %s", sha1_to_hex(commit->object.sha1));
        else
                p += 46; // "tree " + hex[40] + "\n"
        while (!strncmp(p, "parent ", 7))
                p += 48; // "parent " + hex[40] + "\n"
diff --git a/shared.c b/shared.c
index e06df91..a04c4dc 100644
--- a/shared.c
+++ b/shared.c
@@ -256,24 +256,26 @@ void cgit_querystring_cb(const char *name, const char *value)
        } else if (!strcmp(name, "name")) {
                cgit_query_name = xstrdup(value);
        }
 }
 void *cgit_free_commitinfo(struct commitinfo *info)
 {
        free(info->author);
        free(info->author_email);
        free(info->committer);
        free(info->committer_email);
        free(info->subject);
+        free(info->msg);
+        free(info->msg_encoding);
        free(info);
        return NULL;
 }
 int hextoint(char c)
 {
        if (c >= 'a' && c <= 'f')
                return 10 + c - 'a';
        else if (c >= 'A' && c <= 'F')
                return 10 + c - 'A';
        else if (c >= '0' && c <= '9')
                return c - '0';
diff --git a/ui-shared.c b/ui-shared.c
index 72a7b44..7c69f60 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -343,25 +343,25 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
        }
        if (secs < TM_YEAR * 2) {
                htmlf("<span class='age-months'>%.0f months</span>",
                      secs * 1.0 / TM_MONTH);
                return;
        }
        htmlf("<span class='age-years'>%.0f years</span>",
              secs * 1.0 / TM_YEAR);
 }
 void cgit_print_docstart(char *title, struct cacheitem *item)
 {
-        html("Content-Type: text/html; charset=utf-8\n");
+        html("Content-Type: text/html; charset=" PAGE_ENCODING "\n");
        htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));
        htmlf("Expires: %s\n", http_date(item->st.st_mtime +
                                         ttl_seconds(item->ttl)));
        html("\n");
        html(cgit_doctype);
        html("<html>\n");
        html("<head>\n");
        html("<title>");
        html_txt(title);
        html("</title>\n");
        htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
        html("<link rel='stylesheet' type='text/css' href='");