summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2009-07-25 09:51:19 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-07-25 09:51:19 (UTC)
commit596eb8fcb09697dd1b880123074d2ce6fdea03c0 (patch) (side-by-side diff)
tree7a09038a35f20c16181433c0745dc119d4a94b8c
parent7d7700804278bc92c8a5e401ae88d2451180abbe (diff)
downloadcgit-596eb8fcb09697dd1b880123074d2ce6fdea03c0.zip
cgit-596eb8fcb09697dd1b880123074d2ce6fdea03c0.tar.gz
cgit-596eb8fcb09697dd1b880123074d2ce6fdea03c0.tar.bz2
ui-blob: return 'application/octet-stream' for binary blobs
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ui-blob.c8
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);