16 files changed, 142 insertions, 81 deletions

diff --git a/cgit.c b/cgit.c
index 5d6e488..6be3754 100644
--- a/cgit.c
+++ b/cgit.c
@@ -29,6 +29,7 @@ void add_mimetype(const char *name, const char *value)
 struct cgit_filter *new_filter(const char *cmd, filter_type filtertype)
 {
         struct cgit_filter *f;
+        int args_size = 0;
         int extra_args;
 
         if (!cmd || !cmd[0])
@@ -48,9 +49,10 @@ struct cgit_filter *new_filter(const char *cmd, filter_type filtertype)
 
         f = xmalloc(sizeof(struct cgit_filter));
         f->cmd = xstrdup(cmd);
-        f->argv = xmalloc((2 + extra_args) * sizeof(char *));
+        args_size = (2 + extra_args) * sizeof(char *);
+        f->argv = xmalloc(args_size);
+        memset(f->argv, 0, args_size);
         f->argv[0] = f->cmd;
-        f->argv[1] = NULL;
         return f;
 }
 
@@ -158,6 +160,8 @@ void config_cb(const char *name, const char *value)
                 ctx.cfg.enable_filter_overrides = atoi(value);
         else if (!strcmp(name, "enable-gitweb-owner"))
                 ctx.cfg.enable_gitweb_owner = atoi(value);
+        else if (!strcmp(name, "enable-http-clone"))
+                ctx.cfg.enable_http_clone = atoi(value);
         else if (!strcmp(name, "enable-index-links"))
                 ctx.cfg.enable_index_links = atoi(value);
         else if (!strcmp(name, "enable-commit-graph"))
@@ -323,6 +327,7 @@ static void prepare_context(struct cgit_context *ctx)
         ctx->cfg.logo = "/cgit.png";
         ctx->cfg.local_time = 0;
         ctx->cfg.enable_gitweb_owner = 1;
+        ctx->cfg.enable_http_clone = 1;
         ctx->cfg.enable_tree_linenumbers = 1;
         ctx->cfg.max_repo_count = 50;
         ctx->cfg.max_commit_count = 50;
@@ -450,7 +455,7 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
                 tmp = xstrdup(ctx->qry.head);
                 ctx->qry.head = ctx->repo->defbranch;
                 ctx->page.status = 404;
-                ctx->page.statusmsg = "not found";
+                ctx->page.statusmsg = "Not found";
                 cgit_print_http_headers(ctx);
                 cgit_print_docstart(ctx);
                 cgit_print_pageheader(ctx);
@@ -469,6 +474,8 @@ static void process_request(void *cbdata)
         cmd = cgit_get_cmd(ctx);
         if (!cmd) {
                 ctx->page.title = "cgit error";
+                ctx->page.status = 404;
+                ctx->page.statusmsg = "Not found";
                 cgit_print_http_headers(ctx);
                 cgit_print_docstart(ctx);
                 cgit_print_pageheader(ctx);
@@ -477,6 +484,11 @@ static void process_request(void *cbdata)
                 return;
         }
 
+        if (!ctx->cfg.enable_http_clone && cmd->is_clone) {
+                html_status(404, "Not found", 0);
+                return;
+        }
+
         /* If cmd->want_vpath is set, assume ctx->qry.path contains a "virtual"
          * in-project path limit to be made available at ctx->qry.vpath.
          * Otherwise, no path limit is in effect (ctx->qry.vpath = NULL).
@@ -768,8 +780,11 @@ int main(int argc, const char **argv)
          * that virtual-root equals SCRIPT_NAME, minus any possibly
          * trailing slashes.
          */
