crtxcr/cgitsb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Untie logic for SCRIPT_NAME and PATH_INFO

Browse Source 
SCRIPT_NAME is used as fallback for virtual-root when virtual-root is
unspecified in cgitrc and PATH_INFO is used as fallback for the query-
string parameter 'url' when the latter is unspecified. But until now,
the use of PATH_INFO depended on virtual-root also being unspecified,
i.e. it was impossible to use PATH_INFO when virtual-root was specified.

This commit makes the fallback on SCRIPT_NAME and PATH_INFO independent
code paths, i.e. it is now possible to specify virtual-root in cgitrc
while still using PATH_INFO (instead of rewrite rules) to get 'pretty
urls'.

Noticed-by: Jack Moffitt <jack@chesspark.com>
Noticed-by: LiKai Liu <liulk@cs.bu.edu>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
This commit is contained in:
Lars Hjemli 2008-12-26 10:33:01 +01:00
parent 11456a60de
commit 377a1c8ced
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
cgit.c
View File

@ -439,28 +439,29 @@ int main(int argc, const char **argv)
ctx.repo = NULL; ctx.repo = NULL;
http_parse_querystring(ctx.qry.raw, querystring_cb); http_parse_querystring(ctx.qry.raw, querystring_cb);
/* If virtual-root isn't specified in cgitrc and no url /* If virtual-root isn't specified in cgitrc, lets pretend
* parameter is specified on the querystring, lets pretend * that virtual-root equals SCRIPT_NAME.
* 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) { if (!ctx.cfg.virtual_root)
ctx.cfg.virtual_root = ctx.cfg.script_name; ctx.cfg.virtual_root = ctx.cfg.script_name;
path = getenv("PATH_INFO");
if (path) { /* If no url parameter is specified on the querystring, lets
if (path[0] == '/') * use PATH_INFO as url. This allows cgit to work with virtual
path++; * urls without the need for rewriterules in the webserver (as
ctx.qry.url = xstrdup(path); * long as PATH_INFO is included in the cache lookup key).
if (ctx.qry.raw) { */
qry = ctx.qry.raw; path = getenv("PATH_INFO");
ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry)); if (!ctx.qry.url && path) {
free(qry); if (path[0] == '/')
} else path++;
ctx.qry.raw = ctx.qry.url; ctx.qry.url = xstrdup(path);
cgit_parse_url(ctx.qry.url); 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(); ttl = calc_ttl();