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
@@ -25,40 +25,45 @@ static char *http_date(time_t t)
         return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday],
                    tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year,
                    tm->tm_hour, tm->tm_min, tm->tm_sec);
 }
 
 void cgit_print_error(char *msg)
 {
         html("<div class='error'>");
         html_txt(msg);
         html("</div>\n");
 }
 
 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;
 }
 
 char *cgit_rooturl()
 {
         if (ctx.cfg.virtual_root)
                 return fmt("%s/", ctx.cfg.virtual_root);
         else
                 return ctx.cfg.script_name;
 }
 
 char *cgit_repourl(const char *reponame)
 {
         if (ctx.cfg.virtual_root) {
                 return fmt("%s/%s/", ctx.cfg.virtual_root, reponame);
         } else {