author | Lars Hjemli <hjemli@gmail.com> | 2009-07-25 09:51:19 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-07-25 09:51:19 (UTC) |
commit | 596eb8fcb09697dd1b880123074d2ce6fdea03c0 (patch) (side-by-side diff) | |
tree | 7a09038a35f20c16181433c0745dc119d4a94b8c | |
parent | 7d7700804278bc92c8a5e401ae88d2451180abbe (diff) | |
download | cgit-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>
-rw-r--r-- | ui-blob.c | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -22,17 +22,17 @@ static int walk_tree(const unsigned char *sha1, const char *base,int baselen, return 0; } 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}; if (hex) { if (get_sha1_hex(hex, sha1)){ cgit_print_error(fmt("Bad hex value: %s", hex)); return; @@ -62,12 +62,18 @@ void cgit_print_blob(const char *hex, char *path, const char *head) buf = read_sha1_file(sha1, &type, &size); if (!buf) { cgit_print_error(fmt("Error reading object %s", hex)); return; } 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); } |