Author: Lars Hjemli <hjemli@gmail.com>
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>
cgit.c | 27 +++++++++++++++++++++++++++ cgit.h | 1 +
diff --git a/cgit.c b/cgit.c index 497337b8e203188e54827bd4909e8cb8ff4d953a..a47cad03ff2cce9136c6c66edb92ea4c55ea1a85 100644 --- a/cgit.c +++ b/cgit.c @@ -130,6 +130,7 @@ ctx.repo = cgit_get_repoinfo(value); } else if (!strcmp(name, "p")) { ctx.qry.page = xstrdup(value); } else if (!strcmp(name, "url")) { + ctx.qry.url = xstrdup(value); cgit_parse_url(value); } else if (!strcmp(name, "qt")) { ctx.qry.grep = xstrdup(value); @@ -373,6 +374,8 @@ int main(int argc, const char **argv) { const char *cgit_config_env = getenv("CGIT_CONFIG"); + const char *path; + char *qry; int err, ttl; prepare_context(&ctx); @@ -389,6 +392,30 @@ if (getenv("QUERY_STRING")) ctx.qry.raw = xstrdup(getenv("QUERY_STRING")); cgit_parse_args(argc, argv); http_parse_querystring(ctx.qry.raw, querystring_cb); + + /* If virtual-root isn't specified in cgitrc and no url + * parameter is specified on the querystring, lets pretend + * that virtualroot equals SCRIPT_NAME and use PATH_INFO as + * url. This allows cgit to work with virtual urls without + * the need for rewriterules in the webserver (as long as + * PATH_INFO is included in the cache lookup key). + */ + if (!ctx.cfg.virtual_root && !ctx.qry.url) { + ctx.cfg.virtual_root = ctx.cfg.script_name; + path = getenv("PATH_INFO"); + if (path) { + if (path[0] == '/') + path++; + ctx.qry.url = xstrdup(path); + if (ctx.qry.raw) { + qry = ctx.qry.raw; + ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry)); + free(qry); + } else + ctx.qry.raw = ctx.qry.url; + cgit_parse_url(ctx.qry.url); + } + } ttl = calc_ttl(); ctx.page.expires += ttl*60; diff --git a/cgit.h b/cgit.h index 08fd95a528ef9ab925d1bc899cdf70f4f10dd41d..d07185cf6c16ff6aa1d0e64256e78fd625dcd8e0 100644 --- a/cgit.h +++ b/cgit.h @@ -118,6 +118,7 @@ char *sha2; char *path; char *name; char *mimetype; + char *url; int ofs; };