mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-22 08:28:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rt/plain-binary'

Browse Source 
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
This commit is contained in:
Lars Hjemli 2009-07-25 11:51:57 +02:00
commit 7e5c048505
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui-blob.c
View File

@ -27,7 +27,7 @@ void cgit_print_blob(const char *hex, char *path, const char *head)
unsigned char sha1[20]; unsigned char sha1[20];
enum object_type type; enum object_type type;
unsigned char *buf; char *buf;
unsigned long size; unsigned long size;
struct commit *commit; struct commit *commit;
const char *paths[] = {path, NULL}; const char *paths[] = {path, NULL};
@ -67,6 +67,12 @@ void cgit_print_blob(const char *hex, char *path, const char *head)
buf[size] = '\0'; buf[size] = '\0';
ctx.page.mimetype = ctx.qry.mimetype; 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; ctx.page.filename = path;
cgit_print_http_headers(&ctx); cgit_print_http_headers(&ctx);
write(htmlfd, buf, size); write(htmlfd, buf, size);

5
ui-plain.c
View File

@ -31,7 +31,10 @@ static void print_object(const unsigned char *sha1, const char *path)
html_status(404, "Not found", 0); html_status(404, "Not found", 0);
return; return;
} }
ctx.page.mimetype = "text/plain"; if (buffer_is_binary(buf, size))
ctx.page.mimetype = "application/octet-stream";
else
ctx.page.mimetype = "text/plain";
ctx.page.filename = fmt("%s", path); ctx.page.filename = fmt("%s", path);
ctx.page.size = size; ctx.page.size = size;
cgit_print_http_headers(&ctx); cgit_print_http_headers(&ctx);