aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile2
-rw-r--r--cache.c7
-rw-r--r--cgit.c4
-rw-r--r--cgit.css108
-rw-r--r--filter.c22
-rwxr-xr-xfilters/html-converters/md2html30
-rwxr-xr-xfilters/syntax-highlighting.py14
-rwxr-xr-xfilters/syntax-highlighting.sh104
m---------git0
-rw-r--r--html.c2
-rwxr-xr-xtests/t0022-error-page-headers.sh37
-rw-r--r--ui-blob.c3
-rw-r--r--ui-shared.c2
-rw-r--r--ui-snapshot.c3
14 files changed, 286 insertions, 52 deletions
diff --git a/Makefile b/Makefile
index d039293..55c0cb6 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ htmldir = $(docdir)
pdfdir = $(docdir)
mandir = $(prefix)/share/man
SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 2.55.0
+GIT_VER = 2.56.0
GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
INSTALL = install
COPYTREE = cp -r
diff --git a/cache.c b/cache.c
index e70af13..13cceac 100644
--- a/cache.c
+++ b/cache.c
@@ -272,6 +272,13 @@ static int process_slot(struct cache_slot *slot)
{
int err;
+ /*
+ * Make sure any buffered data is flushed before we redirect,
+ * do sendfile(2) or write(2)
+ */
+ if (fflush(stdout))
+ return errno;
+
err = open_slot(slot);
if (!err && slot->match) {
if (is_expired(slot)) {
diff --git a/cgit.c b/cgit.c
index 3b9d3aa..fc3932c 100644
--- a/cgit.c
+++ b/cgit.c
@@ -496,7 +496,7 @@ static char *guess_defbranch(void)
ref = refs_resolve_ref_unsafe(get_main_ref_store(the_repository),
"HEAD", 0, &oid, NULL);
- if (!ref || !skip_prefix(ref, "refs/heads/", &refname))
+ if (!ref || !skip_prefix(ref, "ref: refs/heads/", &refname))
return "master";
return xstrdup(refname);
}
@@ -684,7 +684,7 @@ static inline void authenticate_post(void)
len = MAX_AUTHENTICATION_POST_BYTES;
if ((len = read(STDIN_FILENO, buffer, len)) < 0)
die_errno("Could not read POST from stdin");
- if (write(STDOUT_FILENO, buffer, len) < 0)
+ if (fwrite(buffer, 1, len, stdout) < len)
die_errno("Could not write POST to stdout");
cgit_close_filter(ctx.cfg.auth_filter);
exit(0);
diff --git a/cgit.css b/cgit.css
index d10a24d..73be862 100644
--- a/cgit.css
+++ b/cgit.css
@@ -907,3 +907,111 @@ div#cgit table.ssdiff td.space {
div#cgit table.ssdiff td.space div {
min-height: 3em;
}
+
+:root { color-scheme: light dark; }
+@media only all and (prefers-color-scheme: dark) {
+ html, div#cgit { color: #eee; background: #171717; }
+ div#cgit a { color: #3af; }
+ div#cgit .diffstat-header a { color: #28d; }
+ div#cgit table#header td.main a { color: #eee; }
+ div#cgit table#header td.sub { color: #999; }
+ div#cgit table.tabs { border-bottom-color: #444; }
+ div#cgit table.tabs td a { color: #888; }
+ div#cgit table.tabs td a.active { color: #fff; background-color: #444; }
+ div#cgit div.path { color: #eee; background-color: #333; }
+ div#cgit div.content { border-bottom-color: #bbb; }
+ div#cgit table.list tr { background: #171717; }
+ div#cgit table.list tr.logheader { background: #171717; }
+ div#cgit table.list tr:nth-child(even) { background: #171717; }
+ div#cgit table.list tr:nth-child(odd) { background: #1f1f1f; }
+ div#cgit table.list tr:hover { background: #333; }
+ div#cgit table.list tr.nohover { background: #171717; }
+ div#cgit table.list tr.nohover:hover { background: #171717; }
+ div#cgit table.list tr.nohover-highlight:hover:nth-child(even) { background: #171717; }
+ div#cgit table.list tr.nohover-highlight:hover:nth-child(odd) { background: #1f1f1f; }
+ div#cgit table.list td.commitgraph .column1 { color: #f55; }
+ div#cgit table.list td.commitgraph .column2 { color: #5f5; }
+ div#cgit table.list td.commitgraph .column3 { color: #ff5; }
+ div#cgit table.list td.commitgraph .column4 { color: #55f; }
+ div#cgit table.list td.commitgraph .column5 { color: #f5f; }
+ div#cgit table.list td.commitgraph .column6 { color: #5ff; }
+ div#cgit table.list td a { color: #eee; }
+ div#cgit table.list td a.ls-dir { color: #28d; }
+ div#cgit table.list td a:hover { color: #3af; }
+ div#cgit table#downloads { border-color: #888; }
+ div#cgit table#downloads th { background-color: #333; }
+ div#cgit div#blob { border-color: #eee; }
+ div#cgit table.blob { border-top-color: #eee; }
+ div#cgit table.blob td.hashes,
+ div#cgit table.blob td.lines { color: #eee; }
+ div#cgit table.blob td.linenumbers { border-right-color: gray; }
+ div#cgit table.blob td.linenumbers a,
+ div#cgit table.ssdiff td.lineno a { color: gray; }
+ div#cgit table.blob td.linenumbers a:hover,
+ div#cgit table.ssdiff td.lineno a:hover { color: #eee; }
+ div#cgit table.blame div.alt:nth-child(even) { background: #171717; }
+ div#cgit table.blame div.alt:nth-child(odd) { background: #1f1f1f; }
+ div#cgit table.bin-blob { border-color: #eee; }
+ div#cgit table.bin-blob th { border-color: #888; }
+ div#cgit table.bin-blob td { border-left-color: #888; }
+ div#cgit div.cgit-panel table { border-color: #555; background-color: #282828; }
+ div#cgit div.notes { border-color: #661; background-color: #220; }
+ div#cgit table.diffstat { border-color: #555; background-color: #282828; }
+ div#cgit table.diffstat td span.modechange { color: #c66; }
+ div#cgit table.diffstat td.add a { color: #6c6; }
+ div#cgit table.diffstat td.del a { color: #c66; }
+ div#cgit table.diffstat td.upd a { color: #3af; }
+ div#cgit table.diffstat td.graph td.add { background-color: #3a3; }
+ div#cgit table.diffstat td.graph td.rem { background-color: #a33; }
+ div#cgit div.diffstat-summary { color: #777; }
+ div#cgit table.diff td div.head { color: #eee; }
+ div#cgit table.diff td div.hunk { color: #28d; }
+ div#cgit table.diff td div.add { color: #6c6; }
+ div#cgit table.diff td div.del { color: #c66; }
+ div#cgit table.list td.reposection { color: #777; }
+ div#cgit ul.pager a { color: #888; }
+ div#cgit span.age-mins { color: #7f7; }
+ div#cgit span.age-hours { color: #7f7; }
+ div#cgit span.age-days { color: #9d9; }
+ div#cgit span.age-weeks { color: #bbb; }
+ div#cgit span.age-months { color: #888; }
+ div#cgit span.age-years { color: #666; }
+ div#cgit span.insertions { color: #7f7; }
+ div#cgit span.deletions { color: #e33; }
+ div#cgit div.footer { color: #555; }
+ div#cgit div.footer a { color: #555; }
+ div#cgit a.branch-deco { color: #fff; background-color: #361; border-color: #3b2; }
+ div#cgit a.tag-deco { color: #fff; background-color: #650; border-color: #ba3; }
+ div#cgit a.tag-annotated-deco { color: #fff; background-color: #840; border-color: #b96; }
+ div#cgit a.remote-deco { color: #fff; background-color: #348; border-color: #67c; }
+ div#cgit a.deco { color: #fff; background-color: #922; border-color: #d55; }
+ div#cgit a.branch-deco:hover, div#cgit table.list td a.branch-deco:hover,
+ div#cgit a.tag-deco:hover, div#cgit table.list td a.tag-deco:hover,
+ div#cgit a.tag-annotated-deco:hover, div#cgit table.list td a.tag-annotated-deco:hover,
+ div#cgit a.remote-deco:hover, div#cgit table.list td a.remote-deco:hover,
+ div#cgit a.deco:hover, div#cgit table.list td a.deco:hover { color: #fff; }
+ div#cgit table.stats { border-color: #555; }
+ div#cgit table.stats th { background-color: #333; border-color: #555; }
+ div#cgit table.stats td { border-color: #555; }
+ div#cgit table.stats td.sum { color: #5C7E9B; }
+ div#cgit table.vgraph { border-color: #eee; }
+ div#cgit table.vgraph th { background-color: #1f1f1f; border-color: black; }
+ div#cgit table.vgraph div.bar { background-color: #1f1f1f; }
+ div#cgit table.hgraph { border-color: #eee; }
+ div#cgit table.hgraph th { background-color: #1f1f1f; border-color: #eee; }
+ div#cgit table.hgraph div.bar { background-color: #1f1f1f; }
+ div#cgit table.ssdiff td { border-left-color: #555; border-right-color: #555; }
+ div#cgit table.ssdiff td.add { color: #eee; background: #353; }
+ div#cgit table.ssdiff td.add_dark { color: #eee; background: #030; }
+ div#cgit table.ssdiff span.add { background: #030; }
+ div#cgit table.ssdiff td.del { color: #eee; background: #533; }
+ div#cgit table.ssdiff td.del_dark { color: #eee; background: #411; }
+ div#cgit table.ssdiff span.del { background: #300; }
+ div#cgit table.ssdiff td.changed { color: #eee; background: #553; }
+ div#cgit table.ssdiff td.changed_dark { color: #eee; background: #330; }
+ div#cgit table.ssdiff td.lineno { color: #eee; background: #1f1f1f; }
+ div#cgit table.ssdiff td.hunk { color: #eee; background: #0D3D64; border-top-color: #555; border-bottom-color: #555; }
+ div#cgit table.ssdiff td.head { border-top-color: #555; border-bottom-color: #555; }
+ div#cgit table.ssdiff td.head div.head { color: #eee; }
+ div#cgit table.ssdiff td.foot { border-top-color: #555; }
+}
diff --git a/filter.c b/filter.c
index c778d05..781f8e3 100644
--- a/filter.c
+++ b/filter.c
@@ -48,6 +48,7 @@ static int open_exec_filter(struct cgit_filter *base, va_list ap)
for (i = 0; i < filter->base.argument_count; i++)
filter->argv[i + 1] = va_arg(ap, char *);
+ chk_zero(fflush(stdout), "unable to flush STDOUT");
filter->old_stdout = chk_positive(dup(STDOUT_FILENO),
"Unable to duplicate STDOUT");
chk_zero(pipe(pipe_fh), "Unable to create pipe to subprocess");
@@ -71,6 +72,7 @@ static int close_exec_filter(struct cgit_filter *base)
struct cgit_exec_filter *filter = (struct cgit_exec_filter *)base;
int i, exit_status = 0;
+ chk_zero(fflush(stdout), "unable to flush STDOUT");
chk_non_negative(dup2(filter->old_stdout, STDOUT_FILENO),
"Unable to restore STDOUT");
close(filter->old_stdout);
@@ -143,17 +145,32 @@ void cgit_init_filters(void)
#endif
#ifndef NO_LUA
-static ssize_t (*libc_write)(int fd, const void *buf, size_t count);
+static size_t (*libc_fwrite)(const void *buf, size_t size, size_t n, FILE *);
+static ssize_t (*libc_write)(int fd, const void *buf, size_t size);
static ssize_t (*filter_write)(struct cgit_filter *base, const void *buf, size_t count) = NULL;
static struct cgit_filter *current_write_filter = NULL;
void cgit_init_filters(void)
{
+ /*
+ * we need to wrap both functions since the Lua filter may
+ * have code which calls write(2) directly, bypassing fwrite(3)
+ */
+ libc_fwrite = dlsym(RTLD_NEXT, "fwrite");
+ if (!libc_fwrite)
+ die("Could not locate libc's write function");
libc_write = dlsym(RTLD_NEXT, "write");
if (!libc_write)
die("Could not locate libc's write function");
}
+size_t fwrite(const void *buf, size_t size, size_t n, FILE *f)
+{
+ if (f != stdout || !filter_write)
+ return libc_fwrite(buf, size, n, f);
+ return filter_write(current_write_filter, buf, size * n);
+}
+
ssize_t write(int fd, const void *buf, size_t count)
{
if (fd != STDOUT_FILENO || !filter_write)
@@ -305,6 +322,9 @@ static int open_lua_filter(struct cgit_filter *base, va_list ap)
struct lua_filter *filter = (struct lua_filter *)base;
int i;
+ if (fflush(stdout))
+ return 1;
+
if (init_lua_filter(filter))
return 1;
diff --git a/filters/html-converters/md2html b/filters/html-converters/md2html
index 59f43a8..627808a 100755
--- a/filters/html-converters/md2html
+++ b/filters/html-converters/md2html
@@ -4,6 +4,11 @@ import sys
import io
from pygments.formatters import HtmlFormatter
from markdown.extensions.toc import TocExtension
+
+# The dark style is automatically selected if the browser is in dark mode
+light_style='pastie'
+dark_style='monokai'
+
sys.stdin = io.TextIOWrapper(sys.stdin.buffer, encoding='utf-8')
sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding='utf-8')
sys.stdout.write('''
@@ -283,10 +288,31 @@ div#cgit .markdown-body h1 a.toclink, div#cgit .markdown-body h2 a.toclink, div#
background-color: transparent;
border: none;
}
+@media only all and (prefers-color-scheme: dark) {
+.markdown-body a.absent { color: #f33; }
+.markdown-body h1 .mini-icon-link, .markdown-body h2 .mini-icon-link, .markdown-body h3 .mini-icon-link, .markdown-body h4 .mini-icon-link, .markdown-body h5 .mini-icon-link, .markdown-body h6 .mini-icon-link { color: #eee; }
+div#cgit .markdown-body h1 a.toclink, div#cgit .markdown-body h2 a.toclink, div#cgit .markdown-body h3 a.toclink, div#cgit .markdown-body h4 a.toclink, div#cgit .markdown-body h5 a.toclink, div#cgit .markdown-body h6 a.toclink { color: #eee; }
+.markdown-body h1 { color: #eee; }
+.markdown-body h2 { border-bottom-color: #333; color: #eee; }
+.markdown-body h6 { color: #888; }
+.markdown-body hr { border-color: #333; }
+.markdown-body blockquote { border-left-color: #222; color: #888; }
+.markdown-body table th, .markdown-body table td { border-color: #333; }
+.markdown-body table tr { border-top-color: #333; background-color: #111; }
+.markdown-body table tr:nth-child(2n) { background-color: #070707; }
+.markdown-body span.frame span span { color: #ccc; }
+.markdown-body code, .markdown-body tt { border-color: #151515; background-color: #070707; }
+.markdown-body .highlight pre, .markdown-body pre { background-color: #070707; border-color: #333; }
''')
-sys.stdout.write(HtmlFormatter(style='pastie').get_style_defs('.highlight'))
+sys.stdout.write(HtmlFormatter(style=dark_style).get_style_defs('.highlight'))
sys.stdout.write('''
-</style>
+}
+@media (prefers-color-scheme: light) {
+''')
+sys.stdout.write(HtmlFormatter(style=light_style).get_style_defs('.highlight'))
+sys.stdout.write('''
+}
+</style>
''')
sys.stdout.write("<div class='markdown-body'>")
sys.stdout.flush()
diff --git a/filters/syntax-highlighting.py b/filters/syntax-highlighting.py
index e912594..f2c0fe1 100755
--- a/filters/syntax-highlighting.py
+++ b/filters/syntax-highlighting.py
@@ -29,12 +29,16 @@ from pygments.lexers import guess_lexer
from pygments.lexers import guess_lexer_for_filename
from pygments.formatters import HtmlFormatter
+# The dark style is automatically selected if the browser is in dark mode
+light_style='pastie'
+dark_style='monokai'
sys.stdin = io.TextIOWrapper(sys.stdin.buffer, encoding='utf-8', errors='replace')
sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding='utf-8', errors='replace')
data = sys.stdin.read()
filename = sys.argv[1]
-formatter = HtmlFormatter(style='pastie', nobackground=True)
+light_formatter = HtmlFormatter(style=light_style, nobackground=True)
+dark_formatter = HtmlFormatter(style=dark_style, nobackground=True)
try:
lexer = guess_lexer_for_filename(filename, data)
@@ -50,6 +54,10 @@ except TypeError:
# highlight! :-)
# printout pygments' css definitions as well
sys.stdout.write('<style>')
-sys.stdout.write(formatter.get_style_defs('.highlight'))
+sys.stdout.write('\n@media only all and (prefers-color-scheme: dark) {\n')
+sys.stdout.write(dark_formatter.get_style_defs('.highlight'))
+sys.stdout.write('\n}\n@media (prefers-color-scheme: light) {\n')
+sys.stdout.write(light_formatter.get_style_defs('.highlight'))
+sys.stdout.write('\n}\n')
sys.stdout.write('</style>')
-sys.stdout.write(highlight(data, lexer, formatter, outfile=None))
+sys.stdout.write(highlight(data, lexer, light_formatter, outfile=None))
diff --git a/filters/syntax-highlighting.sh b/filters/syntax-highlighting.sh
index 840bc34..0429b0f 100755
--- a/filters/syntax-highlighting.sh
+++ b/filters/syntax-highlighting.sh
@@ -25,6 +25,20 @@
# table.blob .kwb { color:#830000; }
# table.blob .kwc { color:#000000; font-weight:bold; }
# table.blob .kwd { color:#010181; }
+# @media only all and (prefers-color-scheme: dark) { /* cgit addition for dark mode */
+# table.blob .num { color:#ff814f; }
+# table.blob .esc { color:#f60; }
+# table.blob .str { color:#cc0; }
+# table.blob .dstr { color:#ffff7e; }
+# table.blob .slc { color:#7f7c7f; }
+# table.blob .com { color:#7e7c7e; }
+# table.blob .dir { color:#7dff7d; }
+# table.blob .sym { color:#eeeeee; }
+# table.blob .kwa { color:#bb0; }
+# table.blob .kwb { color:#0a0; }
+# table.blob .kwc { color:#eeeeee; }
+# table.blob .kwd { color:#7e7efe; }
+# }
#
#
# Style definition file generated by highlight 2.6.14, http://www.andre-simon.de/
@@ -45,45 +59,57 @@
# .hl.kwb { color:#830000; }
# .hl.kwc { color:#000000; font-weight:bold; }
# .hl.kwd { color:#010181; }
-#
-#
-# Style definition file generated by highlight 3.8, http://www.andre-simon.de/
-#
-# body.hl { background-color:#e0eaee; }
-# pre.hl { color:#000000; background-color:#e0eaee; font-size:10pt; font-family:'Courier New';}
-# .hl.num { color:#b07e00; }
-# .hl.esc { color:#ff00ff; }
-# .hl.str { color:#bf0303; }
-# .hl.pps { color:#818100; }
-# .hl.slc { color:#838183; font-style:italic; }
-# .hl.com { color:#838183; font-style:italic; }
-# .hl.ppc { color:#008200; }
-# .hl.opt { color:#000000; }
-# .hl.lin { color:#555555; }
-# .hl.kwa { color:#000000; font-weight:bold; }
-# .hl.kwb { color:#0057ae; }
-# .hl.kwc { color:#000000; font-weight:bold; }
-# .hl.kwd { color:#010181; }
-#
-#
-# Style definition file generated by highlight 3.13, http://www.andre-simon.de/
-#
-# body.hl { background-color:#e0eaee; }
-# pre.hl { color:#000000; background-color:#e0eaee; font-size:10pt; font-family:'Courier New',monospace;}
-# .hl.num { color:#b07e00; }
-# .hl.esc { color:#ff00ff; }
-# .hl.str { color:#bf0303; }
-# .hl.pps { color:#818100; }
-# .hl.slc { color:#838183; font-style:italic; }
-# .hl.com { color:#838183; font-style:italic; }
-# .hl.ppc { color:#008200; }
-# .hl.opt { color:#000000; }
-# .hl.ipl { color:#0057ae; }
-# .hl.lin { color:#555555; }
-# .hl.kwa { color:#000000; font-weight:bold; }
-# .hl.kwb { color:#0057ae; }
-# .hl.kwc { color:#000000; font-weight:bold; }
-# .hl.kwd { color:#010181; }
+# @media only all and (prefers-color-scheme: dark) { /* cgit addition for dark mode */
+# pre.hl { color:#eeeeee; background-color:#111; }
+# .hl.num { color:#ff814f; }
+# .hl.esc { color:#f60; }
+# .hl.str { color:#cc0; }
+# .hl.dstr { color:#ffff7e; }
+# .hl.slc { color:#7f7c7f; }
+# .hl.com { color:#7e7c7e; }
+# .hl.dir { color:#7dff7d; }
+# .hl.sym { color:#eeeeee; }
+# .hl.line { color:#aaaaaa; }
+# .hl.mark { background-color:#444400; }
+# .hl.kwa { color:#bb0; }
+# .hl.kwb { color:#a0a; }
+# .hl.kwc { color:#eeeeee; }
+# .hl.kwd { color:#7e7efe; }
+# }
+#
+#
+# Style definition file generated by highlight 3.8 / 3.13 / 3.41, http://www.andre-simon.de/
+#
+# table.blob .num { color:#b07e00; }
+# table.blob .esc { color:#ff00ff; }
+# table.blob .str { color:#bf0303; }
+# table.blob .pps { color:#818100; }
+# table.blob .slc { color:#838183; font-style:italic; }
+# table.blob .com { color:#838183; font-style:italic; }
+# table.blob .ppc { color:#008200; }
+# table.blob .opt { color:#000000; }
+# table.blob .ipl { color:#0057ae; }
+# table.blob .lin { color:#555555; }
+# table.blob .kwa { color:#000000; font-weight:bold; }
+# table.blob .kwb { color:#0057ae; }
+# table.blob .kwc { color:#000000; font-weight:bold; }
+# table.blob .kwd { color:#010181; }
+# @media only all and (prefers-color-scheme: dark) { /* cgit addition for dark mode */
+# table.blob .num { color:#ff814f; }
+# table.blob .esc { color:#f60; }
+# table.blob .str { color:#cc0; }
+# table.blob .pps { color:#ffff7f; }
+# table.blob .slc { color:#7f7c7f; }
+# table.blob .com { color:#7e7c7e; }
+# table.blob .ppc { color:#8dd; }
+# table.blob .opt { color:#eeeeee; }
+# table.blob .ipl { color:#51a8ff; }
+# table.blob .lin { color:#aaaaaa; }
+# table.blob .kwa { color:#bb0; }
+# table.blob .kwb { color:#0a0; }
+# table.blob .kwc { color:#eeeeee; }
+# table.blob .kwd { color:#7e7efe; }
+# }
#
#
# The following environment variables can be used to retrieve the configuration
diff --git a/git b/git
-Subproject e9019fcafe0040228b8631c30f97ae1adb61bcd
+Subproject a018953688f1b10bddf91bff8747068f5f4746a
diff --git a/html.c b/html.c
index 0bac34b..ced781a 100644
--- a/html.c
+++ b/html.c
@@ -80,7 +80,7 @@ char *fmtalloc(const char *format, ...)
void html_raw(const char *data, size_t size)
{
- if (write(STDOUT_FILENO, data, size) != size)
+ if (fwrite(data, 1, size, stdout) != size)
die_errno("write error on html output");
}
diff --git a/tests/t0022-error-page-headers.sh b/tests/t0022-error-page-headers.sh
new file mode 100755
index 0000000..51fbad8
--- /dev/null
+++ b/tests/t0022-error-page-headers.sh
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+test_description='Check the Expires header on error pages'
+. ./setup.sh
+
+# cgit_vprint_error_page() derives page.expires from cache-dynamic-ttl, which
+# is a count of minutes, while page.expires is an absolute time. Checking the
+# result needs no date arithmetic: a zero TTL has to reproduce Last-Modified
+# exactly, and a non-zero one has to land somewhere else without falling back
+# to the epoch.
+
+header_value() {
+ sed -n "s/^$1: //p" "$2" | tr -d '\r'
+}
+
+test_expect_success 'a non-zero dynamic TTL expires the error page later' '
+ cgit_url "bar/commit/&id=deadbeefdeadbeefdeadbeefdeadbeefdeadbeef" >output &&
+ grep -q "Status: 404 Not found" output &&
+ modified=$(header_value Last-Modified output) &&
+ expires=$(header_value Expires output) &&
+ test -n "$modified" &&
+ test -n "$expires" &&
+ test "$modified" != "$expires" &&
+ case "$expires" in *1970*) return 1 ;; esac
+'
+
+test_expect_success 'a zero dynamic TTL expires the error page immediately' '
+ rm -rf cache && mkdir -p cache &&
+ printf "cache-dynamic-ttl=0\n" >>cgitrc &&
+ cgit_url "bar/commit/&id=deadbeefdeadbeefdeadbeefdeadbeefdeadbeef" >output &&
+ modified=$(header_value Last-Modified output) &&
+ expires=$(header_value Expires output) &&
+ test -n "$modified" &&
+ test "$modified" = "$expires"
+'
+
+test_done
diff --git a/ui-blob.c b/ui-blob.c
index bc91656..7879127 100644
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -40,7 +40,7 @@ int cgit_ref_path_exists(const char *path, const char *ref, int file_only)
struct object_id oid;
unsigned long size;
struct pathspec_item path_items = {
- .match = xstrdup(path),
+ .match = path,
.len = strlen(path)
};
struct pathspec paths = {
@@ -63,7 +63,6 @@ int cgit_ref_path_exists(const char *path, const char *ref, int file_only)
&paths, walk_tree, &walk_tree_ctx);
done:
- free(path_items.match);
return walk_tree_ctx.found_path;
}
diff --git a/ui-shared.c b/ui-shared.c
index df52a9b..44794d8 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -896,7 +896,7 @@ void cgit_print_error_page(int code, const char *msg, const char *fmt, ...)
void cgit_vprint_error_page(int code, const char *msg, const char *fmt, va_list ap)
{
- ctx.page.expires = ctx.cfg.cache_dynamic_ttl;
+ ctx.page.expires = ctx.page.modified + ctx.cfg.cache_dynamic_ttl * 60;
ctx.page.status = code;
ctx.page.statusmsg = msg;
cgit_print_layout_start();
diff --git a/ui-snapshot.c b/ui-snapshot.c
index d157222..b3039d9 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -39,6 +39,9 @@ static int write_archive_type(const char *format, const char *hex, const char *p
/* strvec guarantees a trailing NULL entry. */
memcpy(nargv, argv.v, sizeof(char *) * (argv.nr + 1));
+ if (fflush(stdout))
+ return errno;
+
result = write_archive(argv.nr, nargv, NULL, the_repository, NULL, 0);
strvec_clear(&argv);
free(nargv);
generated by cgit v1.2.3 (git 2.25.1) at 2026-11-06 15:30:29 +0000