diff options
-rw-r--r-- | cgit.h | 6 | ||||
-rw-r--r-- | parsing.c | 1 | ||||
-rw-r--r-- | shared.c | 2 | ||||
-rw-r--r-- | ui-shared.c | 2 |
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 | |||
@@ -48,6 +48,11 @@ | |||
48 | #define TM_MONTH (TM_YEAR / 12.0) | 48 | #define TM_MONTH (TM_YEAR / 12.0) |
49 | 49 | ||
50 | 50 | ||
51 | /* | ||
52 | * Default encoding | ||
53 | */ | ||
54 | #define PAGE_ENCODING "UTF-8" | ||
55 | |||
51 | typedef void (*configfn)(const char *name, const char *value); | 56 | typedef void (*configfn)(const char *name, const char *value); |
52 | typedef void (*filepair_fn)(struct diff_filepair *pair); | 57 | typedef void (*filepair_fn)(struct diff_filepair *pair); |
53 | typedef void (*linediff_fn)(char *line, int len); | 58 | typedef void (*linediff_fn)(char *line, int len); |
@@ -90,6 +95,7 @@ struct commitinfo { | |||
90 | unsigned long committer_date; | 95 | unsigned long committer_date; |
91 | char *subject; | 96 | char *subject; |
92 | char *msg; | 97 | char *msg; |
98 | char *msg_encoding; | ||
93 | }; | 99 | }; |
94 | 100 | ||
95 | struct taginfo { | 101 | struct taginfo { |
diff --git a/parsing.c b/parsing.c index 30e7648..0412a9c 100644 --- a/parsing.c +++ b/parsing.c | |||
@@ -199,6 +199,7 @@ struct commitinfo *cgit_parse_commit(struct commit *commit) | |||
199 | ret->committer_email = NULL; | 199 | ret->committer_email = NULL; |
200 | ret->subject = NULL; | 200 | ret->subject = NULL; |
201 | ret->msg = NULL; | 201 | ret->msg = NULL; |
202 | ret->msg_encoding = NULL; | ||
202 | 203 | ||
203 | if (p == NULL) | 204 | if (p == NULL) |
204 | return ret; | 205 | return ret; |
diff --git a/shared.c b/shared.c index e06df91..a04c4dc 100644 --- a/shared.c +++ b/shared.c | |||
@@ -265,6 +265,8 @@ void *cgit_free_commitinfo(struct commitinfo *info) | |||
265 | free(info->committer); | 265 | free(info->committer); |
266 | free(info->committer_email); | 266 | free(info->committer_email); |
267 | free(info->subject); | 267 | free(info->subject); |
268 | free(info->msg); | ||
269 | free(info->msg_encoding); | ||
268 | free(info); | 270 | free(info); |
269 | return NULL; | 271 | return NULL; |
270 | } | 272 | } |
diff --git a/ui-shared.c b/ui-shared.c index 72a7b44..7c69f60 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -352,7 +352,7 @@ void cgit_print_age(time_t t, time_t max_relative, char *format) | |||
352 | 352 | ||
353 | void cgit_print_docstart(char *title, struct cacheitem *item) | 353 | void cgit_print_docstart(char *title, struct cacheitem *item) |
354 | { | 354 | { |
355 | html("Content-Type: text/html; charset=utf-8\n"); | 355 | html("Content-Type: text/html; charset=" PAGE_ENCODING "\n"); |
356 | htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime)); | 356 | htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime)); |
357 | htmlf("Expires: %s\n", http_date(item->st.st_mtime + | 357 | htmlf("Expires: %s\n", http_date(item->st.st_mtime + |
358 | ttl_seconds(item->ttl))); | 358 | ttl_seconds(item->ttl))); |