diff options
author | Lars Hjemli <hjemli@gmail.com> | 2009-08-10 09:20:17 +0200 |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-08-10 09:20:17 +0200 |
commit | 8b2252b0b61617e9de9d9e9ba743881ad62523af (patch) | |
tree | 2d0f02d2c4a213644a1031a88af6578c032edbe6 /cgit.c | |
parent | Cleanup handling of environment variables (diff) | |
download | cgit-pink-8b2252b0b61617e9de9d9e9ba743881ad62523af.tar.gz cgit-pink-8b2252b0b61617e9de9d9e9ba743881ad62523af.zip |
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 'cgit.c')
-rw-r--r-- | cgit.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cgit.c b/cgit.c index a92383d..36777b5 100644 --- a/cgit.c +++ b/cgit.c @@ -253,6 +253,7 @@ static void prepare_context(struct cgit_context *ctx) ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); ctx->env.https = xstrdupn(getenv("HTTPS")); + ctx->env.no_http = xstrdupn(getenv("NO_HTTP")); ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); ctx->env.query_string = xstrdupn(getenv("QUERY_STRING")); ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD")); @@ -445,6 +446,9 @@ static void cgit_parse_args(int argc, const char **argv) if (!strcmp(argv[i], "--nocache")) { ctx.cfg.nocache = 1; } + if (!strcmp(argv[i], "--nohttp")) { + ctx.env.no_http = "1"; + } if (!strncmp(argv[i], "--query=", 8)) { ctx.qry.raw = xstrdup(argv[i]+8); } |