3 files changed, 18 insertions, 3 deletions
diff --git a/ui-atom.c b/ui-atom.c
index a6ea3ee..e5c31d9 100644
--- a/ui-atom.c
+++ b/ui-atom.c
@@ -31,49 +31,50 @@ void add_entry(struct commit *commit, char *host)
                html("<name>");
                html_txt(info->author);
                html("</name>\n");
        }
        if (info->author_email) {
                mail = xstrdup(info->author_email);
                t = strchr(mail, '<');
                if (t)
                        t++;
                else
                        t = mail;
                t2 = strchr(t, '>');
                if (t2)
                        *t2 = '\0';
                html("<email>");
                html_txt(t);
                html("</email>\n");
                free(mail);
        }
        html("</author>\n");
        html("<published>");
        cgit_print_date(info->author_date, FMT_ATOMDATE, ctx.cfg.local_time);
        html("</published>\n");
        if (host) {
-                html("<link rel='alternate' type='text/html' href='http://");
+                html("<link rel='alternate' type='text/html' href='");
+                html(cgit_httpscheme());
                html_attr(host);
                html_attr(cgit_pageurl(ctx.repo->url, "commit", NULL));
                if (ctx.cfg.virtual_root)
                        delim = '?';
                htmlf("%cid=%s", delim, hex);
                html("'/>\n");
        }
        htmlf("<id>%s</id>\n", hex);
        html("<content type='text'>\n");
        html_txt(info->msg);
        html("</content>\n");
        html("<content type='xhtml'>\n");
        html("<div xmlns='http://www.w3.org/1999/xhtml'>\n");
        html("<pre>\n");
        html_txt(info->msg);
        html("</pre>\n");
        html("</div>\n");
        html("</content>\n");
        html("</entry>\n");
        cgit_free_commitinfo(info);
 }
 void cgit_print_atom(char *tip, char *path, int max_count)
@@ -92,38 +93,39 @@ void cgit_print_atom(char *tip, char *path, int max_count)
                argv[argc++] = path;
        }
        init_revisions(&rev, NULL);
        rev.abbrev = DEFAULT_ABBREV;
        rev.commit_format = CMIT_FMT_DEFAULT;
        rev.verbose_header = 1;
        rev.show_root_diff = 0;
        rev.max_count = max_count;
        setup_revisions(argc, argv, &rev, NULL);
        prepare_revision_walk(&rev);
        host = cgit_hosturl();
        ctx.page.mimetype = "text/xml";
        ctx.page.charset = "utf-8";
        cgit_print_http_headers(&ctx);
        html("<feed xmlns='http://www.w3.org/2005/Atom'>\n");
        html("<title>");
        html_txt(ctx.repo->name);
        html("</title>\n");
        html("<subtitle>");
        html_txt(ctx.repo->desc);
        html("</subtitle>\n");
        if (host) {
-                html("<link rel='alternate' type='text/html' href='http://");
+                html("<link rel='alternate' type='text/html' href='");
+                html(cgit_httpscheme());
                html_attr(host);
                html_attr(cgit_repourl(ctx.repo->url));
                html("'/>\n");
        }
        while ((commit = get_revision(&rev)) != NULL) {
                add_entry(commit, host);
                free(commit->buffer);
                commit->buffer = NULL;
                free_commit_list(commit->parents);
                commit->parents = NULL;
        }
        html("</feed>\n");
 }
diff --git a/ui-shared.c b/ui-shared.c
index 2630f23..29036d0 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -13,48 +13,59 @@
 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_httpscheme()
+{
+        char *https;
+        https = getenv("HTTPS");
+        if (https != NULL && strcmp(https, "on") == 0)
+                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)
                        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);
@@ -473,49 +484,50 @@ void cgit_print_http_headers(struct cgit_context *ctx)
        html("\n");
 }
 void cgit_print_docstart(struct cgit_context *ctx)
 {
        char *host = cgit_hosturl();
        html(cgit_doctype);
        html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
        html("<head>\n");
        html("<title>");
        html_txt(ctx->page.title);
        html("</title>\n");
        htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
        if (ctx->cfg.robots && *ctx->cfg.robots)
                htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots);
        html("<link rel='stylesheet' type='text/css' href='");
        html_attr(ctx->cfg.css);
        html("'/>\n");
        if (ctx->cfg.favicon) {
                html("<link rel='shortcut icon' href='");
                html_attr(ctx->cfg.favicon);
                html("'/>\n");
        }
        if (host && ctx->repo) {
-                html("<link rel='alternate' title='Atom feed' href='http://");
+                html("<link rel='alternate' title='Atom feed' href='");
+                html(cgit_httpscheme());
                html_attr(cgit_hosturl());
                html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path,
                                       fmt("h=%s", ctx->qry.head)));
                html("' type='application/atom+xml'/>");
        }
        html("</head>\n");
        html("<body>\n");
        if (ctx->cfg.header)
                html_include(ctx->cfg.header);
 }
 void cgit_print_docend()
 {
        html("</div>");
        if (ctx.cfg.footer)
                html_include(ctx.cfg.footer);
        else {
                htmlf("<div class='footer'>generated  by cgit %s at ",
                        cgit_version);
                cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time);
                html("</div>\n");
        }
        html("</body>\n</html>\n");
 }
diff --git a/ui-shared.h b/ui-shared.h
index 5a3821f..bff4826 100644
--- a/ui-shared.h
+++ b/ui-shared.h
@@ -1,27 +1,28 @@
 #ifndef UI_SHARED_H
 #define UI_SHARED_H
+extern char *cgit_httpscheme();
 extern char *cgit_hosturl();
 extern char *cgit_repourl(const char *reponame);
 extern char *cgit_fileurl(const char *reponame, const char *pagename,
                          const char *filename, const char *query);
 extern char *cgit_pageurl(const char *reponame, const char *pagename,
                          const char *query);
 extern void cgit_index_link(char *name, char *title, char *class,
                            char *pattern, int ofs);
 extern void cgit_summary_link(char *name, char *title, char *class, char *head);
 extern void cgit_tag_link(char *name, char *title, char *class, char *head,
                          char *rev);
 extern void cgit_tree_link(char *name, char *title, char *class, char *head,
                           char *rev, char *path);
 extern void cgit_plain_link(char *name, char *title, char *class, char *head,
                            char *rev, char *path);
 extern void cgit_log_link(char *name, char *title, char *class, char *head,
                          char *rev, char *path, int ofs, char *grep,
                          char *pattern, int showmsg);
 extern void cgit_commit_link(char *name, char *title, char *class, char *head,
                             char *rev);
 extern void cgit_patch_link(char *name, char *title, char *class, char *head,
                            char *rev);
 extern void cgit_refs_link(char *name, char *title, char *class, char *head,