crtxcr/cgitsb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'do/https'

Browse Source 
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
This commit is contained in:
Lars Hjemli 2009-07-25 11:40:25 +02:00
commit fbe091a716
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui-atom.c
View File

@ -52,7 +52,8 @@ void add_entry(struct commit *commit, char *host)
cgit_print_date(info->author_date, FMT_ATOMDATE, ctx.cfg.local_time); cgit_print_date(info->author_date, FMT_ATOMDATE, ctx.cfg.local_time);
html("</published>\n"); html("</published>\n");
if (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); html_attr(host);
html_attr(cgit_pageurl(ctx.repo->url, "commit", NULL)); html_attr(cgit_pageurl(ctx.repo->url, "commit", NULL));
if (ctx.cfg.virtual_root) 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_txt(ctx.repo->desc);
html("</subtitle>\n"); html("</subtitle>\n");
if (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); html_attr(host);
html_attr(cgit_repourl(ctx.repo->url)); html_attr(cgit_repourl(ctx.repo->url));
html("'/>\n"); html("'/>\n");

14
ui-shared.c
View File

@ -34,6 +34,17 @@ void cgit_print_error(char *msg)
html("</div>\n"); 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 *cgit_hosturl()
{ {
char *host, *port; char *host, *port;
@ -494,7 +505,8 @@ void cgit_print_docstart(struct cgit_context *ctx)
html("'/>\n"); html("'/>\n");
} }
if (host && ctx->repo) { 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_hosturl());
html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path, html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path,
fmt("h=%s", ctx->qry.head))); fmt("h=%s", ctx->qry.head)));

1
ui-shared.h
View File

@ -1,6 +1,7 @@
#ifndef UI_SHARED_H #ifndef UI_SHARED_H
#define UI_SHARED_H #define UI_SHARED_H
extern char *cgit_httpscheme();
extern char *cgit_hosturl(); extern char *cgit_hosturl();
extern char *cgit_repourl(const char *reponame); extern char *cgit_repourl(const char *reponame);
extern char *cgit_fileurl(const char *reponame, const char *pagename, extern char *cgit_fileurl(const char *reponame, const char *pagename,