diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2011-03-05 13:47:04 +0100 |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2011-03-05 13:50:40 +0100 |
| commit | d0cb8413ffd5319c623d832802abe6a6d5795679 (patch) | |
| tree | bb040f593116313a355840bed4a14d4bff0ca4fd | |
| parent | do not infloop on a query ending in %XY, for invalid hex X or Y (diff) | |
| download | cgit-pink-d0cb8413ffd5319c623d832802abe6a6d5795679.tar.gz cgit-pink-d0cb8413ffd5319c623d832802abe6a6d5795679.zip | |
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>
Diffstat (limited to '')
| -rw-r--r-- | cgit.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cgit.c b/cgit.c index ad62d10..af9832f 100644 --- a/cgit.c +++ b/cgit.c @@ -679,10 +679,11 @@ int main(int argc, const char **argv) 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 |