summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2009-02-19 22:24:15 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-02-19 22:24:15 (UTC)
commit3ff58ddd51bcbcbc9b7649bad1a39aa98af4b49f (patch) (unidiff)
tree4ff1b54dfb2fc025771f39528165e9e46d93a0e0
parent488a214a81a25c6397c56822ed1713f51dddc520 (diff)
downloadcgit-3ff58ddd51bcbcbc9b7649bad1a39aa98af4b49f.zip
cgit-3ff58ddd51bcbcbc9b7649bad1a39aa98af4b49f.tar.gz
cgit-3ff58ddd51bcbcbc9b7649bad1a39aa98af4b49f.tar.bz2
Add support for HEAD requests
This is a quick 'n dirty hack which makes cgit honor HEAD requests. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--cgit.c3
-rw-r--r--ui-shared.c4
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
@@ -427,12 +427,13 @@ static int calc_ttl()
427 return ctx.cfg.cache_repo_ttl; 427 return ctx.cfg.cache_repo_ttl;
428} 428}
429 429
430int main(int argc, const char **argv) 430int main(int argc, const char **argv)
431{ 431{
432 const char *cgit_config_env = getenv("CGIT_CONFIG"); 432 const char *cgit_config_env = getenv("CGIT_CONFIG");
433 const char *method = getenv("REQUEST_METHOD");
433 const char *path; 434 const char *path;
434 char *qry; 435 char *qry;
435 int err, ttl; 436 int err, ttl;
436 437
437 prepare_context(&ctx); 438 prepare_context(&ctx);
438 cgit_repolist.length = 0; 439 cgit_repolist.length = 0;
@@ -473,12 +474,14 @@ int main(int argc, const char **argv)
473 ctx.qry.raw = ctx.qry.url; 474 ctx.qry.raw = ctx.qry.url;
474 cgit_parse_url(ctx.qry.url); 475 cgit_parse_url(ctx.qry.url);
475 } 476 }
476 477
477 ttl = calc_ttl(); 478 ttl = calc_ttl();
478 ctx.page.expires += ttl*60; 479 ctx.page.expires += ttl*60;
480 if (method && !strcmp(method, "HEAD"))
481 ctx.cfg.nocache = 1;
479 if (ctx.cfg.nocache) 482 if (ctx.cfg.nocache)
480 ctx.cfg.cache_size = 0; 483 ctx.cfg.cache_size = 0;
481 err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root, 484 err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root,
482 ctx.qry.raw, ttl, process_request, &ctx); 485 ctx.qry.raw, ttl, process_request, &ctx);
483 if (err) 486 if (err)
484 cgit_print_error(fmt("Error processing page: %s (%d)", 487 cgit_print_error(fmt("Error processing page: %s (%d)",
diff --git a/ui-shared.c b/ui-shared.c
index 86a7d29..0dafc83 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -453,12 +453,14 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
453 htmlf("<span class='age-years'>%.0f years</span>", 453 htmlf("<span class='age-years'>%.0f years</span>",
454 secs * 1.0 / TM_YEAR); 454 secs * 1.0 / TM_YEAR);
455} 455}
456 456
457void cgit_print_http_headers(struct cgit_context *ctx) 457void cgit_print_http_headers(struct cgit_context *ctx)
458{ 458{
459 const char *method = getenv("REQUEST_METHOD");
460
459 if (ctx->page.mimetype && ctx->page.charset) 461 if (ctx->page.mimetype && ctx->page.charset)
460 htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, 462 htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,
461 ctx->page.charset); 463 ctx->page.charset);
462 else if (ctx->page.mimetype) 464 else if (ctx->page.mimetype)
463 htmlf("Content-Type: %s\n", ctx->page.mimetype); 465 htmlf("Content-Type: %s\n", ctx->page.mimetype);
464 if (ctx->page.size) 466 if (ctx->page.size)
@@ -468,12 +470,14 @@ void cgit_print_http_headers(struct cgit_context *ctx)
468 ctx->page.filename); 470 ctx->page.filename);
469 htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); 471 htmlf("Last-Modified: %s\n", http_date(ctx->page.modified));
470 htmlf("Expires: %s\n", http_date(ctx->page.expires)); 472 htmlf("Expires: %s\n", http_date(ctx->page.expires));
471 if (ctx->page.etag) 473 if (ctx->page.etag)
472 htmlf("ETag: \"%s\"\n", ctx->page.etag); 474 htmlf("ETag: \"%s\"\n", ctx->page.etag);
473 html("\n"); 475 html("\n");
476 if (method && !strcmp(method, "HEAD"))
477 exit(0);
474} 478}
475 479
476void cgit_print_docstart(struct cgit_context *ctx) 480void cgit_print_docstart(struct cgit_context *ctx)
477{ 481{
478 char *host = cgit_hosturl(); 482 char *host = cgit_hosturl();
479 html(cgit_doctype); 483 html(cgit_doctype);