about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorLars Hjemli2007-06-18 21:17:24 +0200
committerLars Hjemli2007-06-18 21:17:24 +0200
commit7d6ee4ee8a2c79802a78bc09c0e1e96a7a82de78 (patch)
tree0e337b6c314454614a54234b1ef3b0595ec05471
parentAdd more menuitems on repo pages (diff)
downloadcgit-7d6ee4ee8a2c79802a78bc09c0e1e96a7a82de78.tar.gz
cgit-7d6ee4ee8a2c79802a78bc09c0e1e96a7a82de78.zip
Include querystring as part of cached filename for repo summary page
When adding support for the h parameter to the summary page (passing current
branch between pages), the builtin cache returned basically random results
for summary page since the cached filename didn't honour the querystring.

This fixes the issue for now, but someday it might be worthwhile to generate
'canonical' filenames in the cache for all pages, i.e. something a bit more
clever than just including the querystring.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r--cgit.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/cgit.c b/cgit.c index 3fc90bf..b943fe5 100644 --- a/cgit.c +++ b/cgit.c
@@ -29,13 +29,15 @@ static int cgit_prepare_cache(struct cacheitem *item)
29 } 29 }
30 30
31 if (!cgit_cmd) { 31 if (!cgit_cmd) {
32 item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root, 32 item->name = xstrdup(fmt("%s/%s/index.%s.html", cgit_cache_root,
33 cache_safe_filename(cgit_repo->url))); 33 cache_safe_filename(cgit_repo->url),
34 cache_safe_filename(cgit_querystring)));
34 item->ttl = cgit_cache_repo_ttl; 35 item->ttl = cgit_cache_repo_ttl;
35 } else { 36 } else {
36 item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, 37 item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root,
37 cache_safe_filename(cgit_repo->url), cgit_query_page, 38 cache_safe_filename(cgit_repo->url),
38 cache_safe_filename(cgit_querystring))); 39 cgit_query_page,
40 cache_safe_filename(cgit_querystring)));
39 if (cgit_query_has_symref) 41 if (cgit_query_has_symref)
40 item->ttl = cgit_cache_dynamic_ttl; 42 item->ttl = cgit_cache_dynamic_ttl;
41 else if (cgit_query_has_sha1) 43 else if (cgit_query_has_sha1)