mirror of
https://git.zx2c4.com/cgit
synced 2024-11-22 08:28:42 +00:00
Merge branch 'do/https'
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
This commit is contained in:
commit
fbe091a716
@ -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");
|
||||
|
14
ui-shared.c
14
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;
|
||||
@ -494,7 +505,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)));
|
||||
|
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user