diff options
author | Mark Lodato | 2011-05-13 19:59:07 -0400 |
---|---|---|
committer | Lars Hjemli | 2011-05-23 23:20:59 +0200 |
commit | ec79265f2053e6dc20e0ec486719f5954d2be83d (patch) | |
tree | bae66fbd919c03d0204554cc0c109c7eba0e3b97 | |
parent | ui-repolist.c: do not return random/stale data from read_agefile (diff) | |
download | cgit-ec79265f2053e6dc20e0ec486719f5954d2be83d.tar.gz cgit-ec79265f2053e6dc20e0ec486719f5954d2be83d.zip |
fix virtual-root if script-name is ""
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>
-rw-r--r-- | cgit.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cgit.c b/cgit.c index e302a7c..e498030 100644 --- a/cgit.c +++ b/cgit.c | |||
@@ -757,8 +757,11 @@ int main(int argc, const char **argv) | |||
757 | * that virtual-root equals SCRIPT_NAME, minus any possibly | 757 | * that virtual-root equals SCRIPT_NAME, minus any possibly |
758 | * trailing slashes. | 758 | * trailing slashes. |
759 | */ | 759 | */ |
760 | if (!ctx.cfg.virtual_root) | 760 | if (!ctx.cfg.virtual_root && ctx.cfg.script_name) { |
761 | ctx.cfg.virtual_root = trim_end(ctx.cfg.script_name, '/'); | 761 | ctx.cfg.virtual_root = trim_end(ctx.cfg.script_name, '/'); |
762 | if (!ctx.cfg.virtual_root) | ||
763 | ctx.cfg.virtual_root = ""; | ||
764 | } | ||
762 | 765 | ||
763 | /* If no url parameter is specified on the querystring, lets | 766 | /* If no url parameter is specified on the querystring, lets |
764 | * use PATH_INFO as url. This allows cgit to work with virtual | 767 | * use PATH_INFO as url. This allows cgit to work with virtual |