author | Lars Hjemli <hjemli@gmail.com> | 2009-08-10 06:21:09 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-08-10 06:21:09 (UTC) |
commit | 60a26272e0ca529407fe6b613f061f04ba585d53 (patch) (side-by-side diff) | |
tree | c2b6ee3c19a44bd276043650298229c481ca4535 /ui-shared.c | |
parent | e6cd7121edf55c13f04cd5d6fca8f07c4035ce0a (diff) | |
download | cgit-60a26272e0ca529407fe6b613f061f04ba585d53.zip cgit-60a26272e0ca529407fe6b613f061f04ba585d53.tar.gz cgit-60a26272e0ca529407fe6b613f061f04ba585d53.tar.bz2 |
Cleanup handling of environment variables
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-shared.c | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/ui-shared.c b/ui-shared.c index 015c52b..538ddda 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -35,35 +35,23 @@ void cgit_print_error(char *msg) } 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://"; else return "http://"; } char *cgit_hosturl() { - char *host, *port; - - host = getenv("HTTP_HOST"); - if (host) { - host = xstrdup(host); - } else { - host = getenv("SERVER_NAME"); - if (!host) + if (ctx.env.http_host) + return ctx.env.http_host; + if (!ctx.env.server_name) 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.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)); } char *cgit_rooturl() { @@ -466,10 +454,8 @@ void cgit_print_age(time_t t, time_t max_relative, char *format) } void cgit_print_http_headers(struct cgit_context *ctx) { - const char *method = getenv("REQUEST_METHOD"); - if (ctx->cfg.embedded) return; if (ctx->page.status) @@ -488,9 +474,9 @@ void cgit_print_http_headers(struct cgit_context *ctx) htmlf("Expires: %s\n", http_date(ctx->page.expires)); if (ctx->page.etag) htmlf("ETag: \"%s\"\n", ctx->page.etag); html("\n"); - if (method && !strcmp(method, "HEAD")) + if (ctx->env.request_method && !strcmp(ctx->env.request_method, "HEAD")) exit(0); } void cgit_print_docstart(struct cgit_context *ctx) |