Merge branch 'rt/plain-binary'

Lars Hjemli committed 17 years ago

Commit 7e5c0482 parents fbe091a 596eb8f2 files · +11 −2Browse files

Unified · Split

2 files

@@ -27,7 +27,7 @@ void cgit_print_blob(const char hex, char path, const char *head) · 26 unmodified lines
27	27
28	28	unsigned char sha1[20];
29	29	enum object_type type;
30		− unsigned char *buf;
	30	+ char *buf;
31	31	unsigned long size;
32	32	struct commit *commit;
33	33	const char *paths[] = {path, NULL};
@@ -67,6 +67,12 @@ void cgit_print_blob(const char hex, char path, const char *head) · 33 unmodified lines
67	67
68	68	buf[size] = '\0';
69	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	76	ctx.page.filename = path;
71	77	cgit_print_http_headers(&ctx);
72	78	write(htmlfd, buf, size);

@@ -31,7 +31,10 @@ static void print_object(const unsigned char sha1, const char path) · 30 unmodified lines
31	31	html_status(404, "Not found", 0);
32	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	38	ctx.page.filename = fmt("%s", path);
36	39	ctx.page.size = size;
37	40	cgit_print_http_headers(&ctx);