| 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) (side-by-side diff) | |
| 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
@@ -201,16 +201,17 @@ static void prepare_context(struct cgit_context *ctx) ctx->cfg.summary_log = 10; ctx->cfg.summary_tags = 10; ctx->page.mimetype = "text/html"; ctx->page.charset = PAGE_ENCODING; ctx->page.filename = NULL; ctx->page.size = 0; ctx->page.modified = time(NULL); ctx->page.expires = ctx->page.modified; + ctx->page.etag = NULL; } struct refmatch { char *req_ref; char *first_ref; int match; }; @@ -175,16 +175,17 @@ struct cgit_config { struct cgit_page { time_t modified; time_t expires; size_t size; char *mimetype; char *charset; char *filename; + char *etag; char *title; }; struct cgit_context { struct cgit_query qry; struct cgit_config cfg; struct cgit_repo *repo; struct cgit_page page; @@ -29,16 +29,17 @@ static void print_object(const unsigned char *sha1, const char *path) buf = read_sha1_file(sha1, &type, &size); if (!buf) { html_status(404, "Not found", 0); return; } ctx.page.mimetype = "text/plain"; ctx.page.filename = fmt("%s", path); ctx.page.size = size; + ctx.page.etag = sha1_to_hex(sha1); cgit_print_http_headers(&ctx); html_raw(buf, size); match = 1; } static int walk_tree(const unsigned char *sha1, const char *base, int baselen, const char *pathname, unsigned mode, int stage, void *cbdata) diff --git a/ui-shared.c b/ui-shared.c index de77bbf..86a7d29 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -463,16 +463,18 @@ void cgit_print_http_headers(struct cgit_context *ctx) htmlf("Content-Type: %s\n", ctx->page.mimetype); if (ctx->page.size) htmlf("Content-Length: %ld\n", ctx->page.size); if (ctx->page.filename) htmlf("Content-Disposition: inline; filename=\"%s\"\n", ctx->page.filename); htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); htmlf("Expires: %s\n", http_date(ctx->page.expires)); + if (ctx->page.etag) + htmlf("ETag: \"%s\"\n", ctx->page.etag); html("\n"); } void cgit_print_docstart(struct cgit_context *ctx) { char *host = cgit_hosturl(); html(cgit_doctype); html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); |