aboutsummaryrefslogtreecommitdiffstats
path: root/cgit.c
diff options
context:
space:
mode:
authorGravatar Lars Hjemli <hjemli@gmail.com>2008-08-10 04:11:41 (JST)
committerGravatar Lars Hjemli <hjemli@gmail.com>2008-09-16 06:00:30 (JST)
commite154edd8078020d6eba41b448afade0a68617f35 (patch)
tree9fdde0c3944e327ed2694464a4c6808373ee09b7 /cgit.c
parenta30453a5d3f6db4d6e055da2112343e054e7e7d5 (diff)
downloadcgit-e154edd8078020d6eba41b448afade0a68617f35.zip
cgit-e154edd8078020d6eba41b448afade0a68617f35.tar.gz
Teach cgit how to use PATH_INFO
This commit makes cgit use the cgi variables SCRIPT_NAME and PATH_INFO when virtual-root is unspecified in cgitrc and no url-parameter is specified on the querystring. This has two nice effects: * Virtual urls works out of the box, no more need for rewrite-rules in httpd. * Virtual urls with special querystring characters are handled correctly. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'cgit.c')
-rw-r--r--cgit.c27
1 files changed, 27 insertions, 0 deletions
diff --git a/cgit.c b/cgit.c
index 497337b..a47cad0 100644
--- a/cgit.c
+++ b/cgit.c
@@ -130,6 +130,7 @@ static void querystring_cb(const char *name, const char *value)
130 } else if (!strcmp(name, "p")) { 130 } else if (!strcmp(name, "p")) {
131 ctx.qry.page = xstrdup(value); 131 ctx.qry.page = xstrdup(value);
132 } else if (!strcmp(name, "url")) { 132 } else if (!strcmp(name, "url")) {
133 ctx.qry.url = xstrdup(value);
133 cgit_parse_url(value); 134 cgit_parse_url(value);
134 } else if (!strcmp(name, "qt")) { 135 } else if (!strcmp(name, "qt")) {
135 ctx.qry.grep = xstrdup(value); 136 ctx.qry.grep = xstrdup(value);
@@ -373,6 +374,8 @@ static int calc_ttl()
373int main(int argc, const char **argv) 374int main(int argc, const char **argv)
374{ 375{
375 const char *cgit_config_env = getenv("CGIT_CONFIG"); 376 const char *cgit_config_env = getenv("CGIT_CONFIG");
377 const char *path;
378 char *qry;
376 int err, ttl; 379 int err, ttl;
377 380
378 prepare_context(&ctx); 381 prepare_context(&ctx);
@@ -390,6 +393,30 @@ int main(int argc, const char **argv)
390 cgit_parse_args(argc, argv); 393 cgit_parse_args(argc, argv);
391 http_parse_querystring(ctx.qry.raw, querystring_cb); 394 http_parse_querystring(ctx.qry.raw, querystring_cb);
392 395
396 /* If virtual-root isn't specified in cgitrc and no url
397 * parameter is specified on the querystring, lets pretend
398 * that virtualroot equals SCRIPT_NAME and use PATH_INFO as
399 * url. This allows cgit to work with virtual urls without
400 * the need for rewriterules in the webserver (as long as
401 * PATH_INFO is included in the cache lookup key).
402 */
403 if (!ctx.cfg.virtual_root && !ctx.qry.url) {
404 ctx.cfg.virtual_root = ctx.cfg.script_name;
405 path = getenv("PATH_INFO");
406 if (path) {
407 if (path[0] == '/')
408 path++;
409 ctx.qry.url = xstrdup(path);
410 if (ctx.qry.raw) {
411 qry = ctx.qry.raw;
412 ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry));
413 free(qry);
414 } else
415 ctx.qry.raw = ctx.qry.url;
416 cgit_parse_url(ctx.qry.url);
417 }
418 }
419
393 ttl = calc_ttl(); 420 ttl = calc_ttl();
394 ctx.page.expires += ttl*60; 421 ctx.page.expires += ttl*60;
395 if (ctx.cfg.nocache) 422 if (ctx.cfg.nocache)