Merge branch 'ml/head-include'

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

index 749ea35c58d5cab7647620d94b570e3501bd9017..66d5b8220de122d69a8398119592f09114c83731 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -467,6 +467,10 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
  
  void cgit_print_http_headers(struct cgit_context *ctx)
  {
+       const char *method = getenv("REQUEST_METHOD");
+
+       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);
@@ -479,7 +483,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 (method && !strcmp(method, "HEAD"))
+               exit(0);
  }
  
  void cgit_print_docstart(struct cgit_context *ctx)
@@ -503,12 +511,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)