git: update to v2.6.1

[ps-cgit] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index 06dd0a8ebc841c652bba0553da8d059273ec02bc..89c48979586edaa7dc6d7df1aa133f288638b70e 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -791,6 +791,7 @@ void cgit_print_docend(void)
 void cgit_print_error_page(int code, const char *msg, const char *fmt, ...)
 {
        va_list ap;
+       ctx.page.expires = ctx.cfg.cache_dynamic_ttl;
        ctx.page.status = code;
        ctx.page.statusmsg = msg;
        cgit_print_http_headers();
@@ -802,6 +803,18 @@ void cgit_print_error_page(int code, const char *msg, const char *fmt, ...)
        cgit_print_docend();
 }
 
+void cgit_print_layout_start(void)
+{
+       cgit_print_http_headers();
+       cgit_print_docstart();
+       cgit_print_pageheader();
+}
+
+void cgit_print_layout_end(void)
+{
+       cgit_print_docend();
+}
+
 static void add_clone_urls(void (*fn)(const char *), char *txt, char *suffix)
 {
        struct strbuf **url_list = strbuf_split_str(txt, ' ', 0);