Merge branch 'do/https'

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

diff --git a/cgit.c b/cgit.c
index 64d95f9a3a7bb56197988e6730c4576173811db0..19adadd2e3a9277aa25916eb1747ee3cbae63f75 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -285,6 +285,8 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
        if (get_sha1(ctx->qry.head, sha1)) {
                tmp = xstrdup(ctx->qry.head);
                ctx->qry.head = ctx->repo->defbranch;
+               ctx->page.status = 404;
+               ctx->page.statusmsg = "not found";
                cgit_print_http_headers(ctx);
                cgit_print_docstart(ctx);
                cgit_print_pageheader(ctx);

diff --git a/cgit.h b/cgit.h
index 5f7af51a68e0a773cac9c2758df51d5f0af90ff6..00aca4c36a46d6dc8737b32ea794c917dcfc825e 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -181,6 +181,8 @@ struct cgit_page {
        char *charset;
        char *filename;
        char *title;
+       int status;
+       char *statusmsg;
 };
 
 struct cgit_context {

diff --git a/ui-shared.c b/ui-shared.c
index 5ce2bc5d43987cec93bd2e68c5b21e7479cdf93a..29036d0a92ba45643e7db53af2671113fcbff7be 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -467,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);