1 files changed, 24 insertions, 2 deletions
diff --git a/ui-shared.c b/ui-shared.c
index 5e03a7a..015c52b 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -29,16 +29,27 @@ static char *http_date(time_t t)
 void cgit_print_error(char *msg)
 {
        html("<div class='error'>");
        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;
        host = getenv("HTTP_HOST");
        if (host) {
                host = xstrdup(host);
        } else {
@@ -451,32 +462,40 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
                return;
        }
        htmlf("<span class='age-years'>%.0f years</span>",
              secs * 1.0 / TM_YEAR);
 }
 void cgit_print_http_headers(struct cgit_context *ctx)
 {
+        const char *method = getenv("REQUEST_METHOD");
        if (ctx->cfg.embedded)
                return;
+        if (ctx->page.status)
+                htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg);
        if (ctx->page.mimetype && ctx->page.charset)
                htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,
                      ctx->page.charset);
        else if (ctx->page.mimetype)
                htmlf("Content-Type: %s\n", ctx->page.mimetype);
        if (ctx->page.size)
                htmlf("Content-Length: %ld\n", ctx->page.size);
        if (ctx->page.filename)
                htmlf("Content-Disposition: inline; filename=\"%s\"\n",
                      ctx->page.filename);
        htmlf("Last-Modified: %s\n", http_date(ctx->page.modified));
        htmlf("Expires: %s\n", http_date(ctx->page.expires));
+        if (ctx->page.etag)
+                htmlf("ETag: \"%s\"\n", ctx->page.etag);
        html("\n");
+        if (method && !strcmp(method, "HEAD"))
+                exit(0);
 }
 void cgit_print_docstart(struct cgit_context *ctx)
 {
        if (ctx->cfg.embedded)
                return;
        char *host = cgit_hosturl();
@@ -493,22 +512,25 @@ void cgit_print_docstart(struct cgit_context *ctx)
        html_attr(ctx->cfg.css);
        html("'/>\n");
        if (ctx->cfg.favicon) {
                html("<link rel='shortcut icon' href='");
                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)));
-                html("' type='application/atom+xml'/>");
+                html("' type='application/atom+xml'/>\n");
        }
+        if (ctx->cfg.head_include)
+                html_include(ctx->cfg.head_include);
        html("</head>\n");
        html("<body>\n");
        if (ctx->cfg.header)
                html_include(ctx->cfg.header);
 }
 void cgit_print_docend()
 {