diff options
author | Lars Hjemli | 2009-02-19 22:38:36 +0100 |
---|---|---|
committer | Lars Hjemli | 2009-02-19 22:38:36 +0100 |
commit | 488a214a81a25c6397c56822ed1713f51dddc520 (patch) | |
tree | 93b3be74f6c7b3ae6557a9d3c5c2856ff5efe8ed | |
parent | ui-tree: escape ascii-text properly in hexdump view (diff) | |
download | cgit-488a214a81a25c6397c56822ed1713f51dddc520.tar.gz cgit-488a214a81a25c6397c56822ed1713f51dddc520.zip |
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
diff --git a/cgit.c b/cgit.c index 64d95f9..411e421 100644 --- a/cgit.c +++ b/cgit.c | |||
@@ -206,6 +206,7 @@ static void prepare_context(struct cgit_context *ctx) | |||
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 { |
diff --git a/cgit.h b/cgit.h index 5f7af51..2bfbe7b 100644 --- a/cgit.h +++ b/cgit.h | |||
@@ -180,6 +180,7 @@ struct cgit_page { | |||
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 | ||
diff --git a/ui-plain.c b/ui-plain.c index 5addd9e..f73cd14 100644 --- a/ui-plain.c +++ b/ui-plain.c | |||
@@ -34,6 +34,7 @@ static void print_object(const unsigned char *sha1, const char *path) | |||
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; |
diff --git a/ui-shared.c b/ui-shared.c index de77bbf..86a7d29 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -468,6 +468,8 @@ void cgit_print_http_headers(struct cgit_context *ctx) | |||
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 | ||