summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2013-05-28 14:43:02 +0000
committerJason A. Donenfeld <Jason@zx2c4.com>2013-08-12 19:14:10 +0000
commit00e3a3ecda77bf5ab149db0940c549f1bb618de4 (patch)
tree887b4fec5fa60945dc4d0c6919efbbbe4ef7216c
parent61ff10065b579fa38182fcf10cc7e63839acd53c (diff)
downloadcgit-00e3a3ecda77bf5ab149db0940c549f1bb618de4.tar
cgit-00e3a3ecda77bf5ab149db0940c549f1bb618de4.tar.gz
cgit-00e3a3ecda77bf5ab149db0940c549f1bb618de4.zip
cache: id means static, even if head is specified too
Pages like /commit?h=wip&id=8a335ce618ba77fbf05148d6f8be17bd48ba4340 were being marked as dynamic, because of h=wip, when it should be static, because of id=. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
-rw-r--r--cgit.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/cgit.c b/cgit.c
index a45ce1f..861352a 100644
--- a/cgit.c
+++ b/cgit.c
@@ -928,12 +928,12 @@ static int calc_ttl()
if (!strcmp(ctx.qry.page, "about"))
return ctx.cfg.cache_about_ttl;
- if (ctx.qry.has_symref)
- return ctx.cfg.cache_dynamic_ttl;
-
if (ctx.qry.has_sha1)
return ctx.cfg.cache_static_ttl;
+ if (ctx.qry.has_symref)
+ return ctx.cfg.cache_dynamic_ttl;
+
return ctx.cfg.cache_repo_ttl;
}