diff options
| author |   Eric Wong <normalperson@yhbt.net> | 2008-08-31 23:30:33 -0700 |
|---|---|---|
| committer |   Lars Hjemli <hjemli@gmail.com> | 2008-09-02 01:26:37 +0200 |
| commit | 9c931b1e6e68f8dc891a5653035c3d70038ae3c0 (patch) | |
| tree | a5cd6d953eb66ad77eb4e5b088e2022973fc4f61 | |
| parent | Use GIT-1.6.0.1 (diff) | |
| download | cgit-9c931b1e6e68f8dc891a5653035c3d70038ae3c0.tar.xz cgit-9c931b1e6e68f8dc891a5653035c3d70038ae3c0.zip | |
use Host: header to generate cgit_hosturl
I run an instance of lighttpd for cgit behind nginx (nginx
doesn't execute CGI). So the port (SERVER_PORT=33333) that
lighttpd runs on sends to cgit is different from the standard
port 80 that public clients connect to (via nginx).
This was causing the Atom feed URL to show the private port
number that lighttpd was running on.
Since the HTTP/1.1 "Host" header includes the port number if
running on a non-standard port, it allows non-client-facing HTTP
servers to transparently generate public URLs that clients can
see.
So use the "Host" header if it is available and fall back to
SERVER_NAME/SERVER_PORT for some clients that don't set
HTTP_HOST.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
| -rw-r--r-- | ui-shared.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/ui-shared.c b/ui-shared.c index 4818e70..c23bc75 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -38,14 +38,19 @@ char *cgit_hosturl() { char *host, *port; - 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 = 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; } |