2 files changed, 7 insertions, 0 deletions
diff --git a/cgit.c b/cgit.c
index 411e421..dc1c2e4 100644
--- a/cgit.c
+++ b/cgit.c
@@ -421,24 +421,25 @@ static int calc_ttl()
        if (ctx.qry.has_symref)
                return ctx.cfg.cache_dynamic_ttl;
        if (ctx.qry.has_sha1)
                return ctx.cfg.cache_static_ttl;
        return ctx.cfg.cache_repo_ttl;
 }
 int main(int argc, const char **argv)
 {
        const char *cgit_config_env = getenv("CGIT_CONFIG");
+        const char *method = getenv("REQUEST_METHOD");
        const char *path;
        char *qry;
        int err, ttl;
        prepare_context(&ctx);
        cgit_repolist.length = 0;
        cgit_repolist.count = 0;
        cgit_repolist.repos = NULL;
        if (getenv("SCRIPT_NAME"))
                ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME"));
        if (getenv("QUERY_STRING"))
@@ -467,21 +468,23 @@ int main(int argc, const char **argv)
                ctx.qry.url = xstrdup(path);
                if (ctx.qry.raw) {
                        qry = ctx.qry.raw;
                        ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry));
                        free(qry);
                } else
                        ctx.qry.raw = ctx.qry.url;
                cgit_parse_url(ctx.qry.url);
        }
        ttl = calc_ttl();
        ctx.page.expires += ttl*60;
+        if (method && !strcmp(method, "HEAD"))
+                ctx.cfg.nocache = 1;
        if (ctx.cfg.nocache)
                ctx.cfg.cache_size = 0;
        err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root,
                            ctx.qry.raw, ttl, process_request, &ctx);
        if (err)
                cgit_print_error(fmt("Error processing page: %s (%d)",
                                     strerror(err), err));
        return err;
 }
diff --git a/ui-shared.c b/ui-shared.c
index 86a7d29..0dafc83 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -447,39 +447,43 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
        }
        if (secs < TM_YEAR * 2) {
                htmlf("<span class='age-months'>%.0f months</span>",
                      secs * 1.0 / TM_MONTH);
                return;
        }
        htmlf("<span class='age-years'>%.0f years</span>",
              secs * 1.0 / TM_YEAR);
 }
 void cgit_print_http_headers(struct cgit_context *ctx)
 {
+        const char *method = getenv("REQUEST_METHOD");
        if (ctx->page.mimetype && ctx->page.charset)
                htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,
                      ctx->page.charset);
        else if (ctx->page.mimetype)
                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");
+        if (method && !strcmp(method, "HEAD"))
+                exit(0);
 }
 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");
        html("<head>\n");
        html("<title>");
        html_txt(ctx->page.title);
        html("</title>\n");
        htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);