summaryrefslogtreecommitdiffabout
path: root/cgit.c
authorMark Lodato <lodatom@gmail.com>2011-05-13 23:59:07 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2011-05-23 21:20:59 (UTC)
commitec79265f2053e6dc20e0ec486719f5954d2be83d (patch) (unidiff)
treebae66fbd919c03d0204554cc0c109c7eba0e3b97 /cgit.c
parentc8ea73caabcb16ffb74baa70d35650027ed772c4 (diff)
downloadcgit-ec79265f2053e6dc20e0ec486719f5954d2be83d.zip
cgit-ec79265f2053e6dc20e0ec486719f5954d2be83d.tar.gz
cgit-ec79265f2053e6dc20e0ec486719f5954d2be83d.tar.bz2
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>
Diffstat (limited to 'cgit.c') (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c5
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
@@ -754,14 +754,17 @@ int main(int argc, const char **argv)
754 http_parse_querystring(ctx.qry.raw, querystring_cb); 754 http_parse_querystring(ctx.qry.raw, querystring_cb);
755 755
756 /* If virtual-root isn't specified in cgitrc, lets pretend 756 /* If virtual-root isn't specified in cgitrc, lets pretend
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
765 * urls without the need for rewriterules in the webserver (as 768 * urls without the need for rewriterules in the webserver (as
766 * long as PATH_INFO is included in the cache lookup key). 769 * long as PATH_INFO is included in the cache lookup key).
767 */ 770 */