crtxcr/cgitsb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix virtual-root if script-name is ""

Browse Source 
In d0cb841 (Avoid trailing slash in virtual-root), virtual-root was set
from script-name using trim_end().  However, if script-name was the
empty string (""), which happens when cgit is used to serve the root
path on a domain (/), trim_end() returns NULL and cgit acts like
virtual-root is not available.  Now, set virtual-root to "" in this
case, which fixes this bug.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
This commit is contained in:
Mark Lodato 2011-05-13 19:59:07 -04:00 committed by Lars Hjemli
parent c8ea73caab
commit ec79265f20
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cgit.c
View File

@ -757,8 +757,11 @@ int main(int argc, const char **argv)
* that virtual-root equals SCRIPT_NAME, minus any possibly * that virtual-root equals SCRIPT_NAME, minus any possibly
* trailing slashes. * 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, '/'); 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 /* If no url parameter is specified on the querystring, lets
* use PATH_INFO as url. This allows cgit to work with virtual * use PATH_INFO as url. This allows cgit to work with virtual