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
@@ -148,27 +148,29 @@ void cgit_global_config_cb(const char *name, const char *value)
         else if (!strcmp(name, "css"))
                 cgit_css = xstrdup(value);
         else if (!strcmp(name, "logo"))
                 cgit_logo = xstrdup(value);
         else if (!strcmp(name, "index-header"))
                 cgit_index_header = xstrdup(value);
         else if (!strcmp(name, "index-info"))
                 cgit_index_info = xstrdup(value);
         else if (!strcmp(name, "logo-link"))
                 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);
         else if (!strcmp(name, "enable-index-links"))
                 cgit_enable_index_links = atoi(value);
         else if (!strcmp(name, "enable-log-filecount"))
                 cgit_enable_log_filecount = atoi(value);
         else if (!strcmp(name, "enable-log-linecount"))
                 cgit_enable_log_linecount = atoi(value);
         else if (!strcmp(name, "cache-root"))
                 cgit_cache_root = xstrdup(value);
         else if (!strcmp(name, "cache-root-ttl"))