From: Lars Hjemli <hjemli@gmail.com>
Date: Thu, 8 Nov 2007 11:22:39 +0000 (+0100)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/6e54bd009c24ba353314a09257eb1e1a52fb139d?hp=1ae41a0d1ebf14f03dcf009aff1a79f0d26ad591

Merge branch 'stable'

* stable:
  Support "/" as virtual-root
---

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);