summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2007-11-08 11:22:39 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-11-08 11:22:39 (UTC)
commit6e54bd009c24ba353314a09257eb1e1a52fb139d (patch) (side-by-side diff)
treedd38c2995de797dc4bacc9558b2a0e9d8375ba85
parent1ae41a0d1ebf14f03dcf009aff1a79f0d26ad591 (diff)
parentc188c482b3b9ede88891fbcec0b2e6b1bdb8338e (diff)
downloadcgit-6e54bd009c24ba353314a09257eb1e1a52fb139d.zip
cgit-6e54bd009c24ba353314a09257eb1e1a52fb139d.tar.gz
cgit-6e54bd009c24ba353314a09257eb1e1a52fb139d.tar.bz2
Merge branch 'stable'
* stable: Support "/" as virtual-root
Diffstat (more/less context) (ignore whitespace changes)
-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);