| author | Lars Hjemli <hjemli@gmail.com> | 2011-03-05 12:47:04 (UTC) |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2011-03-05 12:50:40 (UTC) |
| commit | d0cb8413ffd5319c623d832802abe6a6d5795679 (patch) (side-by-side diff) | |
| tree | bb040f593116313a355840bed4a14d4bff0ca4fd /cgit.c | |
| parent | fc384b16fb9787380746000d3cea2d53fccc548e (diff) | |
| download | cgit-d0cb8413ffd5319c623d832802abe6a6d5795679.zip cgit-d0cb8413ffd5319c623d832802abe6a6d5795679.tar.gz cgit-d0cb8413ffd5319c623d832802abe6a6d5795679.tar.bz2 | |
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>
| -rw-r--r-- | cgit.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -676,16 +676,17 @@ int main(int argc, const char **argv) cgit_parse_args(argc, argv); parse_configfile(ctx.env.cgit_config, config_cb); 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 * urls without the need for rewriterules in the webserver (as * long as PATH_INFO is included in the cache lookup key). */ |