-        if (!ctx.cfg.virtual_root)
+        if (!ctx.cfg.virtual_root && ctx.cfg.script_name) {
                 ctx.cfg.virtual_root = trim_end(ctx.cfg.script_name, '/');
+                if (!ctx.cfg.virtual_root)
+                        ctx.cfg.virtual_root = "";
+        }
 
         /* If no url parameter is specified on the querystring, lets
          * use PATH_INFO as url. This allows cgit to work with virtual
diff --git a/cgit.h b/cgit.h
index 3b0eaf5..caa9d8e 100644
--- a/cgit.h
+++ b/cgit.h
@@ -195,6 +195,7 @@ struct cgit_config {
         int embedded;
         int enable_filter_overrides;
         int enable_gitweb_owner;
+        int enable_http_clone;
         int enable_index_links;
         int enable_commit_graph;
         int enable_log_filecount;
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 60539d7..5903a93 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -106,6 +106,11 @@ enable-gitweb-owner::
         for the git config value "gitweb.owner" to determine the owner.
         Default value: "1". See also: scan-path.
 
+enable-http-clone::
+        If set to "1", cgit will act as an dumb HTTP endpoint for git clones.
+        If you use an alternate way of serving git repositories, you may wish
+        to disable this. Default value: "1".
+
 enable-index-links::
         Flag which, when set to "1", will make cgit generate extra links for
         each repo in the repository index (specifically, to the "summary",
@@ -288,8 +293,9 @@ scan-path::
         the result will be cached as a cgitrc include-file in the cache
         directory. If project-list has been defined prior to scan-path,
         scan-path loads only the directories listed in the file pointed to by
-        project-list. Default value: none. See also: cache-scanrc-ttl,
-        project-list.
+        project-list. Be advised that only the global settings taken
+        before the scan-path directive will be applied to each repository.
+        Default value: none. See also: cache-scanrc-ttl, project-list.
 
 section::
         The name of the current repository section - all repositories defined
@@ -309,7 +315,8 @@ side-by-side-diffs::
 snapshots::
         Text which specifies the default set of snapshot formats generated by
         cgit. The value is a space-separated list of zero or more of the
-        values "tar", "tar.gz", "tar.bz2" and "zip". Default value: none.
+        values "tar", "tar.gz", "tar.bz2", "tar.xz" and "zip". Default value:
+        none.
 
 source-filter::
         Specifies a command which will be invoked to format plaintext blobs
diff --git a/cmd.c b/cmd.c
index 536515b..d114eb3 100644
--- a/cmd.c
+++ b/cmd.c
@@ -130,31 +130,31 @@ static void tree_fn(struct cgit_context *ctx)
         cgit_print_tree(ctx->qry.sha1, ctx->qry.path);
 }
 
-#define def_cmd(name, want_repo, want_layout, want_vpath) \
-        {#name, name##_fn, want_repo, want_layout, want_vpath}
+#define def_cmd(name, want_repo, want_layout, want_vpath, is_clone) \
+        {#name, name##_fn, want_repo, want_layout, want_vpath, is_clone}
 
 struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx)
 {
         static struct cgit_cmd cmds[] = {
-                def_cmd(HEAD, 1, 0, 0),
-                def_cmd(atom, 1, 0, 0),
-                def_cmd(about, 0, 1, 0),
-                def_cmd(blob, 1, 0, 0),
-                def_cmd(commit, 1, 1, 1),
-                def_cmd(diff, 1, 1, 1),
-                def_cmd(info, 1, 0, 0),
-                def_cmd(log, 1, 1, 1),
-                def_cmd(ls_cache, 0, 0, 0),
-                def_cmd(objects, 1, 0, 0),
-                def_cmd(patch, 1, 0, 1),
-                def_cmd(plain, 1, 0, 0),
-                def_cmd(refs, 1, 1, 0),
-                def_cmd(repolist, 0, 0, 0),
-                def_cmd(snapshot, 1, 0, 0),
-                def_cmd(stats, 1, 1, 1),
-                def_cmd(summary, 1, 1, 0),
-                def_cmd(tag, 1, 1, 0),
-                def_cmd(tree, 1, 1, 1),
+                def_cmd(HEAD, 1, 0, 0, 1),
+                def_cmd(atom, 1, 0, 0, 0),
+                def_cmd(about, 0, 1, 0, 0),
+                def_cmd(blob, 1, 0, 0, 0),
+                def_cmd(commit, 1, 1, 1, 0),
+                def_cmd(diff, 1, 1, 1, 0),
+                def_cmd(info, 1, 0, 0, 1),
+                def_cmd(log, 1, 1, 1, 0),
+                def_cmd(ls_cache, 0, 0, 0, 0),
+                def_cmd(objects, 1, 0, 0, 1),
+                def_cmd(patch, 1, 0, 1, 0),
+                def_cmd(plain, 1, 0, 0, 0),
+                def_cmd(refs, 1, 1, 0, 0),
+                def_cmd(repolist, 0, 0, 0, 0),
+                def_cmd(snapshot, 1, 0, 0, 0),
+                def_cmd(stats, 1, 1, 1, 0),
+                def_cmd(summary, 1, 1, 0, 0),
+                def_cmd(tag, 1, 1, 0, 0),
+                def_cmd(tree, 1, 1, 1, 0),
         };
         int i;
 
diff --git a/cmd.h b/cmd.h
index 8dc01bd..eb5bc87 100644
--- a/cmd.h
+++ b/cmd.h
@@ -8,7 +8,8 @@ struct cgit_cmd {
         cgit_cmd_fn fn;
         unsigned int want_repo:1,
                 want_layout:1,
-                want_vpath:1;
+                want_vpath:1,
+                is_clone:1;
 };
 
 extern struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx);
diff --git a/html.c b/html.c
index a60bc13..a0f6db4 100644
--- a/html.c
+++ b/html.c
@@ -18,7 +18,7 @@ static const char* url_escape_table[256] = {
         "%00", "%01", "%02", "%03", "%04", "%05", "%06", "%07", "%08", "%09",
         "%0a", "%0b", "%0c", "%0d", "%0e", "%0f", "%10", "%11", "%12", "%13",
         "%14", "%15", "%16", "%17", "%18", "%19", "%1a", "%1b", "%1c", "%1d",
-        "%1e", "%1f", "+", 0, "%22", "%23", 0, "%25", "%26", "%27", 0, 0, 0,
+        "%1e", "%1f", "%20", 0, "%22", "%23", 0, "%25", "%26", "%27", 0, 0, 0,
         "%2b", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "%3c", "%3d",
         "%3e", "%3f", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, "%5c", 0, "%5e", 0, "%60", 0, 0, 0, 0, 0,
@@ -162,9 +162,9 @@ void html_url_path(const char *txt)
         while(t && *t){
                 int c = *t;
                 const char *e = url_escape_table[c];
-                if (e && c!='+' && c!='&' && c!='+') {
+                if (e && c!='+' && c!='&') {
                         html_raw(txt, t - txt);
-                        html_raw(e, 3);
+                        html(e);
                         txt = t+1;
                 }
                 t++;
@@ -179,9 +179,11 @@ void html_url_arg(const char *txt)
         while(t && *t){
                 int c = *t;
                 const char *e = url_escape_table[c];
+                if (c == ' ')
+                        e = "+";
                 if (e) {
                         html_raw(txt, t - txt);
-                        html_raw(e, strlen(e));
+                        html(e);
                         txt = t+1;
                 }
                 t++;
@@ -288,12 +290,12 @@ char *convert_query_hexchar(char *txt)
 
 int http_parse_querystring(const char *txt_, void (*fn)(const char *name, const char *value))
 {
-        char *t, *txt, *value = NULL, c;
+        char *o, *t, *txt, *value = NULL, c;
 
         if (!txt_)
                 return 0;
 
-        t = txt = strdup(txt_);
+        o = t = txt = strdup(txt_);
         if (t == NULL) {
                 printf("Out of memory\n");
                 exit(1);
@@ -316,5 +318,6 @@ int http_parse_querystring(const char *txt_, void (*fn)(const char *name, const
         }
         if (t!=txt)
                 (*fn)(txt, value);
+        free(o);
         return 0;
 }
diff --git a/parsing.c b/parsing.c
index f37c49d..151c0fe 100644
--- a/parsing.c
+++ b/parsing.c
@@ -103,10 +103,17 @@ const char *reencode(char **txt, const char *src_enc, const char *dst_enc)
 {
         char *tmp;
 
-        if (!txt || !*txt || !src_enc || !dst_enc)
+        if (!txt)
+                return NULL;
+
+        if (!*txt || !src_enc || !dst_enc)
+                return *txt;
+
+        /* no encoding needed if src_enc equals dst_enc */
+        if(!strcasecmp(src_enc, dst_enc))
                 return *txt;