Author: Lars Hjemli <hjemli@gmail.com>
Avoid trailing slash in virtual-root 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>
cgit.c | 5 +++--
diff --git a/cgit.c b/cgit.c index ad62d10887e8ecdda4bb43fb86e349c51f8c8afb..af9832fa99f69099fa2e02c47b2dacf1eb6dc7d4 100644 --- a/cgit.c +++ b/cgit.c @@ -679,10 +679,11 @@ ctx.repo = NULL; http_parse_querystring(ctx.qry.raw, querystring_cb); /* 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) - 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 * use PATH_INFO as url. This allows cgit to work with virtual