| -rw-r--r-- | ui-shared.c | 32 |
1 files changed, 9 insertions, 23 deletions
diff --git a/ui-shared.c b/ui-shared.c index 015c52b..538ddda 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -38,6 +38,3 @@ char *cgit_httpscheme() { - char *https; - - https = getenv("HTTPS"); - if (https != NULL && strcmp(https, "on") == 0) + if (ctx.env.https && !strcmp(ctx.env.https, "on")) return "https://"; @@ -49,18 +46,9 @@ char *cgit_hosturl() { - char *host, *port; - - host = getenv("HTTP_HOST"); - if (host) { - host = xstrdup(host); - } else { - host = getenv("SERVER_NAME"); - if (!host) - return NULL; - port = getenv("SERVER_PORT"); - if (port && atoi(port) != 80) - host = xstrdup(fmt("%s:%d", host, atoi(port))); - else - host = xstrdup(host); - } - return host; + if (ctx.env.http_host) + return ctx.env.http_host; + if (!ctx.env.server_name) + return NULL; + if (!ctx.env.server_port || atoi(ctx.env.server_port) == 80) + return ctx.env.server_name; + return xstrdup(fmt("%s:%s", ctx.env.server_name, ctx.env.server_port)); } @@ -469,4 +457,2 @@ void cgit_print_http_headers(struct cgit_context *ctx) { - const char *method = getenv("REQUEST_METHOD"); - if (ctx->cfg.embedded) @@ -491,3 +477,3 @@ void cgit_print_http_headers(struct cgit_context *ctx) html("\n"); - if (method && !strcmp(method, "HEAD")) + if (ctx->env.request_method && !strcmp(ctx->env.request_method, "HEAD")) exit(0); |