all repos — cgit @ fbe091a716447be496519ce439451d36d5b9fc24

a hyperfast web frontend for git written in c

Merge branch 'do/https'

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Lars Hjemli hjemli@gmail.com
Sat, 25 Jul 2009 11:40:25 +0200
commit

fbe091a716447be496519ce439451d36d5b9fc24

parent

e429fb0cca1e8c78da0ec38fe578bafdeec65534

3 files changed, 18 insertions(+), 3 deletions(-)

jump to
M ui-atom.cui-atom.c

@@ -52,7 +52,8 @@ 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)

@@ -113,7 +114,8 @@ 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");
M ui-shared.cui-shared.c

@@ -34,6 +34,17 @@ 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;

@@ -494,7 +505,8 @@ 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)));
M ui-shared.hui-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,