about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorLars Hjemli2009-08-10 09:20:17 +0200
committerLars Hjemli2009-08-10 09:20:17 +0200
commit8b2252b0b61617e9de9d9e9ba743881ad62523af (patch)
tree2d0f02d2c4a213644a1031a88af6578c032edbe6
parentCleanup handling of environment variables (diff)
downloadcgit-8b2252b0b61617e9de9d9e9ba743881ad62523af.tar.gz
cgit-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>
-rw-r--r--cgit.c4
-rw-r--r--cgit.h1
-rw-r--r--ui-shared.c2
3 files changed, 6 insertions, 1 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)
253 ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); 253 ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG"));
254 ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); 254 ctx->env.http_host = xstrdupn(getenv("HTTP_HOST"));
255 ctx->env.https = xstrdupn(getenv("HTTPS")); 255 ctx->env.https = xstrdupn(getenv("HTTPS"));
256 ctx->env.no_http = xstrdupn(getenv("NO_HTTP"));
256 ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); 257 ctx->env.path_info = xstrdupn(getenv("PATH_INFO"));
257 ctx->env.query_string = xstrdupn(getenv("QUERY_STRING")); 258 ctx->env.query_string = xstrdupn(getenv("QUERY_STRING"));
258 ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD")); 259 ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD"));
@@ -445,6 +446,9 @@ static void cgit_parse_args(int argc, const char **argv)
445 if (!strcmp(argv[i], "--nocache")) { 446 if (!strcmp(argv[i], "--nocache")) {
446 ctx.cfg.nocache = 1; 447 ctx.cfg.nocache = 1;
447 } 448 }
449 if (!strcmp(argv[i], "--nohttp")) {
450 ctx.env.no_http = "1";
451 }
448 if (!strncmp(argv[i], "--query=", 8)) { 452 if (!strncmp(argv[i], "--query=", 8)) {
449 ctx.qry.raw = xstrdup(argv[i]+8); 453 ctx.qry.raw = xstrdup(argv[i]+8);
450 } 454 }
diff --git a/cgit.h b/cgit.h index 893231d..d90ccdc 100644 --- a/cgit.h +++ b/cgit.h
@@ -211,6 +211,7 @@ struct cgit_environment {
211 char *cgit_config; 211 char *cgit_config;
212 char *http_host; 212 char *http_host;
213 char *https; 213 char *https;
214 char *no_http;
214 char *path_info; 215 char *path_info;
215 char *query_string; 216 char *query_string;
216 char *request_method; 217 char *request_method;
diff --git a/ui-shared.c b/ui-shared.c index 538ddda..4175bd8 100644 --- a/ui-shared.c +++ b/ui-shared.c
@@ -455,7 +455,7 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
455 455
456void cgit_print_http_headers(struct cgit_context *ctx) 456void cgit_print_http_headers(struct cgit_context *ctx)
457{ 457{
458 if (ctx->cfg.embedded) 458 if (ctx->env.no_http && !strcmp(ctx->env.no_http, "1"))
459 return; 459 return;
460 460
461 if (ctx->page.status) 461 if (ctx->page.status)