From 87a89aed41136d388537b146000c4af6c1135a8c Mon Sep 17 00:00:00 2001 From: Diego Ongaro Date: Wed, 10 Jun 2009 18:09:55 -0500 Subject: [PATCH 1/2] add cgit_httpscheme() -> http:// or https:// --- ui-shared.c | 11 +++++++++++ ui-shared.h | 1 + 2 files changed, 12 insertions(+) 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("\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; diff --git a/ui-shared.h b/ui-shared.h index 5a3821f..bff4826 100644 --- a/ui-shared.h +++ b/ui-shared.h @@ -1,6 +1,7 @@ #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, From 694dd43886f23723f415aed3afb62131cdbcaa51 Mon Sep 17 00:00:00 2001 From: Diego Ongaro Date: Wed, 10 Jun 2009 18:18:34 -0500 Subject: [PATCH 2/2] use cgit_httpscheme() for atom feed --- ui-atom.c | 6 ++++-- ui-shared.c | 3 ++- 2 files changed, 6 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 @@ -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("\n"); if (host) { - 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("