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)
 	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;
 };
 
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 {
 
 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;
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)
 	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");