author | Lars Hjemli <hjemli@gmail.com> | 2009-07-25 09:59:22 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-07-25 09:59:22 (UTC) |
commit | 681fdc45473143de3f3c5f69fbc7b94f5d6b0b75 (patch) (unidiff) | |
tree | 3bfca05875524bee0e5444fb791707bc3e593dbd | |
parent | 7e5c048505efe1902fb476cc2cb3160ff7df013d (diff) | |
parent | 3ff58ddd51bcbcbc9b7649bad1a39aa98af4b49f (diff) | |
download | cgit-681fdc45473143de3f3c5f69fbc7b94f5d6b0b75.zip cgit-681fdc45473143de3f3c5f69fbc7b94f5d6b0b75.tar.gz cgit-681fdc45473143de3f3c5f69fbc7b94f5d6b0b75.tar.bz2 |
Merge branch 'plain-etag'
Conflicts:
ui-shared.c
-rw-r--r-- | cgit.c | 4 | ||||
-rw-r--r-- | cgit.h | 1 | ||||
-rw-r--r-- | ui-plain.c | 1 | ||||
-rw-r--r-- | ui-shared.c | 6 |
4 files changed, 12 insertions, 0 deletions
@@ -197,24 +197,25 @@ static void prepare_context(struct cgit_context *ctx) | |||
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 | ||
211 | struct refmatch { | 212 | struct 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 | ||
217 | int find_current_ref(const char *refname, const unsigned char *sha1, | 218 | int 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; |
@@ -422,24 +423,25 @@ static int calc_ttl() | |||
422 | if (ctx.qry.has_symref) | 423 | if (ctx.qry.has_symref) |
423 | return ctx.cfg.cache_dynamic_ttl; | 424 | return ctx.cfg.cache_dynamic_ttl; |
424 | 425 | ||
425 | if (ctx.qry.has_sha1) | 426 | if (ctx.qry.has_sha1) |
426 | return ctx.cfg.cache_static_ttl; | 427 | return ctx.cfg.cache_static_ttl; |
427 | 428 | ||
428 | return ctx.cfg.cache_repo_ttl; | 429 | return ctx.cfg.cache_repo_ttl; |
429 | } | 430 | } |
430 | 431 | ||
431 | int main(int argc, const char **argv) | 432 | int main(int argc, const char **argv) |
432 | { | 433 | { |
433 | const char *cgit_config_env = getenv("CGIT_CONFIG"); | 434 | const char *cgit_config_env = getenv("CGIT_CONFIG"); |
435 | const char *method = getenv("REQUEST_METHOD"); | ||
434 | const char *path; | 436 | const char *path; |
435 | char *qry; | 437 | char *qry; |
436 | int err, ttl; | 438 | int err, ttl; |
437 | 439 | ||
438 | prepare_context(&ctx); | 440 | prepare_context(&ctx); |
439 | cgit_repolist.length = 0; | 441 | cgit_repolist.length = 0; |
440 | cgit_repolist.count = 0; | 442 | cgit_repolist.count = 0; |
441 | cgit_repolist.repos = NULL; | 443 | cgit_repolist.repos = NULL; |
442 | 444 | ||
443 | if (getenv("SCRIPT_NAME")) | 445 | if (getenv("SCRIPT_NAME")) |
444 | ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME")); | 446 | ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME")); |
445 | if (getenv("QUERY_STRING")) | 447 | if (getenv("QUERY_STRING")) |
@@ -468,21 +470,23 @@ int main(int argc, const char **argv) | |||
468 | ctx.qry.url = xstrdup(path); | 470 | ctx.qry.url = xstrdup(path); |
469 | if (ctx.qry.raw) { | 471 | if (ctx.qry.raw) { |
470 | qry = ctx.qry.raw; | 472 | qry = ctx.qry.raw; |
471 | ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry)); | 473 | ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry)); |
472 | free(qry); | 474 | free(qry); |
473 | } else | 475 | } else |
474 | ctx.qry.raw = ctx.qry.url; | 476 | ctx.qry.raw = ctx.qry.url; |
475 | cgit_parse_url(ctx.qry.url); | 477 | cgit_parse_url(ctx.qry.url); |
476 | } | 478 | } |
477 | 479 | ||
478 | ttl = calc_ttl(); | 480 | ttl = calc_ttl(); |
479 | ctx.page.expires += ttl*60; | 481 | ctx.page.expires += ttl*60; |
482 | if (method && !strcmp(method, "HEAD")) | ||
483 | ctx.cfg.nocache = 1; | ||
480 | if (ctx.cfg.nocache) | 484 | if (ctx.cfg.nocache) |
481 | ctx.cfg.cache_size = 0; | 485 | ctx.cfg.cache_size = 0; |
482 | err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root, | 486 | err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root, |
483 | ctx.qry.raw, ttl, process_request, &ctx); | 487 | ctx.qry.raw, ttl, process_request, &ctx); |
484 | if (err) | 488 | if (err) |
485 | cgit_print_error(fmt("Error processing page: %s (%d)", | 489 | cgit_print_error(fmt("Error processing page: %s (%d)", |
486 | strerror(err), err)); | 490 | strerror(err), err)); |
487 | return err; | 491 | return err; |
488 | } | 492 | } |
@@ -171,24 +171,25 @@ struct cgit_config { | |||
171 | int summary_branches; | 171 | int summary_branches; |
172 | int summary_log; | 172 | int summary_log; |
173 | int summary_tags; | 173 | int summary_tags; |
174 | }; | 174 | }; |
175 | 175 | ||
176 | struct cgit_page { | 176 | struct cgit_page { |
177 | time_t modified; | 177 | time_t modified; |
178 | time_t expires; | 178 | time_t expires; |
179 | size_t size; | 179 | size_t size; |
180 | char *mimetype; | 180 | char *mimetype; |
181 | char *charset; | 181 | char *charset; |
182 | char *filename; | 182 | char *filename; |
183 | char *etag; | ||
183 | char *title; | 184 | char *title; |
184 | int status; | 185 | int status; |
185 | char *statusmsg; | 186 | char *statusmsg; |
186 | }; | 187 | }; |
187 | 188 | ||
188 | struct cgit_context { | 189 | struct cgit_context { |
189 | struct cgit_query qry; | 190 | struct cgit_query qry; |
190 | struct cgit_config cfg; | 191 | struct cgit_config cfg; |
191 | struct cgit_repo *repo; | 192 | struct cgit_repo *repo; |
192 | struct cgit_page page; | 193 | struct cgit_page page; |
193 | }; | 194 | }; |
194 | 195 | ||
@@ -28,24 +28,25 @@ static void print_object(const unsigned char *sha1, const char *path) | |||
28 | 28 | ||
29 | buf = read_sha1_file(sha1, &type, &size); | 29 | buf = read_sha1_file(sha1, &type, &size); |
30 | if (!buf) { | 30 | if (!buf) { |
31 | html_status(404, "Not found", 0); | 31 | html_status(404, "Not found", 0); |
32 | return; | 32 | return; |
33 | } | 33 | } |
34 | if (buffer_is_binary(buf, size)) | 34 | if (buffer_is_binary(buf, size)) |
35 | ctx.page.mimetype = "application/octet-stream"; | 35 | ctx.page.mimetype = "application/octet-stream"; |
36 | else | 36 | else |
37 | ctx.page.mimetype = "text/plain"; | 37 | ctx.page.mimetype = "text/plain"; |
38 | ctx.page.filename = fmt("%s", path); | 38 | ctx.page.filename = fmt("%s", path); |
39 | ctx.page.size = size; | 39 | ctx.page.size = size; |
40 | ctx.page.etag = sha1_to_hex(sha1); | ||
40 | cgit_print_http_headers(&ctx); | 41 | cgit_print_http_headers(&ctx); |
41 | html_raw(buf, size); | 42 | html_raw(buf, size); |
42 | match = 1; | 43 | match = 1; |
43 | } | 44 | } |
44 | 45 | ||
45 | static int walk_tree(const unsigned char *sha1, const char *base, int baselen, | 46 | static int walk_tree(const unsigned char *sha1, const char *base, int baselen, |
46 | const char *pathname, unsigned mode, int stage, | 47 | const char *pathname, unsigned mode, int stage, |
47 | void *cbdata) | 48 | void *cbdata) |
48 | { | 49 | { |
49 | if (S_ISDIR(mode)) | 50 | if (S_ISDIR(mode)) |
50 | return READ_TREE_RECURSIVE; | 51 | return READ_TREE_RECURSIVE; |
51 | 52 | ||
diff --git a/ui-shared.c b/ui-shared.c index 29036d0..10be3c0 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -458,39 +458,45 @@ void cgit_print_age(time_t t, time_t max_relative, char *format) | |||
458 | } | 458 | } |
459 | if (secs < TM_YEAR * 2) { | 459 | if (secs < TM_YEAR * 2) { |
460 | htmlf("<span class='age-months'>%.0f months</span>", | 460 | htmlf("<span class='age-months'>%.0f months</span>", |
461 | secs * 1.0 / TM_MONTH); | 461 | secs * 1.0 / TM_MONTH); |
462 | return; | 462 | return; |
463 | } | 463 | } |
464 | htmlf("<span class='age-years'>%.0f years</span>", | 464 | htmlf("<span class='age-years'>%.0f years</span>", |
465 | secs * 1.0 / TM_YEAR); | 465 | secs * 1.0 / TM_YEAR); |
466 | } | 466 | } |
467 | 467 | ||
468 | void cgit_print_http_headers(struct cgit_context *ctx) | 468 | void cgit_print_http_headers(struct cgit_context *ctx) |
469 | { | 469 | { |
470 | const char *method = getenv("REQUEST_METHOD"); | ||
471 | |||
470 | if (ctx->page.status) | 472 | if (ctx->page.status) |
471 | htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg); | 473 | htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg); |
472 | if (ctx->page.mimetype && ctx->page.charset) | 474 | if (ctx->page.mimetype && ctx->page.charset) |
473 | htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, | 475 | htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, |
474 | ctx->page.charset); | 476 | ctx->page.charset); |
475 | else if (ctx->page.mimetype) | 477 | else if (ctx->page.mimetype) |
476 | htmlf("Content-Type: %s\n", ctx->page.mimetype); | 478 | htmlf("Content-Type: %s\n", ctx->page.mimetype); |
477 | if (ctx->page.size) | 479 | if (ctx->page.size) |
478 | htmlf("Content-Length: %ld\n", ctx->page.size); | 480 | htmlf("Content-Length: %ld\n", ctx->page.size); |
479 | if (ctx->page.filename) | 481 | if (ctx->page.filename) |
480 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", | 482 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", |
481 | ctx->page.filename); | 483 | ctx->page.filename); |
482 | htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); | 484 | htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); |
483 | htmlf("Expires: %s\n", http_date(ctx->page.expires)); | 485 | htmlf("Expires: %s\n", http_date(ctx->page.expires)); |
486 | if (ctx->page.etag) | ||
487 | htmlf("ETag: \"%s\"\n", ctx->page.etag); | ||
484 | html("\n"); | 488 | html("\n"); |
489 | if (method && !strcmp(method, "HEAD")) | ||
490 | exit(0); | ||
485 | } | 491 | } |
486 | 492 | ||
487 | void cgit_print_docstart(struct cgit_context *ctx) | 493 | void cgit_print_docstart(struct cgit_context *ctx) |
488 | { | 494 | { |
489 | char *host = cgit_hosturl(); | 495 | char *host = cgit_hosturl(); |
490 | html(cgit_doctype); | 496 | html(cgit_doctype); |
491 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); | 497 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); |
492 | html("<head>\n"); | 498 | html("<head>\n"); |
493 | html("<title>"); | 499 | html("<title>"); |
494 | html_txt(ctx->page.title); | 500 | html_txt(ctx->page.title); |
495 | html("</title>\n"); | 501 | html("</title>\n"); |
496 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); | 502 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); |