Merge branch 'rt/plain-binary'

[ps-cgit] / ui-shared.c
diff --git a/ui-shared.c b/ui-shared.c

index 4f2851273418dc9a81c4af942660e4923a149f5e..29036d0a92ba45643e7db53af2671113fcbff7be 100644 (file)
--- a/ui-shared.c
+++ b/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;
@@ -456,6 +467,8 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
  
  void cgit_print_http_headers(struct cgit_context *ctx)
  {
+       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);
@@ -492,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)));
@@ -500,6 +514,8 @@ void cgit_print_docstart(struct cgit_context *ctx)
         }
         html("</head>\n");
         html("<body>\n");
+       if (ctx->cfg.header)
+               html_include(ctx->cfg.header);
  }
  
  void cgit_print_docend()