author | Lars Hjemli <hjemli@gmail.com> | 2008-12-06 10:37:37 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-12-06 10:37:37 (UTC) |
commit | 3c32fe07717f27fc891b66ccd06057fb810d03ad (patch) (unidiff) | |
tree | 04897b3eac6432c43284e7da79161e47856d078b /cgit.c | |
parent | 9c8be943f72b6f1bda5a31ce401899c3dd734e98 (diff) | |
parent | ab67164d6217fcda5ef3e07aefa3dd6eee6b65a3 (diff) | |
download | cgit-3c32fe07717f27fc891b66ccd06057fb810d03ad.zip cgit-3c32fe07717f27fc891b66ccd06057fb810d03ad.tar.gz cgit-3c32fe07717f27fc891b66ccd06057fb810d03ad.tar.bz2 |
Merge branch 'full-log'
Conflicts:
cgit.c
cgit.h
-rw-r--r-- | cgit.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -143,32 +143,34 @@ static void querystring_cb(const char *name, const char *value) | |||
143 | } else if (!strcmp(name, "id")) { | 143 | } else if (!strcmp(name, "id")) { |
144 | ctx.qry.sha1 = xstrdup(value); | 144 | ctx.qry.sha1 = xstrdup(value); |
145 | ctx.qry.has_sha1 = 1; | 145 | ctx.qry.has_sha1 = 1; |
146 | } else if (!strcmp(name, "id2")) { | 146 | } else if (!strcmp(name, "id2")) { |
147 | ctx.qry.sha2 = xstrdup(value); | 147 | ctx.qry.sha2 = xstrdup(value); |
148 | ctx.qry.has_sha1 = 1; | 148 | ctx.qry.has_sha1 = 1; |
149 | } else if (!strcmp(name, "ofs")) { | 149 | } else if (!strcmp(name, "ofs")) { |
150 | ctx.qry.ofs = atoi(value); | 150 | ctx.qry.ofs = atoi(value); |
151 | } else if (!strcmp(name, "path")) { | 151 | } else if (!strcmp(name, "path")) { |
152 | ctx.qry.path = trim_end(value, '/'); | 152 | ctx.qry.path = trim_end(value, '/'); |
153 | } else if (!strcmp(name, "name")) { | 153 | } else if (!strcmp(name, "name")) { |
154 | ctx.qry.name = xstrdup(value); | 154 | ctx.qry.name = xstrdup(value); |
155 | } else if (!strcmp(name, "mimetype")) { | 155 | } else if (!strcmp(name, "mimetype")) { |
156 | ctx.qry.mimetype = xstrdup(value); | 156 | ctx.qry.mimetype = xstrdup(value); |
157 | } else if (!strcmp(name, "s")){ | 157 | } else if (!strcmp(name, "s")){ |
158 | ctx.qry.sort = xstrdup(value); | 158 | ctx.qry.sort = xstrdup(value); |
159 | } else if (!strcmp(name, "showmsg")) { | ||
160 | ctx.qry.showmsg = atoi(value); | ||
159 | } | 161 | } |
160 | } | 162 | } |
161 | 163 | ||
162 | static void prepare_context(struct cgit_context *ctx) | 164 | static void prepare_context(struct cgit_context *ctx) |
163 | { | 165 | { |
164 | memset(ctx, 0, sizeof(ctx)); | 166 | memset(ctx, 0, sizeof(ctx)); |
165 | ctx->cfg.agefile = "info/web/last-modified"; | 167 | ctx->cfg.agefile = "info/web/last-modified"; |
166 | ctx->cfg.nocache = 0; | 168 | ctx->cfg.nocache = 0; |
167 | ctx->cfg.cache_size = 0; | 169 | ctx->cfg.cache_size = 0; |
168 | ctx->cfg.cache_dynamic_ttl = 5; | 170 | ctx->cfg.cache_dynamic_ttl = 5; |
169 | ctx->cfg.cache_max_create_time = 5; | 171 | ctx->cfg.cache_max_create_time = 5; |
170 | ctx->cfg.cache_repo_ttl = 5; | 172 | ctx->cfg.cache_repo_ttl = 5; |
171 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; | 173 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
172 | ctx->cfg.cache_root_ttl = 5; | 174 | ctx->cfg.cache_root_ttl = 5; |
173 | ctx->cfg.cache_static_ttl = -1; | 175 | ctx->cfg.cache_static_ttl = -1; |
174 | ctx->cfg.css = "/cgit.css"; | 176 | ctx->cfg.css = "/cgit.css"; |