summaryrefslogtreecommitdiff
path: root/ui-blob.c
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2009-07-25 11:51:19 +0200
committerLars Hjemli <hjemli@gmail.com>2009-07-25 11:51:19 +0200
commit596eb8fcb09697dd1b880123074d2ce6fdea03c0 (patch)
tree7a09038a35f20c16181433c0745dc119d4a94b8c /ui-blob.c
parent7d7700804278bc92c8a5e401ae88d2451180abbe (diff)
downloadcgit-596eb8fcb09697dd1b880123074d2ce6fdea03c0.tar.gz
cgit-596eb8fcb09697dd1b880123074d2ce6fdea03c0.tar.bz2
cgit-596eb8fcb09697dd1b880123074d2ce6fdea03c0.zip
ui-blob: return 'application/octet-stream' for binary blobs
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'ui-blob.c')
-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);
td>Lars Hjemli1-2/+2 2009-07-25cgitrc.5.txt: document 'embedded' and 'noheader'Lars Hjemli1-0/+9 2009-07-25Add support for 'noheader' optionLars Hjemli3-7/+16 2009-07-25cgitrc.5.txt: document 'head-include'Lars Hjemli1-0/+4 2009-07-25ui-blob: return 'application/octet-stream' for binary blobsLars Hjemli1-1/+7 2009-07-25ui-plain: Return 'application/octet-stream' for binary files.Remko Tronçon1-1/+4 2009-06-11use cgit_httpscheme() for atom feedDiego Ongaro2-3/+6 2009-06-11add cgit_httpscheme() -> http:// or https://Diego Ongaro2-0/+12 2009-06-07Return http statuscode 404 on unknown branchLars Hjemli3-0/+6 2009-06-07Add head-include configuration option.Mark Lodato3-1/+6 2009-03-15CGIT 0.8.2.1v0.8.2.1Lars Hjemli1-1/+1 2009-03-15Fix doc-related glitches in Makefile and .gitignoreLars Hjemli2-1/+6 2009-03-15ui-snapshot: avoid segfault when no filename is specifiedLars Hjemli1-6/+17 2009-03-15fix segfault when displaying empty blobsEric Wong1-5/+8 2009-02-19Add support for HEAD requestsLars Hjemli2-0/+7 2009-02-19Add support for ETag in 'plain' viewLars Hjemli4-0/+5 2009-02-12ui-tree: escape ascii-text properly in hexdump viewLars Hjemli1-4/+9 2009-02-12Makefile: add doc-related targetsLars Hjemli1-2/+17