aboutsummaryrefslogtreecommitdiffstats
path: root/cgit.c
diff options
context:
space:
mode:
Diffstat (limited to 'cgit.c')
-rw-r--r--cgit.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/cgit.c b/cgit.c
index ca3034c..6f75db1 100644
--- a/cgit.c
+++ b/cgit.c
@@ -155,9 +155,7 @@ static void config_cb(const char *name, const char *value)
155 else if (!strcmp(name, "strict-export")) 155 else if (!strcmp(name, "strict-export"))
156 ctx.cfg.strict_export = xstrdup(value); 156 ctx.cfg.strict_export = xstrdup(value);
157 else if (!strcmp(name, "virtual-root")) { 157 else if (!strcmp(name, "virtual-root")) {
158 ctx.cfg.virtual_root = trim_end(value, '/'); 158 ctx.cfg.virtual_root = ensure_end(value, '/');
159 if (!ctx.cfg.virtual_root && (!strcmp(value, "/")))
160 ctx.cfg.virtual_root = "";
161 } else if (!strcmp(name, "nocache")) 159 } else if (!strcmp(name, "nocache"))
162 ctx.cfg.nocache = atoi(value); 160 ctx.cfg.nocache = atoi(value);
163 else if (!strcmp(name, "noplainemail")) 161 else if (!strcmp(name, "noplainemail"))
@@ -833,11 +831,8 @@ int main(int argc, const char **argv)
833 * that virtual-root equals SCRIPT_NAME, minus any possibly 831 * that virtual-root equals SCRIPT_NAME, minus any possibly
834 * trailing slashes. 832 * trailing slashes.
835 */ 833 */
836 if (!ctx.cfg.virtual_root && ctx.cfg.script_name) { 834 if (!ctx.cfg.virtual_root && ctx.cfg.script_name)
837 ctx.cfg.virtual_root = trim_end(ctx.cfg.script_name, '/'); 835 ctx.cfg.virtual_root = ensure_end(ctx.cfg.script_name, '/');
838 if (!ctx.cfg.virtual_root)
839 ctx.cfg.virtual_root = "";
840 }
841 836
842 /* If no url parameter is specified on the querystring, lets 837 /* If no url parameter is specified on the querystring, lets
843 * use PATH_INFO as url. This allows cgit to work with virtual 838 * use PATH_INFO as url. This allows cgit to work with virtual