summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-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
@@ -252,8 +252,9 @@ static void prepare_context(struct cgit_context *ctx)
252 ctx->cfg.summary_tags = 10; 252 ctx->cfg.summary_tags = 10;
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"));
259 ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME")); 260 ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME"));
@@ -444,8 +445,11 @@ static void cgit_parse_args(int argc, const char **argv)
444 } 445 }
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 }
451 if (!strncmp(argv[i], "--repo=", 7)) { 455 if (!strncmp(argv[i], "--repo=", 7)) {
diff --git a/cgit.h b/cgit.h
index 893231d..d90ccdc 100644
--- a/cgit.h
+++ b/cgit.h
@@ -210,8 +210,9 @@ struct cgit_page {
210struct cgit_environment { 210struct 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;
217 char *script_name; 218 char *script_name;
diff --git a/ui-shared.c b/ui-shared.c
index 538ddda..4175bd8 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -454,9 +454,9 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
454} 454}
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)
462 htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg); 462 htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg);