author | Lars Hjemli <hjemli@gmail.com> | 2007-11-08 11:20:05 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-11-08 11:21:59 (UTC) |
commit | c188c482b3b9ede88891fbcec0b2e6b1bdb8338e (patch) (unidiff) | |
tree | e894b077cd48656507ef1872ba1889b3ba8701c9 /shared.c | |
parent | 72ede12551af320b6d8eade853dbd2cd6f2222cc (diff) | |
download | cgit-c188c482b3b9ede88891fbcec0b2e6b1bdb8338e.zip cgit-c188c482b3b9ede88891fbcec0b2e6b1bdb8338e.tar.gz cgit-c188c482b3b9ede88891fbcec0b2e6b1bdb8338e.tar.bz2 |
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.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -156,11 +156,13 @@ void cgit_global_config_cb(const char *name, const char *value) | |||
156 | else if (!strcmp(name, "logo-link")) | 156 | else if (!strcmp(name, "logo-link")) |
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); |
166 | else if (!strcmp(name, "enable-index-links")) | 168 | else if (!strcmp(name, "enable-index-links")) |