about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorLars Hjemli2007-11-08 12:20:05 +0100
committerLars Hjemli2007-11-08 12:21:59 +0100
commitc188c482b3b9ede88891fbcec0b2e6b1bdb8338e (patch)
treee894b077cd48656507ef1872ba1889b3ba8701c9
parentDon't show the the branch selector button if javascript is enabled (diff)
downloadcgit-c188c482b3b9ede88891fbcec0b2e6b1bdb8338e.tar.gz
cgit-c188c482b3b9ede88891fbcec0b2e6b1bdb8338e.zip
Support "/" as virtual-root
When the virtual-root was a single "/", it would be normalized to NULL due
to removal of trailing slashes, which in turn would fool us to belive that
we shouldn't generate virtual urls.

This makes the "/" normalize to "", effectively allowing virtual urls like
http://example.com/projectname to be generated without specifying the
full domain name as the virtual root.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r--shared.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/shared.c b/shared.c index e06df91..6117f5c 100644 --- a/shared.c +++ b/shared.c
@@ -157,9 +157,11 @@ void cgit_global_config_cb(const char *name, const char *value)
157 cgit_logo_link = xstrdup(value); 157 cgit_logo_link = xstrdup(value);
158 else if (!strcmp(name, "module-link")) 158 else if (!strcmp(name, "module-link"))
159 cgit_module_link = xstrdup(value); 159 cgit_module_link = xstrdup(value);
160 else if (!strcmp(name, "virtual-root")) 160 else if (!strcmp(name, "virtual-root")) {
161 cgit_virtual_root = trim_end(value, '/'); 161 cgit_virtual_root = trim_end(value, '/');
162 else if (!strcmp(name, "nocache")) 162 if (!cgit_virtual_root && (!strcmp(value, "/")))
163 cgit_virtual_root = "";
164 } else if (!strcmp(name, "nocache"))
163 cgit_nocache = atoi(value); 165 cgit_nocache = atoi(value);
164 else if (!strcmp(name, "snapshots")) 166 else if (!strcmp(name, "snapshots"))
165 cgit_snapshots = cgit_parse_snapshots_mask(value); 167 cgit_snapshots = cgit_parse_snapshots_mask(value);