aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Lars Hjemli <hjemli@gmail.com>2009-07-25 18:51:19 (JST)
committerGravatar Lars Hjemli <hjemli@gmail.com>2009-07-25 18:51:19 (JST)
commit596eb8fcb09697dd1b880123074d2ce6fdea03c0 (patch)
tree7a09038a35f20c16181433c0745dc119d4a94b8c
parent7d7700804278bc92c8a5e401ae88d2451180abbe (diff)
downloadcgit-596eb8fcb09697dd1b880123074d2ce6fdea03c0.zip
cgit-596eb8fcb09697dd1b880123074d2ce6fdea03c0.tar.gz
ui-blob: return 'application/octet-stream' for binary blobs
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-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)
27 27
28 unsigned char sha1[20]; 28 unsigned char sha1[20];
29 enum object_type type; 29 enum object_type type;
30 unsigned char *buf; 30 char *buf;
31 unsigned long size; 31 unsigned long size;
32 struct commit *commit; 32 struct commit *commit;
33 const char *paths[] = {path, NULL}; 33 const char *paths[] = {path, NULL};
@@ -67,6 +67,12 @@ void cgit_print_blob(const char *hex, char *path, const char *head)
67 67
68 buf[size] = '\0'; 68 buf[size] = '\0';
69 ctx.page.mimetype = ctx.qry.mimetype; 69 ctx.page.mimetype = ctx.qry.mimetype;
70 if (!ctx.page.mimetype) {
71 if (buffer_is_binary(buf, size))
72 ctx.page.mimetype = "application/octet-stream";
73 else
74 ctx.page.mimetype = "text/plain";
75 }
70 ctx.page.filename = path; 76 ctx.page.filename = path;
71 cgit_print_http_headers(&ctx); 77 cgit_print_http_headers(&ctx);
72 write(htmlfd, buf, size); 78 write(htmlfd, buf, size);