summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c41
1 files changed, 21 insertions, 20 deletions
diff --git a/cgit.c b/cgit.c
index 166fbc6..d1cee58 100644
--- a/cgit.c
+++ b/cgit.c
@@ -430,46 +430,47 @@ int main(int argc, const char **argv)
430 cgit_repolist.repos = NULL; 430 cgit_repolist.repos = NULL;
431 431
432 if (getenv("SCRIPT_NAME")) 432 if (getenv("SCRIPT_NAME"))
433 ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME")); 433 ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME"));
434 if (getenv("QUERY_STRING")) 434 if (getenv("QUERY_STRING"))
435 ctx.qry.raw = xstrdup(getenv("QUERY_STRING")); 435 ctx.qry.raw = xstrdup(getenv("QUERY_STRING"));
436 cgit_parse_args(argc, argv); 436 cgit_parse_args(argc, argv);
437 parse_configfile(cgit_config_env ? cgit_config_env : CGIT_CONFIG, 437 parse_configfile(cgit_config_env ? cgit_config_env : CGIT_CONFIG,
438 config_cb); 438 config_cb);
439 ctx.repo = NULL; 439 ctx.repo = NULL;
440 http_parse_querystring(ctx.qry.raw, querystring_cb); 440 http_parse_querystring(ctx.qry.raw, querystring_cb);
441 441
442 /* If virtual-root isn't specified in cgitrc and no url 442 /* If virtual-root isn't specified in cgitrc, lets pretend
443 * parameter is specified on the querystring, lets pretend 443 * that virtual-root equals SCRIPT_NAME.
444 * that virtualroot equals SCRIPT_NAME and use PATH_INFO as
445 * url. This allows cgit to work with virtual urls without
446 * the need for rewriterules in the webserver (as long as
447 * PATH_INFO is included in the cache lookup key).
448 */ 444 */
449 if (!ctx.cfg.virtual_root && !ctx.qry.url) { 445 if (!ctx.cfg.virtual_root)
450 ctx.cfg.virtual_root = ctx.cfg.script_name; 446 ctx.cfg.virtual_root = ctx.cfg.script_name;
451 path = getenv("PATH_INFO"); 447
452 if (path) { 448 /* If no url parameter is specified on the querystring, lets
453 if (path[0] == '/') 449 * use PATH_INFO as url. This allows cgit to work with virtual
454 path++; 450 * urls without the need for rewriterules in the webserver (as
455 ctx.qry.url = xstrdup(path); 451 * long as PATH_INFO is included in the cache lookup key).
456 if (ctx.qry.raw) { 452 */
457 qry = ctx.qry.raw; 453 path = getenv("PATH_INFO");
458 ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry)); 454 if (!ctx.qry.url && path) {
459 free(qry); 455 if (path[0] == '/')
460 } else 456 path++;
461 ctx.qry.raw = ctx.qry.url; 457 ctx.qry.url = xstrdup(path);
462 cgit_parse_url(ctx.qry.url); 458 if (ctx.qry.raw) {
463 } 459 qry = ctx.qry.raw;
460 ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry));
461 free(qry);
462 } else
463 ctx.qry.raw = ctx.qry.url;
464 cgit_parse_url(ctx.qry.url);
464 } 465 }
465 466
466 ttl = calc_ttl(); 467 ttl = calc_ttl();
467 ctx.page.expires += ttl*60; 468 ctx.page.expires += ttl*60;
468 if (ctx.cfg.nocache) 469 if (ctx.cfg.nocache)
469 ctx.cfg.cache_size = 0; 470 ctx.cfg.cache_size = 0;
470 err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root, 471 err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root,
471 ctx.qry.raw, ttl, process_request, &ctx); 472 ctx.qry.raw, ttl, process_request, &ctx);
472 if (err) 473 if (err)
473 cgit_print_error(fmt("Error processing page: %s (%d)", 474 cgit_print_error(fmt("Error processing page: %s (%d)",
474 strerror(err), err)); 475 strerror(err), err));
475 return err; 476 return err;