summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2008-04-14 21:07:52 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-04-14 21:07:52 (UTC)
commit78031f92b0ff064efa82065a3cf6020c1256a5fd (patch) (unidiff)
tree44c8d9925dc57149f22f15f1ec06ffd4c5c0a24e
parente9a7042b5b44c6af2c7dc91eabed732d92278218 (diff)
downloadcgit-78031f92b0ff064efa82065a3cf6020c1256a5fd.zip
cgit-78031f92b0ff064efa82065a3cf6020c1256a5fd.tar.gz
cgit-78031f92b0ff064efa82065a3cf6020c1256a5fd.tar.bz2
Fix search in repo index even if caching is enabled
The repository index page needed to include the querystring in the cache filename. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/cgit.c b/cgit.c
index 6ec763f..38b0ba5 100644
--- a/cgit.c
+++ b/cgit.c
@@ -170,25 +170,27 @@ static int cgit_prepare_cache(struct cacheitem *item)
170 if (!ctx.repo && ctx.qry.repo) { 170 if (!ctx.repo && ctx.qry.repo) {
171 ctx.page.title = fmt("%s - %s", ctx.cfg.root_title, 171 ctx.page.title = fmt("%s - %s", ctx.cfg.root_title,
172 "Bad request"); 172 "Bad request");
173 cgit_print_http_headers(&ctx); 173 cgit_print_http_headers(&ctx);
174 cgit_print_docstart(&ctx); 174 cgit_print_docstart(&ctx);
175 cgit_print_pageheader(&ctx); 175 cgit_print_pageheader(&ctx);
176 cgit_print_error(fmt("Unknown repo: %s", ctx.qry.repo)); 176 cgit_print_error(fmt("Unknown repo: %s", ctx.qry.repo));
177 cgit_print_docend(); 177 cgit_print_docend();
178 return 0; 178 return 0;
179 } 179 }
180 180
181 if (!ctx.repo) { 181 if (!ctx.repo) {
182 item->name = xstrdup(fmt("%s/index.html", ctx.cfg.cache_root)); 182 item->name = xstrdup(fmt("%s/index.%s.html",
183 ctx.cfg.cache_root,
184 cache_safe_filename(ctx.qry.raw)));
183 item->ttl = ctx.cfg.cache_root_ttl; 185 item->ttl = ctx.cfg.cache_root_ttl;
184 return 1; 186 return 1;
185 } 187 }
186 188
187 if (!ctx.qry.page) { 189 if (!ctx.qry.page) {
188 item->name = xstrdup(fmt("%s/%s/index.%s.html", ctx.cfg.cache_root, 190 item->name = xstrdup(fmt("%s/%s/index.%s.html", ctx.cfg.cache_root,
189 cache_safe_filename(ctx.repo->url), 191 cache_safe_filename(ctx.repo->url),
190 cache_safe_filename(ctx.qry.raw))); 192 cache_safe_filename(ctx.qry.raw)));
191 item->ttl = ctx.cfg.cache_repo_ttl; 193 item->ttl = ctx.cfg.cache_repo_ttl;
192 } else { 194 } else {
193 item->name = xstrdup(fmt("%s/%s/%s/%s.html", ctx.cfg.cache_root, 195 item->name = xstrdup(fmt("%s/%s/%s/%s.html", ctx.cfg.cache_root,
194 cache_safe_filename(ctx.repo->url), 196 cache_safe_filename(ctx.repo->url),