Author: Lars Hjemli <hjemli@gmail.com>
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>
cgit.c | 4 ++++ cgit.h | 1 + ui-shared.c | 2 +-
diff --git a/cgit.c b/cgit.c index a92383d520d79ec1e590504766436f448884fa98..36777b5de4ba10c7823152384e12c611020fcd8c 100644 --- a/cgit.c +++ b/cgit.c @@ -253,6 +253,7 @@ ctx->cfg.summary_tags = 10; 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")); @@ -444,6 +445,9 @@ ctx.cfg.cache_root = xstrdup(argv[i]+8); } 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); diff --git a/cgit.h b/cgit.h index 893231df84f091ad5e53f316d94d01205480e35d..d90ccdcafff809bff7734f1949f3a84f5cbd18ee 100644 --- a/cgit.h +++ b/cgit.h @@ -211,6 +211,7 @@ struct cgit_environment { char *cgit_config; char *http_host; char *https; + char *no_http; char *path_info; char *query_string; char *request_method; diff --git a/ui-shared.c b/ui-shared.c index 538dddaed6edcfb1f6e29917a6b8021ba8e00186..4175bd8d335c710ab24c40b282813d4e8ccf6e96 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -455,7 +455,7 @@ } 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)