ui-shared: add support for NO_HTTP=1/--nohttp

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

index 5e03a7a52ef7697f039b684f2fc1779fecbb9270..4175bd8d335c710ab24c40b282813d4e8ccf6e96 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -34,24 +34,23 @@ void cgit_print_error(char *msg)
         html("</div>\n");
  }
  
-char *cgit_hosturl()
+char *cgit_httpscheme()
  {
-       char *host, *port;
+       if (ctx.env.https && !strcmp(ctx.env.https, "on"))
+               return "https://";
+       else
+               return "http://";
+}
  
-       host = getenv("HTTP_HOST");
-       if (host) {
-               host = xstrdup(host);
-       } else {
-               host = getenv("SERVER_NAME");
-               if (!host)
-                       return NULL;
-               port = getenv("SERVER_PORT");
-               if (port && atoi(port) != 80)
-                       host = xstrdup(fmt("%s:%d", host, atoi(port)));
-               else
-                       host = xstrdup(host);
-       }
-       return host;
+char *cgit_hosturl()
+{
+       if (ctx.env.http_host)
+               return ctx.env.http_host;
+       if (!ctx.env.server_name)
+               return NULL;
+       if (!ctx.env.server_port || atoi(ctx.env.server_port) == 80)
+               return ctx.env.server_name;
+       return xstrdup(fmt("%s:%s", ctx.env.server_name, ctx.env.server_port));
  }
  
  char *cgit_rooturl()
@@ -456,9 +455,11 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
  
  void cgit_print_http_headers(struct cgit_context *ctx)
  {
-       if (ctx->cfg.embedded)
+       if (ctx->env.no_http && !strcmp(ctx->env.no_http, "1"))
                 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);
@@ -471,7 +472,11 @@ void cgit_print_http_headers(struct cgit_context *ctx)
                       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 (ctx->env.request_method && !strcmp(ctx->env.request_method, "HEAD"))
+               exit(0);
  }
  
  void cgit_print_docstart(struct cgit_context *ctx)
@@ -498,12 +503,15 @@ 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)));
-               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)