From 87a89aed41136d388537b146000c4af6c1135a8c Mon Sep 17 00:00:00 2001
From: Diego Ongaro
Date: Wed, 10 Jun 2009 18:09:55 -0500
Subject: add cgit_httpscheme() -> http:// or https://

---
 ui-shared.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'ui-shared.c')

diff --git a/ui-shared.c b/ui-shared.c
index de77bbf..749ea35 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -34,6 +34,17 @@ void cgit_print_error(char *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;
-- 
cgit v1.2.3-70-g09d2


From 694dd43886f23723f415aed3afb62131cdbcaa51 Mon Sep 17 00:00:00 2001
From: Diego Ongaro
Date: Wed, 10 Jun 2009 18:18:34 -0500
Subject: use cgit_httpscheme() for atom feed

---
 ui-atom.c   | 6 ++++--
 ui-shared.c | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'ui-shared.c')

diff --git a/ui-atom.c b/ui-atom.c
index a6ea3ee..e5c31d9 100644
--- a/ui-atom.c
+++ b/ui-atom.c
@@ -52,7 +52,8 @@ void add_entry(struct commit *commit, char *host)
 	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)
@@ -113,7 +114,8 @@ void cgit_print_atom(char *tip, char *path, int max_count)
 	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");
diff --git a/ui-shared.c b/ui-shared.c
index 749ea35..5ce2bc5 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -503,7 +503,8 @@ void cgit_print_docstart(struct cgit_context *ctx)
 		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)));
-- 
cgit v1.2.3-70-g09d2