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 | |
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-- | cgit.c | 1 | ||||
-rw-r--r-- | cgit.h | 1 | ||||
-rw-r--r-- | ui-plain.c | 1 | ||||
-rw-r--r-- | ui-shared.c | 2 |
4 files changed, 5 insertions, 0 deletions
@@ -193,32 +193,33 @@ static void prepare_context(struct cgit_context *ctx) | |||
193 | ctx->cfg.max_stats = 0; | 193 | ctx->cfg.max_stats = 0; |
194 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; | 194 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
195 | ctx->cfg.renamelimit = -1; | 195 | ctx->cfg.renamelimit = -1; |
196 | ctx->cfg.robots = "index, nofollow"; | 196 | ctx->cfg.robots = "index, nofollow"; |
197 | ctx->cfg.root_title = "Git repository browser"; | 197 | ctx->cfg.root_title = "Git repository browser"; |
198 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; | 198 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
199 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; | 199 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
200 | ctx->cfg.summary_branches = 10; | 200 | ctx->cfg.summary_branches = 10; |
201 | ctx->cfg.summary_log = 10; | 201 | ctx->cfg.summary_log = 10; |
202 | ctx->cfg.summary_tags = 10; | 202 | ctx->cfg.summary_tags = 10; |
203 | ctx->page.mimetype = "text/html"; | 203 | ctx->page.mimetype = "text/html"; |
204 | ctx->page.charset = PAGE_ENCODING; | 204 | ctx->page.charset = PAGE_ENCODING; |
205 | ctx->page.filename = NULL; | 205 | ctx->page.filename = NULL; |
206 | ctx->page.size = 0; | 206 | ctx->page.size = 0; |
207 | ctx->page.modified = time(NULL); | 207 | ctx->page.modified = time(NULL); |
208 | ctx->page.expires = ctx->page.modified; | 208 | ctx->page.expires = ctx->page.modified; |
209 | ctx->page.etag = NULL; | ||
209 | } | 210 | } |
210 | 211 | ||
211 | struct refmatch { | 212 | struct refmatch { |
212 | char *req_ref; | 213 | char *req_ref; |
213 | char *first_ref; | 214 | char *first_ref; |
214 | int match; | 215 | int match; |
215 | }; | 216 | }; |
216 | 217 | ||
217 | int find_current_ref(const char *refname, const unsigned char *sha1, | 218 | int find_current_ref(const char *refname, const unsigned char *sha1, |
218 | int flags, void *cb_data) | 219 | int flags, void *cb_data) |
219 | { | 220 | { |
220 | struct refmatch *info; | 221 | struct refmatch *info; |
221 | 222 | ||
222 | info = (struct refmatch *)cb_data; | 223 | info = (struct refmatch *)cb_data; |
223 | if (!strcmp(refname, info->req_ref)) | 224 | if (!strcmp(refname, info->req_ref)) |
224 | info->match = 1; | 225 | info->match = 1; |
@@ -167,32 +167,33 @@ struct cgit_config { | |||
167 | int max_stats; | 167 | int max_stats; |
168 | int nocache; | 168 | int nocache; |
169 | int renamelimit; | 169 | int renamelimit; |
170 | int snapshots; | 170 | int snapshots; |
171 | int summary_branches; | 171 | int summary_branches; |
172 | int summary_log; | 172 | int summary_log; |
173 | int summary_tags; | 173 | int summary_tags; |
174 | }; | 174 | }; |
175 | 175 | ||
176 | struct cgit_page { | 176 | struct cgit_page { |
177 | time_t modified; | 177 | time_t modified; |
178 | time_t expires; | 178 | time_t expires; |
179 | size_t size; | 179 | size_t size; |
180 | char *mimetype; | 180 | char *mimetype; |
181 | char *charset; | 181 | char *charset; |
182 | char *filename; | 182 | char *filename; |
183 | char *etag; | ||
183 | char *title; | 184 | char *title; |
184 | }; | 185 | }; |
185 | 186 | ||
186 | struct cgit_context { | 187 | struct cgit_context { |
187 | struct cgit_query qry; | 188 | struct cgit_query qry; |
188 | struct cgit_config cfg; | 189 | struct cgit_config cfg; |
189 | struct cgit_repo *repo; | 190 | struct cgit_repo *repo; |
190 | struct cgit_page page; | 191 | struct cgit_page page; |
191 | }; | 192 | }; |
192 | 193 | ||
193 | struct cgit_snapshot_format { | 194 | struct cgit_snapshot_format { |
194 | const char *suffix; | 195 | const char *suffix; |
195 | const char *mimetype; | 196 | const char *mimetype; |
196 | write_archive_fn_t write_func; | 197 | write_archive_fn_t write_func; |
197 | int bit; | 198 | int bit; |
198 | }; | 199 | }; |
@@ -21,32 +21,33 @@ static void print_object(const unsigned char *sha1, const char *path) | |||
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; |
diff --git a/ui-shared.c b/ui-shared.c index de77bbf..86a7d29 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -455,32 +455,34 @@ void cgit_print_age(time_t t, time_t max_relative, char *format) | |||
455 | } | 455 | } |
456 | 456 | ||
457 | void cgit_print_http_headers(struct cgit_context *ctx) | 457 | void cgit_print_http_headers(struct cgit_context *ctx) |
458 | { | 458 | { |
459 | if (ctx->page.mimetype && ctx->page.charset) | 459 | if (ctx->page.mimetype && ctx->page.charset) |
460 | htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, | 460 | htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, |
461 | ctx->page.charset); | 461 | ctx->page.charset); |
462 | else if (ctx->page.mimetype) | 462 | else if (ctx->page.mimetype) |
463 | htmlf("Content-Type: %s\n", ctx->page.mimetype); | 463 | htmlf("Content-Type: %s\n", ctx->page.mimetype); |
464 | if (ctx->page.size) | 464 | if (ctx->page.size) |
465 | htmlf("Content-Length: %ld\n", ctx->page.size); | 465 | htmlf("Content-Length: %ld\n", ctx->page.size); |
466 | if (ctx->page.filename) | 466 | if (ctx->page.filename) |
467 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", | 467 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", |
468 | ctx->page.filename); | 468 | ctx->page.filename); |
469 | htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); | 469 | htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); |
470 | htmlf("Expires: %s\n", http_date(ctx->page.expires)); | 470 | htmlf("Expires: %s\n", http_date(ctx->page.expires)); |
471 | if (ctx->page.etag) | ||
472 | htmlf("ETag: \"%s\"\n", ctx->page.etag); | ||
471 | html("\n"); | 473 | html("\n"); |
472 | } | 474 | } |
473 | 475 | ||
474 | void cgit_print_docstart(struct cgit_context *ctx) | 476 | void cgit_print_docstart(struct cgit_context *ctx) |
475 | { | 477 | { |
476 | char *host = cgit_hosturl(); | 478 | char *host = cgit_hosturl(); |
477 | html(cgit_doctype); | 479 | html(cgit_doctype); |
478 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); | 480 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); |
479 | html("<head>\n"); | 481 | html("<head>\n"); |
480 | html("<title>"); | 482 | html("<title>"); |
481 | html_txt(ctx->page.title); | 483 | html_txt(ctx->page.title); |
482 | html("</title>\n"); | 484 | html("</title>\n"); |
483 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); | 485 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); |
484 | if (ctx->cfg.robots && *ctx->cfg.robots) | 486 | if (ctx->cfg.robots && *ctx->cfg.robots) |
485 | htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); | 487 | htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); |
486 | html("<link rel='stylesheet' type='text/css' href='"); | 488 | html("<link rel='stylesheet' type='text/css' href='"); |