summaryrefslogtreecommitdiffabout
path: root/ui-plain.c
authorLars Hjemli <hjemli@gmail.com>2009-07-25 09:59:22 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-07-25 09:59:22 (UTC)
commit681fdc45473143de3f3c5f69fbc7b94f5d6b0b75 (patch) (unidiff)
tree3bfca05875524bee0e5444fb791707bc3e593dbd /ui-plain.c
parent7e5c048505efe1902fb476cc2cb3160ff7df013d (diff)
parent3ff58ddd51bcbcbc9b7649bad1a39aa98af4b49f (diff)
downloadcgit-681fdc45473143de3f3c5f69fbc7b94f5d6b0b75.zip
cgit-681fdc45473143de3f3c5f69fbc7b94f5d6b0b75.tar.gz
cgit-681fdc45473143de3f3c5f69fbc7b94f5d6b0b75.tar.bz2
Merge branch 'plain-etag'
Conflicts: ui-shared.c
Diffstat (limited to 'ui-plain.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-plain.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ui-plain.c b/ui-plain.c
index 9a9ae7d..93a3a05 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -24,32 +24,33 @@ static void print_object(const unsigned char *sha1, const char *path)
24 if (type == OBJ_BAD) { 24 if (type == OBJ_BAD) {
25 html_status(404, "Not found", 0); 25 html_status(404, "Not found", 0);
26 return; 26 return;
27 } 27 }
28 28
29 buf = read_sha1_file(sha1, &type, &size); 29 buf = read_sha1_file(sha1, &type, &size);
30 if (!buf) { 30 if (!buf) {
31 html_status(404, "Not found", 0); 31 html_status(404, "Not found", 0);
32 return; 32 return;
33 } 33 }
34 if (buffer_is_binary(buf, size)) 34 if (buffer_is_binary(buf, size))
35 ctx.page.mimetype = "application/octet-stream"; 35 ctx.page.mimetype = "application/octet-stream";
36 else 36 else
37 ctx.page.mimetype = "text/plain"; 37 ctx.page.mimetype = "text/plain";
38 ctx.page.filename = fmt("%s", path); 38 ctx.page.filename = fmt("%s", path);
39 ctx.page.size = size; 39 ctx.page.size = size;
40 ctx.page.etag = sha1_to_hex(sha1);
40 cgit_print_http_headers(&ctx); 41 cgit_print_http_headers(&ctx);
41 html_raw(buf, size); 42 html_raw(buf, size);
42 match = 1; 43 match = 1;
43} 44}
44 45
45static int walk_tree(const unsigned char *sha1, const char *base, int baselen, 46static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
46 const char *pathname, unsigned mode, int stage, 47 const char *pathname, unsigned mode, int stage,
47 void *cbdata) 48 void *cbdata)
48{ 49{
49 if (S_ISDIR(mode)) 50 if (S_ISDIR(mode))
50 return READ_TREE_RECURSIVE; 51 return READ_TREE_RECURSIVE;
51 52
52 if (S_ISREG(mode)) 53 if (S_ISREG(mode))
53 print_object(sha1, pathname); 54 print_object(sha1, pathname);
54 55
55 return 0; 56 return 0;