about summary refs log tree commit diff
path: root/shared.c
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2007-11-08 12:22:39 +0100
committerLars Hjemli <hjemli@gmail.com>2007-11-08 12:22:39 +0100
commit6e54bd009c24ba353314a09257eb1e1a52fb139d (patch)
treedd38c2995de797dc4bacc9558b2a0e9d8375ba85 /shared.c
parentMakefile: link with libiconv if NEEDS_LIBICONV is defined (diff)
parentSupport "/" as virtual-root (diff)
downloadcgit-pink-6e54bd009c24ba353314a09257eb1e1a52fb139d.tar.gz
cgit-pink-6e54bd009c24ba353314a09257eb1e1a52fb139d.zip
Merge branch 'stable'
* stable:
  Support "/" as virtual-root
Diffstat (limited to '')
-rw-r--r--shared.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/shared.c b/shared.c
index a04c4dc..8cb4808 100644
--- a/shared.c
+++ b/shared.c
@@ -157,9 +157,11 @@ void cgit_global_config_cb(const char *name, const char *value)
 		cgit_logo_link = xstrdup(value);
 	else if (!strcmp(name, "module-link"))
 		cgit_module_link = xstrdup(value);
-	else if (!strcmp(name, "virtual-root"))
+	else if (!strcmp(name, "virtual-root")) {
 		cgit_virtual_root = trim_end(value, '/');
-	else if (!strcmp(name, "nocache"))
+		if (!cgit_virtual_root && (!strcmp(value, "/")))
+			cgit_virtual_root = "";
+	} else if (!strcmp(name, "nocache"))
 		cgit_nocache = atoi(value);
 	else if (!strcmp(name, "snapshots"))
 		cgit_snapshots = cgit_parse_snapshots_mask(value);