diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2011-05-23 23:26:10 +0200 | 
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2011-05-23 23:26:10 +0200 | 
| commit | 652a5a18db3b0409fedfaf8c5720446d87628ba0 (patch) | |
| tree | cefa386058d968217af24374b93972820a9b43a8 /cgit.c | |
| parent | Merge branch 'dm/disable-clone' (diff) | |
| parent | fix virtual-root if script-name is "" (diff) | |
| download | cgit-652a5a18db3b0409fedfaf8c5720446d87628ba0.tar.gz cgit-652a5a18db3b0409fedfaf8c5720446d87628ba0.tar.bz2 cgit-652a5a18db3b0409fedfaf8c5720446d87628ba0.zip | |
Merge branch 'stable'
Diffstat (limited to '')
| -rw-r--r-- | cgit.c | 5 | 
1 files changed, 4 insertions, 1 deletions
| @@ -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 | 
