diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2009-07-25 11:51:57 +0200 |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2009-07-25 11:52:07 +0200 |
| commit | 7e5c048505efe1902fb476cc2cb3160ff7df013d (patch) | |
| tree | 4df306491dfe670f0f49d8262b6ba24a0c3d6d12 /ui-blob.c | |
| parent | Merge branch 'do/https' (diff) | |
| parent | ui-blob: return 'application/octet-stream' for binary blobs (diff) | |
| download | cgit-pink-7e5c048505efe1902fb476cc2cb3160ff7df013d.tar.gz cgit-pink-7e5c048505efe1902fb476cc2cb3160ff7df013d.zip | |
Merge branch 'rt/plain-binary'
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to '')
| -rw-r--r-- | ui-blob.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ui-blob.c b/ui-blob.c index 3cda03d..2ccd31d 100644 --- a/ui-blob.c +++ b/ui-blob.c @@ -27,7 +27,7 @@ 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}; @@ -67,6 +67,12 @@ void cgit_print_blob(const char *hex, char *path, const char *head) 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); |