| author | Lars Hjemli <hjemli@gmail.com> | 2011-03-05 13:01:59 (UTC) |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2011-03-05 13:01:59 (UTC) |
| commit | 1b09cbd303d889ec2636127584d57b7f1b70c25e (patch) (unidiff) | |
| tree | 2b1188f946451d06af4d9120cbc3ba34de716f21 /ui-shared.c | |
| parent | 979c460e7f71d153ae79da67b8b21c3412f0fe02 (diff) | |
| parent | 9e849950dc7c1f2fb6ffa62ab65bd30f35717d13 (diff) | |
| download | cgit-1b09cbd303d889ec2636127584d57b7f1b70c25e.zip cgit-1b09cbd303d889ec2636127584d57b7f1b70c25e.tar.gz cgit-1b09cbd303d889ec2636127584d57b7f1b70c25e.tar.bz2 | |
Merge branch 'stable'
| -rw-r--r-- | ui-shared.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui-shared.c b/ui-shared.c index 7efae7a..5aa9119 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
| @@ -553,49 +553,49 @@ void cgit_print_age(time_t t, time_t max_relative, const char *format) | |||
| 553 | return; | 553 | return; |
| 554 | } | 554 | } |
| 555 | if (secs < TM_YEAR * 2) { | 555 | if (secs < TM_YEAR * 2) { |
| 556 | htmlf("<span class='age-months'>%.0f months</span>", | 556 | htmlf("<span class='age-months'>%.0f months</span>", |
| 557 | secs * 1.0 / TM_MONTH); | 557 | secs * 1.0 / TM_MONTH); |
| 558 | return; | 558 | return; |
| 559 | } | 559 | } |
| 560 | htmlf("<span class='age-years'>%.0f years</span>", | 560 | htmlf("<span class='age-years'>%.0f years</span>", |
| 561 | secs * 1.0 / TM_YEAR); | 561 | secs * 1.0 / TM_YEAR); |
| 562 | } | 562 | } |
| 563 | 563 | ||
| 564 | void cgit_print_http_headers(struct cgit_context *ctx) | 564 | void cgit_print_http_headers(struct cgit_context *ctx) |
| 565 | { | 565 | { |
| 566 | if (ctx->env.no_http && !strcmp(ctx->env.no_http, "1")) | 566 | if (ctx->env.no_http && !strcmp(ctx->env.no_http, "1")) |
| 567 | return; | 567 | return; |
| 568 | 568 | ||
| 569 | if (ctx->page.status) | 569 | if (ctx->page.status) |
| 570 | htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg); | 570 | htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg); |
| 571 | if (ctx->page.mimetype && ctx->page.charset) | 571 | if (ctx->page.mimetype && ctx->page.charset) |
| 572 | htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, | 572 | htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, |
| 573 | ctx->page.charset); | 573 | ctx->page.charset); |
| 574 | else if (ctx->page.mimetype) | 574 | else if (ctx->page.mimetype) |
| 575 | htmlf("Content-Type: %s\n", ctx->page.mimetype); | 575 | htmlf("Content-Type: %s\n", ctx->page.mimetype); |
| 576 | if (ctx->page.size) | 576 | if (ctx->page.size) |
| 577 | htmlf("Content-Length: %ld\n", ctx->page.size); | 577 | htmlf("Content-Length: %zd\n", ctx->page.size); |
| 578 | if (ctx->page.filename) | 578 | if (ctx->page.filename) |
| 579 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", | 579 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", |
| 580 | ctx->page.filename); | 580 | ctx->page.filename); |
| 581 | htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); | 581 | htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); |
| 582 | htmlf("Expires: %s\n", http_date(ctx->page.expires)); | 582 | htmlf("Expires: %s\n", http_date(ctx->page.expires)); |
| 583 | if (ctx->page.etag) | 583 | if (ctx->page.etag) |
| 584 | htmlf("ETag: \"%s\"\n", ctx->page.etag); | 584 | htmlf("ETag: \"%s\"\n", ctx->page.etag); |
| 585 | html("\n"); | 585 | html("\n"); |
| 586 | if (ctx->env.request_method && !strcmp(ctx->env.request_method, "HEAD")) | 586 | if (ctx->env.request_method && !strcmp(ctx->env.request_method, "HEAD")) |
| 587 | exit(0); | 587 | exit(0); |
| 588 | } | 588 | } |
| 589 | 589 | ||
| 590 | void cgit_print_docstart(struct cgit_context *ctx) | 590 | void cgit_print_docstart(struct cgit_context *ctx) |
| 591 | { | 591 | { |
| 592 | if (ctx->cfg.embedded) { | 592 | if (ctx->cfg.embedded) { |
| 593 | if (ctx->cfg.header) | 593 | if (ctx->cfg.header) |
| 594 | html_include(ctx->cfg.header); | 594 | html_include(ctx->cfg.header); |
| 595 | return; | 595 | return; |
| 596 | } | 596 | } |
| 597 | 597 | ||
| 598 | char *host = cgit_hosturl(); | 598 | char *host = cgit_hosturl(); |
| 599 | html(cgit_doctype); | 599 | html(cgit_doctype); |
| 600 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); | 600 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); |
| 601 | html("<head>\n"); | 601 | html("<head>\n"); |