summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2009-02-19 21:38:36 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-02-19 21:38:36 (UTC)
commit488a214a81a25c6397c56822ed1713f51dddc520 (patch) (unidiff)
tree93b3be74f6c7b3ae6557a9d3c5c2856ff5efe8ed
parent6063e7b5532481ffaa7a6f080de28547983bbeb7 (diff)
downloadcgit-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>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c1
-rw-r--r--cgit.h1
-rw-r--r--ui-plain.c1
-rw-r--r--ui-shared.c2
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
@@ -201,16 +201,17 @@ static void prepare_context(struct cgit_context *ctx)
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
211struct refmatch { 212struct 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
diff --git a/cgit.h b/cgit.h
index 5f7af51..2bfbe7b 100644
--- a/cgit.h
+++ b/cgit.h
@@ -175,16 +175,17 @@ struct cgit_config {
175 175
176struct cgit_page { 176struct 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
186struct cgit_context { 187struct 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;
diff --git a/ui-plain.c b/ui-plain.c
index 5addd9e..f73cd14 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -29,16 +29,17 @@ static void print_object(const unsigned char *sha1, const char *path)
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
42static int walk_tree(const unsigned char *sha1, const char *base, int baselen, 43static 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)
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)
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
474void cgit_print_docstart(struct cgit_context *ctx) 476void 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");