Merge branch 'ew/http_host'

* ew/http_host: use Host: header to generate cgit_hosturl
author: Lars Hjemli <hjemli@gmail.com> 2008-09-15 19:47:14 (UTC)
committer: Lars Hjemli <hjemli@gmail.com> 2008-09-15 19:47:14 (UTC)
commit: 91fd1eca07f9e48109e8acebc0a92dc4b12ecb50 (patch) (unidiff)
tree: db8c084d617c8e02899f358a42631646b7c1b766
parent: b28765135dd6f52635977454eaf95d0e6c7e7271 (diff)
parent: 9c931b1e6e68f8dc891a5653035c3d70038ae3c0 (diff)
download: cgit-91fd1eca07f9e48109e8acebc0a92dc4b12ecb50.zip
cgit-91fd1eca07f9e48109e8acebc0a92dc4b12ecb50.tar.gz
cgit-91fd1eca07f9e48109e8acebc0a92dc4b12ecb50.tar.bz2
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
@@ -1,176 +1,181 @@
 /* ui-shared.c: common web output functions
 *
 * Copyright (C) 2006 Lars Hjemli
 *
 * Licensed under GNU General Public License v2
 *   (see COPYING for full license text)
 */
 #include "cgit.h"
 #include "cmd.h"
 #include "html.h"
 const char cgit_doctype[] =
 "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n"
 "  \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
 static char *http_date(time_t t)
 {
        static char day[][4] =
                {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
        static char month[][4] =
                {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
                 "Jul", "Aug", "Sep", "Oct", "Now", "Dec"};
        struct tm *tm = gmtime(&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");
+        host = getenv("HTTP_HOST");
-        if (!host)
+        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);
+        } 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 {
                return fmt("?r=%s", reponame);
        }
 }
 char *cgit_fileurl(const char *reponame, const char *pagename,
                   const char *filename, const char *query)
 {
        char *tmp;
        char *delim;
        if (ctx.cfg.virtual_root) {
                tmp = fmt("%s/%s/%s/%s", ctx.cfg.virtual_root, reponame,
                          pagename, (filename ? filename:""));
                delim = "?";
        } else {
                tmp = fmt("?url=%s/%s/%s", reponame, pagename,
                          (filename ? filename : ""));
                delim = "&";
        }
        if (query)
                tmp = fmt("%s%s%s", tmp, delim, query);
        return tmp;
 }
 char *cgit_pageurl(const char *reponame, const char *pagename,
                   const char *query)
 {
        return cgit_fileurl(reponame,pagename,0,query);
 }
 const char *cgit_repobasename(const char *reponame)
 {
        /* I assume we don't need to store more than one repo basename */
        static char rvbuf[1024];
        int p;
        const char *rv;
        strncpy(rvbuf,reponame,sizeof(rvbuf));
        if(rvbuf[sizeof(rvbuf)-1])
                die("cgit_repobasename: truncated repository name '%s'", reponame);
        p = strlen(rvbuf)-1;
        /* strip trailing slashes */
        while(p && rvbuf[p]=='/') rvbuf[p--]=0;
        /* strip trailing .git */
        if(p>=3 && !strncmp(&rvbuf[p-3],".git",4)) {
                p -= 3; rvbuf[p--] = 0;
        }
        /* strip more trailing slashes if any */
        while( p && rvbuf[p]=='/') rvbuf[p--]=0;
        /* find last slash in the remaining string */
        rv = strrchr(rvbuf,'/');
        if(rv)
                return ++rv;
        return rvbuf;
 }
 char *cgit_currurl()
 {
        if (!ctx.cfg.virtual_root)
                return ctx.cfg.script_name;
        else if (ctx.qry.page)
                return fmt("%s/%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo, ctx.qry.page);
        else if (ctx.qry.repo)
                return fmt("%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo);
        else
                return fmt("%s/", ctx.cfg.virtual_root);
 }
 static void site_url(char *page, char *search, int ofs)
 {
        char *delim = "?";
        if (ctx.cfg.virtual_root) {
                html_attr(ctx.cfg.virtual_root);
                if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
                        html("/");
        } else
                html(ctx.cfg.script_name);
        if (page) {
                htmlf("?p=%s", page);
                delim = "&";
        }
        if (search) {
                html(delim);
                html("q=");
                html_attr(search);
                delim = "&";
        }
        if (ofs) {
                html(delim);
                htmlf("ofs=%d", ofs);
        }
 }
 static void site_link(char *page, char *name, char *title, char *class,
                      char *search, int ofs)
 {
        html("<a");
        if (title) {
                html(" title='");
                html_attr(title);
                html("'");
        }
        if (class) {
                html(" class='");
                html_attr(class);
                html("'");
        }
        html(" href='");
        site_url(page, search, ofs);
        html("'>");
        html_txt(name);
author	Lars Hjemli <hjemli@gmail.com>	2008-09-15 19:47:14 (UTC)
committer	Lars Hjemli <hjemli@gmail.com>	2008-09-15 19:47:14 (UTC)
commit	91fd1eca07f9e48109e8acebc0a92dc4b12ecb50 (patch) (unidiff)
tree	db8c084d617c8e02899f358a42631646b7c1b766
parent	b28765135dd6f52635977454eaf95d0e6c7e7271 (diff)
parent	9c931b1e6e68f8dc891a5653035c3d70038ae3c0 (diff)
download	cgit-91fd1eca07f9e48109e8acebc0a92dc4b12ecb50.zip cgit-91fd1eca07f9e48109e8acebc0a92dc4b12ecb50.tar.gz cgit-91fd1eca07f9e48109e8acebc0a92dc4b12ecb50.tar.bz2