author | Lars Hjemli <hjemli@gmail.com> | 2007-11-08 11:22:39 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-11-08 11:22:39 (UTC) |
commit | 6e54bd009c24ba353314a09257eb1e1a52fb139d (patch) (side-by-side diff) | |
tree | dd38c2995de797dc4bacc9558b2a0e9d8375ba85 | |
parent | 1ae41a0d1ebf14f03dcf009aff1a79f0d26ad591 (diff) | |
parent | c188c482b3b9ede88891fbcec0b2e6b1bdb8338e (diff) | |
download | cgit-6e54bd009c24ba353314a09257eb1e1a52fb139d.zip cgit-6e54bd009c24ba353314a09257eb1e1a52fb139d.tar.gz cgit-6e54bd009c24ba353314a09257eb1e1a52fb139d.tar.bz2 |
Merge branch 'stable'
* stable:
Support "/" as virtual-root
-rw-r--r-- | shared.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -136,51 +136,53 @@ struct repoinfo *cgit_get_repoinfo(const char *url) for (i=0; i<cgit_repolist.count; i++) { repo = &cgit_repolist.repos[i]; if (!strcmp(repo->url, url)) return repo; } return NULL; } void cgit_global_config_cb(const char *name, const char *value) { if (!strcmp(name, "root-title")) cgit_root_title = xstrdup(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")) cgit_cache_root_ttl = atoi(value); else if (!strcmp(name, "cache-repo-ttl")) cgit_cache_repo_ttl = atoi(value); else if (!strcmp(name, "cache-static-ttl")) cgit_cache_static_ttl = atoi(value); else if (!strcmp(name, "cache-dynamic-ttl")) cgit_cache_dynamic_ttl = atoi(value); else if (!strcmp(name, "max-message-length")) cgit_max_msg_len = atoi(value); else if (!strcmp(name, "max-repodesc-length")) cgit_max_repodesc_len = atoi(value); else if (!strcmp(name, "max-commit-count")) |