aboutsummaryrefslogtreecommitdiffstats
path: root/cgit.c
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2011-05-23 23:26:10 +0200
committerLars Hjemli <hjemli@gmail.com>2011-05-23 23:26:10 +0200
commit652a5a18db3b0409fedfaf8c5720446d87628ba0 (patch)
treecefa386058d968217af24374b93972820a9b43a8 /cgit.c
parent4837fddc35bbd8d6f66a40486f75cdee3197172d (diff)
parentec79265f2053e6dc20e0ec486719f5954d2be83d (diff)
downloadcgit-652a5a18db3b0409fedfaf8c5720446d87628ba0.tar.gz
cgit-652a5a18db3b0409fedfaf8c5720446d87628ba0.tar.bz2
cgit-652a5a18db3b0409fedfaf8c5720446d87628ba0.zip
Merge branch 'stable'
Diffstat (limited to 'cgit.c')
-rw-r--r--cgit.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/cgit.c b/cgit.c
index 349d6e0..eb964ac 100644
--- a/cgit.c
+++ b/cgit.c
@@ -767,8 +767,11 @@ int main(int argc, const char **argv)
* that virtual-root equals SCRIPT_NAME, minus any possibly
* trailing slashes.
*/
- if (!ctx.cfg.virtual_root)
+ if (!ctx.cfg.virtual_root && ctx.cfg.script_name) {
ctx.cfg.virtual_root = trim_end(ctx.cfg.script_name, '/');
+ if (!ctx.cfg.virtual_root)
+ ctx.cfg.virtual_root = "";
+ }
/* If no url parameter is specified on the querystring, lets
* use PATH_INFO as url. This allows cgit to work with virtual