about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorLars Hjemli2009-07-25 11:51:57 +0200
committerLars Hjemli2009-07-25 11:52:07 +0200
commit7e5c048505efe1902fb476cc2cb3160ff7df013d (patch)
tree4df306491dfe670f0f49d8262b6ba24a0c3d6d12
parentMerge branch 'do/https' (diff)
parentui-blob: return 'application/octet-stream' for binary blobs (diff)
downloadcgit-7e5c048505efe1902fb476cc2cb3160ff7df013d.tar.gz
cgit-7e5c048505efe1902fb476cc2cb3160ff7df013d.zip
Merge branch 'rt/plain-binary'
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r--ui-blob.c8
-rw-r--r--ui-plain.c5
2 files changed, 11 insertions, 2 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);
diff --git a/ui-plain.c b/ui-plain.c index 5addd9e..9a9ae7d 100644 --- a/ui-plain.c +++ b/ui-plain.c
@@ -31,7 +31,10 @@ static void print_object(const unsigned char *sha1, const char *path)
31 html_status(404, "Not found", 0); 31 html_status(404, "Not found", 0);
32 return; 32 return;
33 } 33 }
34 ctx.page.mimetype = "text/plain"; 34 if (buffer_is_binary(buf, size))
35 ctx.page.mimetype = "application/octet-stream";
36 else
37 ctx.page.mimetype = "text/plain";
35 ctx.page.filename = fmt("%s", path); 38 ctx.page.filename = fmt("%s", path);
36 ctx.page.size = size; 39 ctx.page.size = size;
37 cgit_print_http_headers(&ctx); 40 cgit_print_http_headers(&ctx);