diff options
| author | Lars Hjemli | 2007-11-08 12:22:39 +0100 |
|---|---|---|
| committer | Lars Hjemli | 2007-11-08 12:22:39 +0100 |
| commit | 6e54bd009c24ba353314a09257eb1e1a52fb139d (patch) | |
| tree | dd38c2995de797dc4bacc9558b2a0e9d8375ba85 | |
| parent | Makefile: link with libiconv if NEEDS_LIBICONV is defined (diff) | |
| parent | Support "/" as virtual-root (diff) | |
| download | cgit-6e54bd009c24ba353314a09257eb1e1a52fb139d.tar.gz cgit-6e54bd009c24ba353314a09257eb1e1a52fb139d.zip | |
Merge branch 'stable'
* stable: Support "/" as virtual-root
| -rw-r--r-- | shared.c | 6 |
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) | |||
| 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); |