summaryrefslogtreecommitdiffabout
path: root/cgit.c
authorLars Hjemli <hjemli@gmail.com>2009-02-19 21:38:36 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-02-19 21:38:36 (UTC)
commit488a214a81a25c6397c56822ed1713f51dddc520 (patch) (unidiff)
tree93b3be74f6c7b3ae6557a9d3c5c2856ff5efe8ed /cgit.c
parent6063e7b5532481ffaa7a6f080de28547983bbeb7 (diff)
downloadcgit-488a214a81a25c6397c56822ed1713f51dddc520.zip
cgit-488a214a81a25c6397c56822ed1713f51dddc520.tar.gz
cgit-488a214a81a25c6397c56822ed1713f51dddc520.tar.bz2
Add support for ETag in 'plain' view
When downloading a blob identified by its path, the client might want to know if the blob has been modified since a previous download of the same path. To this end, an ETag containing the blob SHA1 seems to be ideal. Todo: add support for HEAD requests... Suggested-by: Owen Taylor <otaylor@redhat.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'cgit.c') (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/cgit.c b/cgit.c
index 64d95f9..411e421 100644
--- a/cgit.c
+++ b/cgit.c
@@ -161,96 +161,97 @@ static void querystring_cb(const char *name, const char *value)
161 ctx.qry.name = xstrdup(value); 161 ctx.qry.name = xstrdup(value);
162 } else if (!strcmp(name, "mimetype")) { 162 } else if (!strcmp(name, "mimetype")) {
163 ctx.qry.mimetype = xstrdup(value); 163 ctx.qry.mimetype = xstrdup(value);
164 } else if (!strcmp(name, "s")){ 164 } else if (!strcmp(name, "s")){
165 ctx.qry.sort = xstrdup(value); 165 ctx.qry.sort = xstrdup(value);
166 } else if (!strcmp(name, "showmsg")) { 166 } else if (!strcmp(name, "showmsg")) {
167 ctx.qry.showmsg = atoi(value); 167 ctx.qry.showmsg = atoi(value);
168 } else if (!strcmp(name, "period")) { 168 } else if (!strcmp(name, "period")) {
169 ctx.qry.period = xstrdup(value); 169 ctx.qry.period = xstrdup(value);
170 } 170 }
171} 171}
172 172
173static void prepare_context(struct cgit_context *ctx) 173static void prepare_context(struct cgit_context *ctx)
174{ 174{
175 memset(ctx, 0, sizeof(ctx)); 175 memset(ctx, 0, sizeof(ctx));
176 ctx->cfg.agefile = "info/web/last-modified"; 176 ctx->cfg.agefile = "info/web/last-modified";
177 ctx->cfg.nocache = 0; 177 ctx->cfg.nocache = 0;
178 ctx->cfg.cache_size = 0; 178 ctx->cfg.cache_size = 0;
179 ctx->cfg.cache_dynamic_ttl = 5; 179 ctx->cfg.cache_dynamic_ttl = 5;
180 ctx->cfg.cache_max_create_time = 5; 180 ctx->cfg.cache_max_create_time = 5;
181 ctx->cfg.cache_repo_ttl = 5; 181 ctx->cfg.cache_repo_ttl = 5;
182 ctx->cfg.cache_root = CGIT_CACHE_ROOT; 182 ctx->cfg.cache_root = CGIT_CACHE_ROOT;
183 ctx->cfg.cache_root_ttl = 5; 183 ctx->cfg.cache_root_ttl = 5;
184 ctx->cfg.cache_static_ttl = -1; 184 ctx->cfg.cache_static_ttl = -1;
185 ctx->cfg.css = "/cgit.css"; 185 ctx->cfg.css = "/cgit.css";
186 ctx->cfg.logo = "/git-logo.png"; 186 ctx->cfg.logo = "/git-logo.png";
187 ctx->cfg.local_time = 0; 187 ctx->cfg.local_time = 0;
188 ctx->cfg.max_repo_count = 50; 188 ctx->cfg.max_repo_count = 50;
189 ctx->cfg.max_commit_count = 50; 189 ctx->cfg.max_commit_count = 50;
190 ctx->cfg.max_lock_attempts = 5; 190 ctx->cfg.max_lock_attempts = 5;
191 ctx->cfg.max_msg_len = 80; 191 ctx->cfg.max_msg_len = 80;
192 ctx->cfg.max_repodesc_len = 80; 192 ctx->cfg.max_repodesc_len = 80;
193 ctx->cfg.max_stats = 0; 193 ctx->cfg.max_stats = 0;
194 ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; 194 ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s";
195 ctx->cfg.renamelimit = -1; 195 ctx->cfg.renamelimit = -1;
196 ctx->cfg.robots = "index, nofollow"; 196 ctx->cfg.robots = "index, nofollow";
197 ctx->cfg.root_title = "Git repository browser"; 197 ctx->cfg.root_title = "Git repository browser";
198 ctx->cfg.root_desc = "a fast webinterface for the git dscm"; 198 ctx->cfg.root_desc = "a fast webinterface for the git dscm";
199 ctx->cfg.script_name = CGIT_SCRIPT_NAME; 199 ctx->cfg.script_name = CGIT_SCRIPT_NAME;
200 ctx->cfg.summary_branches = 10; 200 ctx->cfg.summary_branches = 10;
201 ctx->cfg.summary_log = 10; 201 ctx->cfg.summary_log = 10;
202 ctx->cfg.summary_tags = 10; 202 ctx->cfg.summary_tags = 10;
203 ctx->page.mimetype = "text/html"; 203 ctx->page.mimetype = "text/html";
204 ctx->page.charset = PAGE_ENCODING; 204 ctx->page.charset = PAGE_ENCODING;
205 ctx->page.filename = NULL; 205 ctx->page.filename = NULL;
206 ctx->page.size = 0; 206 ctx->page.size = 0;
207 ctx->page.modified = time(NULL); 207 ctx->page.modified = time(NULL);
208 ctx->page.expires = ctx->page.modified; 208 ctx->page.expires = ctx->page.modified;
209 ctx->page.etag = NULL;
209} 210}
210 211
211struct refmatch { 212struct refmatch {
212 char *req_ref; 213 char *req_ref;
213 char *first_ref; 214 char *first_ref;
214 int match; 215 int match;
215}; 216};
216 217
217int find_current_ref(const char *refname, const unsigned char *sha1, 218int find_current_ref(const char *refname, const unsigned char *sha1,
218 int flags, void *cb_data) 219 int flags, void *cb_data)
219{ 220{
220 struct refmatch *info; 221 struct refmatch *info;
221 222
222 info = (struct refmatch *)cb_data; 223 info = (struct refmatch *)cb_data;
223 if (!strcmp(refname, info->req_ref)) 224 if (!strcmp(refname, info->req_ref))
224 info->match = 1; 225 info->match = 1;
225 if (!info->first_ref) 226 if (!info->first_ref)
226 info->first_ref = xstrdup(refname); 227 info->first_ref = xstrdup(refname);
227 return info->match; 228 return info->match;
228} 229}
229 230
230char *find_default_branch(struct cgit_repo *repo) 231char *find_default_branch(struct cgit_repo *repo)
231{ 232{
232 struct refmatch info; 233 struct refmatch info;
233 char *ref; 234 char *ref;
234 235
235 info.req_ref = repo->defbranch; 236 info.req_ref = repo->defbranch;
236 info.first_ref = NULL; 237 info.first_ref = NULL;
237 info.match = 0; 238 info.match = 0;
238 for_each_branch_ref(find_current_ref, &info); 239 for_each_branch_ref(find_current_ref, &info);
239 if (info.match) 240 if (info.match)
240 ref = info.req_ref; 241 ref = info.req_ref;
241 else 242 else
242 ref = info.first_ref; 243 ref = info.first_ref;
243 if (ref) 244 if (ref)
244 ref = xstrdup(ref); 245 ref = xstrdup(ref);
245 return ref; 246 return ref;
246} 247}
247 248
248static int prepare_repo_cmd(struct cgit_context *ctx) 249static int prepare_repo_cmd(struct cgit_context *ctx)
249{ 250{
250 char *tmp; 251 char *tmp;
251 unsigned char sha1[20]; 252 unsigned char sha1[20];
252 int nongit = 0; 253 int nongit = 0;
253 254
254 setenv("GIT_DIR", ctx->repo->path, 1); 255 setenv("GIT_DIR", ctx->repo->path, 1);
255 setup_git_directory_gently(&nongit); 256 setup_git_directory_gently(&nongit);
256 if (nongit) { 257 if (nongit) {