about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2009-02-19 22:38:36 +0100
committerLars Hjemli <hjemli@gmail.com>2009-02-19 22:38:36 +0100
commit488a214a81a25c6397c56822ed1713f51dddc520 (patch)
tree93b3be74f6c7b3ae6557a9d3c5c2856ff5efe8ed
parentui-tree: escape ascii-text properly in hexdump view (diff)
downloadcgit-pink-488a214a81a25c6397c56822ed1713f51dddc520.tar.gz
cgit-pink-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.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
@@ -206,6 +206,7 @@ static void prepare_context(struct cgit_context *ctx)
 	ctx->page.size = 0;
 	ctx->page.modified = time(NULL);
 	ctx->page.expires = ctx->page.modified;
+	ctx->page.etag = NULL;
 }
 
 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 {
 	char *mimetype;
 	char *charset;
 	char *filename;
+	char *etag;
 	char *title;
 };
 
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)
 	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;
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)
 		      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");
 }