author | Lars Hjemli <hjemli@gmail.com> | 2009-02-19 21:38:36 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-02-19 21:38:36 (UTC) |
commit | 488a214a81a25c6397c56822ed1713f51dddc520 (patch) (unidiff) | |
tree | 93b3be74f6c7b3ae6557a9d3c5c2856ff5efe8ed /ui-plain.c | |
parent | 6063e7b5532481ffaa7a6f080de28547983bbeb7 (diff) | |
download | cgit-488a214a81a25c6397c56822ed1713f51dddc520.zip cgit-488a214a81a25c6397c56822ed1713f51dddc520.tar.gz cgit-488a214a81a25c6397c56822ed1713f51dddc520.tar.bz2 |
Add support for ETag in 'plain' view
When downloading a blob identified by its path, the client might want
to know if the blob has been modified since a previous download of the
same path. To this end, an ETag containing the blob SHA1 seems to be
ideal.
Todo: add support for HEAD requests...
Suggested-by: Owen Taylor <otaylor@redhat.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-plain.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1,79 +1,80 @@ | |||
1 | /* ui-plain.c: functions for output of plain blobs by path | 1 | /* ui-plain.c: functions for output of plain blobs by path |
2 | * | 2 | * |
3 | * Copyright (C) 2008 Lars Hjemli | 3 | * Copyright (C) 2008 Lars Hjemli |
4 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | #include "html.h" | 10 | #include "html.h" |
11 | #include "ui-shared.h" | 11 | #include "ui-shared.h" |
12 | 12 | ||
13 | char *curr_rev; | 13 | char *curr_rev; |
14 | char *match_path; | 14 | char *match_path; |
15 | int match; | 15 | int match; |
16 | 16 | ||
17 | static void print_object(const unsigned char *sha1, const char *path) | 17 | static void print_object(const unsigned char *sha1, const char *path) |
18 | { | 18 | { |
19 | enum object_type type; | 19 | enum object_type type; |
20 | char *buf; | 20 | char *buf; |
21 | unsigned long size; | 21 | unsigned long size; |
22 | 22 | ||
23 | type = sha1_object_info(sha1, &size); | 23 | type = sha1_object_info(sha1, &size); |
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 | ctx.page.mimetype = "text/plain"; | 34 | ctx.page.mimetype = "text/plain"; |
35 | ctx.page.filename = fmt("%s", path); | 35 | ctx.page.filename = fmt("%s", path); |
36 | ctx.page.size = size; | 36 | ctx.page.size = size; |
37 | ctx.page.etag = sha1_to_hex(sha1); | ||
37 | cgit_print_http_headers(&ctx); | 38 | cgit_print_http_headers(&ctx); |
38 | html_raw(buf, size); | 39 | html_raw(buf, size); |
39 | match = 1; | 40 | match = 1; |
40 | } | 41 | } |
41 | 42 | ||
42 | static int walk_tree(const unsigned char *sha1, const char *base, int baselen, | 43 | static int walk_tree(const unsigned char *sha1, const char *base, int baselen, |
43 | const char *pathname, unsigned mode, int stage, | 44 | const char *pathname, unsigned mode, int stage, |
44 | void *cbdata) | 45 | void *cbdata) |
45 | { | 46 | { |
46 | if (S_ISDIR(mode)) | 47 | if (S_ISDIR(mode)) |
47 | return READ_TREE_RECURSIVE; | 48 | return READ_TREE_RECURSIVE; |
48 | 49 | ||
49 | if (S_ISREG(mode)) | 50 | if (S_ISREG(mode)) |
50 | print_object(sha1, pathname); | 51 | print_object(sha1, pathname); |
51 | 52 | ||
52 | return 0; | 53 | return 0; |
53 | } | 54 | } |
54 | 55 | ||
55 | void cgit_print_plain(struct cgit_context *ctx) | 56 | void cgit_print_plain(struct cgit_context *ctx) |
56 | { | 57 | { |
57 | const char *rev = ctx->qry.sha1; | 58 | const char *rev = ctx->qry.sha1; |
58 | unsigned char sha1[20]; | 59 | unsigned char sha1[20]; |
59 | struct commit *commit; | 60 | struct commit *commit; |
60 | const char *paths[] = {ctx->qry.path, NULL}; | 61 | const char *paths[] = {ctx->qry.path, NULL}; |
61 | 62 | ||
62 | if (!rev) | 63 | if (!rev) |
63 | rev = ctx->qry.head; | 64 | rev = ctx->qry.head; |
64 | 65 | ||
65 | curr_rev = xstrdup(rev); | 66 | curr_rev = xstrdup(rev); |
66 | if (get_sha1(rev, sha1)) { | 67 | if (get_sha1(rev, sha1)) { |
67 | html_status(404, "Not found", 0); | 68 | html_status(404, "Not found", 0); |
68 | return; | 69 | return; |
69 | } | 70 | } |
70 | commit = lookup_commit_reference(sha1); | 71 | commit = lookup_commit_reference(sha1); |
71 | if (!commit || parse_commit(commit)) { | 72 | if (!commit || parse_commit(commit)) { |
72 | html_status(404, "Not found", 0); | 73 | html_status(404, "Not found", 0); |
73 | return; | 74 | return; |
74 | } | 75 | } |
75 | match_path = ctx->qry.path; | 76 | match_path = ctx->qry.path; |
76 | read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL); | 77 | read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL); |
77 | if (!match) | 78 | if (!match) |
78 | html_status(404, "Not found", 0); | 79 | html_status(404, "Not found", 0); |
79 | } | 80 | } |