summaryrefslogtreecommitdiffabout
Unidiff
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
@@ -158,49 +158,51 @@ static void prepare_context(struct cgit_context *ctx)
158 ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; 158 ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s";
159 ctx->cfg.renamelimit = -1; 159 ctx->cfg.renamelimit = -1;
160 ctx->cfg.robots = "index, nofollow"; 160 ctx->cfg.robots = "index, nofollow";
161 ctx->cfg.root_title = "Git repository browser"; 161 ctx->cfg.root_title = "Git repository browser";
162 ctx->cfg.script_name = CGIT_SCRIPT_NAME; 162 ctx->cfg.script_name = CGIT_SCRIPT_NAME;
163 ctx->page.mimetype = "text/html"; 163 ctx->page.mimetype = "text/html";
164 ctx->page.charset = PAGE_ENCODING; 164 ctx->page.charset = PAGE_ENCODING;
165 ctx->page.filename = NULL; 165 ctx->page.filename = NULL;
166} 166}
167 167
168static int cgit_prepare_cache(struct cacheitem *item) 168static int cgit_prepare_cache(struct cacheitem *item)
169{ 169{
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),
195 ctx.qry.page, 197 ctx.qry.page,
196 cache_safe_filename(ctx.qry.raw))); 198 cache_safe_filename(ctx.qry.raw)));
197 if (ctx.qry.has_symref) 199 if (ctx.qry.has_symref)
198 item->ttl = ctx.cfg.cache_dynamic_ttl; 200 item->ttl = ctx.cfg.cache_dynamic_ttl;
199 else if (ctx.qry.has_sha1) 201 else if (ctx.qry.has_sha1)
200 item->ttl = ctx.cfg.cache_static_ttl; 202 item->ttl = ctx.cfg.cache_static_ttl;
201 else 203 else
202 item->ttl = ctx.cfg.cache_repo_ttl; 204 item->ttl = ctx.cfg.cache_repo_ttl;
203 } 205 }
204 return 1; 206 return 1;
205} 207}
206 208