Merge branch 'do/https'

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

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
@@ -54,3 +54,4 @@ void add_entry(struct commit *commit, char *host)
         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);
@@ -115,3 +116,4 @@ void cgit_print_atom(char *tip, char *path, int max_count)
         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);
diff --git a/ui-shared.c b/ui-shared.c
index 2630f23..29036d0 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -36,2 +36,13 @@ void cgit_print_error(char *msg)
 
+char *cgit_httpscheme()
+{
+        char *https;
+
+        https = getenv("HTTPS");
+        if (https != NULL && strcmp(https, "on") == 0)
+                return "https://";
+        else
+                return "http://";
+}
+
 char *cgit_hosturl()
@@ -496,3 +507,4 @@ void cgit_print_docstart(struct cgit_context *ctx)
         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());
diff --git a/ui-shared.h b/ui-shared.h
index 5a3821f..bff4826 100644
--- a/ui-shared.h
+++ b/ui-shared.h
@@ -3,2 +3,3 @@
 
+extern char *cgit_httpscheme();
 extern char *cgit_hosturl();