summaryrefslogtreecommitdiffabout
path: root/cgit.c
Unidiff
Diffstat (limited to 'cgit.c') (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c45
1 files changed, 25 insertions, 20 deletions
diff --git a/cgit.c b/cgit.c
index 6e5215e..f35f605 100644
--- a/cgit.c
+++ b/cgit.c
@@ -145,24 +145,28 @@ static void querystring_cb(const char *name, const char *value)
145 ctx.qry.has_sha1 = 1; 145 ctx.qry.has_sha1 = 1;
146 } else if (!strcmp(name, "id2")) { 146 } else if (!strcmp(name, "id2")) {
147 ctx.qry.sha2 = xstrdup(value); 147 ctx.qry.sha2 = xstrdup(value);
148 ctx.qry.has_sha1 = 1; 148 ctx.qry.has_sha1 = 1;
149 } else if (!strcmp(name, "ofs")) { 149 } else if (!strcmp(name, "ofs")) {
150 ctx.qry.ofs = atoi(value); 150 ctx.qry.ofs = atoi(value);
151 } else if (!strcmp(name, "path")) { 151 } else if (!strcmp(name, "path")) {
152 ctx.qry.path = trim_end(value, '/'); 152 ctx.qry.path = trim_end(value, '/');
153 } else if (!strcmp(name, "name")) { 153 } else if (!strcmp(name, "name")) {
154 ctx.qry.name = xstrdup(value); 154 ctx.qry.name = xstrdup(value);
155 } else if (!strcmp(name, "mimetype")) { 155 } else if (!strcmp(name, "mimetype")) {
156 ctx.qry.mimetype = xstrdup(value); 156 ctx.qry.mimetype = xstrdup(value);
157 } else if (!strcmp(name, "s")){
158 ctx.qry.sort = xstrdup(value);
159 } else if (!strcmp(name, "showmsg")) {
160 ctx.qry.showmsg = atoi(value);
157 } 161 }
158} 162}
159 163
160static void prepare_context(struct cgit_context *ctx) 164static void prepare_context(struct cgit_context *ctx)
161{ 165{
162 memset(ctx, 0, sizeof(ctx)); 166 memset(ctx, 0, sizeof(ctx));
163 ctx->cfg.agefile = "info/web/last-modified"; 167 ctx->cfg.agefile = "info/web/last-modified";
164 ctx->cfg.nocache = 0; 168 ctx->cfg.nocache = 0;
165 ctx->cfg.cache_size = 0; 169 ctx->cfg.cache_size = 0;
166 ctx->cfg.cache_dynamic_ttl = 5; 170 ctx->cfg.cache_dynamic_ttl = 5;
167 ctx->cfg.cache_max_create_time = 5; 171 ctx->cfg.cache_max_create_time = 5;
168 ctx->cfg.cache_repo_ttl = 5; 172 ctx->cfg.cache_repo_ttl = 5;
@@ -425,46 +429,47 @@ int main(int argc, const char **argv)
425 cgit_repolist.repos = NULL; 429 cgit_repolist.repos = NULL;
426 430
427 if (getenv("SCRIPT_NAME")) 431 if (getenv("SCRIPT_NAME"))
428 ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME")); 432 ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME"));
429 if (getenv("QUERY_STRING")) 433 if (getenv("QUERY_STRING"))
430 ctx.qry.raw = xstrdup(getenv("QUERY_STRING")); 434 ctx.qry.raw = xstrdup(getenv("QUERY_STRING"));
431 cgit_parse_args(argc, argv); 435 cgit_parse_args(argc, argv);
432 parse_configfile(cgit_config_env ? cgit_config_env : CGIT_CONFIG, 436 parse_configfile(cgit_config_env ? cgit_config_env : CGIT_CONFIG,
433 config_cb); 437 config_cb);
434 ctx.repo = NULL; 438 ctx.repo = NULL;
435 http_parse_querystring(ctx.qry.raw, querystring_cb); 439 http_parse_querystring(ctx.qry.raw, querystring_cb);
436 440
437 /* If virtual-root isn't specified in cgitrc and no url 441 /* If virtual-root isn't specified in cgitrc, lets pretend
438 * parameter is specified on the querystring, lets pretend 442 * that virtual-root equals SCRIPT_NAME.
439 * that virtualroot equals SCRIPT_NAME and use PATH_INFO as
440 * url. This allows cgit to work with virtual urls without
441 * the need for rewriterules in the webserver (as long as
442 * PATH_INFO is included in the cache lookup key).
443 */ 443 */
444 if (!ctx.cfg.virtual_root && !ctx.qry.url) { 444 if (!ctx.cfg.virtual_root)
445 ctx.cfg.virtual_root = ctx.cfg.script_name; 445 ctx.cfg.virtual_root = ctx.cfg.script_name;
446 path = getenv("PATH_INFO"); 446
447 if (path) { 447 /* If no url parameter is specified on the querystring, lets
448 if (path[0] == '/') 448 * use PATH_INFO as url. This allows cgit to work with virtual
449 path++; 449 * urls without the need for rewriterules in the webserver (as
450 ctx.qry.url = xstrdup(path); 450 * long as PATH_INFO is included in the cache lookup key).
451 if (ctx.qry.raw) { 451 */
452 qry = ctx.qry.raw; 452 path = getenv("PATH_INFO");
453 ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry)); 453 if (!ctx.qry.url && path) {
454 free(qry); 454 if (path[0] == '/')
455 } else 455 path++;
456 ctx.qry.raw = ctx.qry.url; 456 ctx.qry.url = xstrdup(path);
457 cgit_parse_url(ctx.qry.url); 457 if (ctx.qry.raw) {
458 } 458 qry = ctx.qry.raw;
459 ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry));
460 free(qry);
461 } else
462 ctx.qry.raw = ctx.qry.url;
463 cgit_parse_url(ctx.qry.url);
459 } 464 }
460 465
461 ttl = calc_ttl(); 466 ttl = calc_ttl();
462 ctx.page.expires += ttl*60; 467 ctx.page.expires += ttl*60;
463 if (ctx.cfg.nocache) 468 if (ctx.cfg.nocache)
464 ctx.cfg.cache_size = 0; 469 ctx.cfg.cache_size = 0;
465 err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root, 470 err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root,
466 ctx.qry.raw, ttl, process_request, &ctx); 471 ctx.qry.raw, ttl, process_request, &ctx);
467 if (err) 472 if (err)
468 cgit_print_error(fmt("Error processing page: %s (%d)", 473 cgit_print_error(fmt("Error processing page: %s (%d)",
469 strerror(err), err)); 474 strerror(err), err));
470 return err; 475 return err;