| author | Lars Hjemli <hjemli@gmail.com> | 2011-03-05 13:01:59 (UTC) |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2011-03-05 13:01:59 (UTC) |
| commit | 1b09cbd303d889ec2636127584d57b7f1b70c25e (patch) (side-by-side diff) | |
| tree | 2b1188f946451d06af4d9120cbc3ba34de716f21 /cgit.c | |
| parent | 979c460e7f71d153ae79da67b8b21c3412f0fe02 (diff) | |
| parent | 9e849950dc7c1f2fb6ffa62ab65bd30f35717d13 (diff) | |
| download | cgit-1b09cbd303d889ec2636127584d57b7f1b70c25e.zip cgit-1b09cbd303d889ec2636127584d57b7f1b70c25e.tar.gz cgit-1b09cbd303d889ec2636127584d57b7f1b70c25e.tar.bz2 | |
Merge branch 'stable'
| -rw-r--r-- | cgit.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -752,10 +752,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 |