summaryrefslogtreecommitdiffabout
path: root/ui-shared.c
authorLars Hjemli <hjemli@gmail.com>2009-08-10 07:20:17 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-08-10 07:20:17 (UTC)
commit8b2252b0b61617e9de9d9e9ba743881ad62523af (patch) (side-by-side diff)
tree2d0f02d2c4a213644a1031a88af6578c032edbe6 /ui-shared.c
parent60a26272e0ca529407fe6b613f061f04ba585d53 (diff)
downloadcgit-8b2252b0b61617e9de9d9e9ba743881ad62523af.zip
cgit-8b2252b0b61617e9de9d9e9ba743881ad62523af.tar.gz
cgit-8b2252b0b61617e9de9d9e9ba743881ad62523af.tar.bz2
ui-shared: add support for NO_HTTP=1/--nohttp
cgit_print_http_headers() used to do nothing if 'embedded' was specified in cgitrc, but that was wrong - we never want to skip the headers when invoked as a CGI app. Sadly, there's no easy way to detect if we're invoked as a CGI app or if we're invoked by another CGI app, so for the latter case cgit needs to be invoked with either --nohttp on the command line or NO_HTTP=1 in the environment. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'ui-shared.c') (more/less context) (show whitespace changes)
-rw-r--r--ui-shared.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui-shared.c b/ui-shared.c
index 538ddda..4175bd8 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -450,17 +450,17 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
return;
}
htmlf("<span class='age-years'>%.0f years</span>",
secs * 1.0 / TM_YEAR);
}
void cgit_print_http_headers(struct cgit_context *ctx)
{
- if (ctx->cfg.embedded)
+ if (ctx->env.no_http && !strcmp(ctx->env.no_http, "1"))
return;
if (ctx->page.status)
htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg);
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)