mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-22 16:38:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid trailing slash in virtual-root

Browse Source 
When setting virtual-root from cgitrc, care is taken to avoid trailing
slashes. But when no virtual-root setting is specified, SCRIPT_FILE
from the web server is used without similar checks. This patch fixes the
inconsistency, which could lead to double-slashes in generated links.

Noticed-by: Wouter Van Hemel <wouter@duodecim.org>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
This commit is contained in:
Lars Hjemli 2011-03-05 13:47:04 +01:00
parent fc384b16fb
commit d0cb8413ff
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cgit.c
View File

@ -679,10 +679,11 @@ int main(int argc, const char **argv)
http_parse_querystring(ctx.qry.raw, querystring_cb); http_parse_querystring(ctx.qry.raw, querystring_cb);
/* If virtual-root isn't specified in cgitrc, lets pretend /* If virtual-root isn't specified in cgitrc, lets pretend
* that virtual-root equals SCRIPT_NAME. * that virtual-root equals SCRIPT_NAME, minus any possibly
* trailing slashes.
*/ */
if (!ctx.cfg.virtual_root) if (!ctx.cfg.virtual_root)
ctx.cfg.virtual_root = ctx.cfg.script_name; ctx.cfg.virtual_root = trim_end(ctx.cfg.script_name, '/');
/* If no url parameter is specified on the querystring, lets /* If no url parameter is specified on the querystring, lets
* use PATH_INFO as url. This allows cgit to work with virtual * use PATH_INFO as url. This allows cgit to work with virtual