-rw-r--r-- | cgit.c | 3 | ||||
-rw-r--r-- | ui-shared.c | 4 |
2 files changed, 7 insertions, 0 deletions
@@ -425,16 +425,17 @@ static int calc_ttl() | |||
425 | return ctx.cfg.cache_static_ttl; | 425 | return ctx.cfg.cache_static_ttl; |
426 | 426 | ||
427 | return ctx.cfg.cache_repo_ttl; | 427 | return ctx.cfg.cache_repo_ttl; |
428 | } | 428 | } |
429 | 429 | ||
430 | int main(int argc, const char **argv) | 430 | int 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; |
439 | cgit_repolist.count = 0; | 440 | cgit_repolist.count = 0; |
440 | cgit_repolist.repos = NULL; | 441 | cgit_repolist.repos = NULL; |
@@ -471,16 +472,18 @@ int main(int argc, const char **argv) | |||
471 | free(qry); | 472 | free(qry); |
472 | } else | 473 | } else |
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)", |
485 | strerror(err), err)); | 488 | strerror(err), err)); |
486 | return err; | 489 | return err; |
diff --git a/ui-shared.c b/ui-shared.c index 86a7d29..0dafc83 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -451,31 +451,35 @@ void cgit_print_age(time_t t, time_t max_relative, char *format) | |||
451 | return; | 451 | return; |
452 | } | 452 | } |
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 | ||
457 | void cgit_print_http_headers(struct cgit_context *ctx) | 457 | void 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) |
465 | htmlf("Content-Length: %ld\n", ctx->page.size); | 467 | htmlf("Content-Length: %ld\n", ctx->page.size); |
466 | if (ctx->page.filename) | 468 | if (ctx->page.filename) |
467 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", | 469 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", |
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 | ||
476 | void cgit_print_docstart(struct cgit_context *ctx) | 480 | void 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); |
480 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); | 484 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); |
481 | html("<head>\n"); | 485 | html("<head>\n"); |