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>
This commit is contained in:
父節點
fc384b16fb
當前提交
d0cb8413ff
5
cgit.c
5
cgit.c
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user