]> git.cameronkatri.com Git - cgit.git/commitdiff
Merge branch 'stable'
authorLars Hjemli <hjemli@gmail.com>
Thu, 8 Nov 2007 11:22:39 +0000 (12:22 +0100)
committerLars Hjemli <hjemli@gmail.com>
Thu, 8 Nov 2007 11:22:39 +0000 (12:22 +0100)
* stable:
  Support "/" as virtual-root

1  2 
shared.c

diff --combined shared.c
index a04c4dc7eece8257c9d3145f72e4bea0e8b17148,6117f5c7ae0ebf7cebcda1c48ab2d2b6aa4b5c2f..8cb480889bc83fbd577614935c162ad2836c55bd
+++ b/shared.c
@@@ -157,9 -157,11 +157,11 @@@ void cgit_global_config_cb(const char *
                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);
@@@ -265,8 -267,6 +267,8 @@@ void *cgit_free_commitinfo(struct commi
        free(info->committer);
        free(info->committer_email);
        free(info->subject);
 +      free(info->msg);
 +      free(info->msg_encoding);
        free(info);
        return NULL;
  }