author | Lars Hjemli <hjemli@gmail.com> | 2009-02-19 22:24:15 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-02-19 22:24:15 (UTC) |
commit | 3ff58ddd51bcbcbc9b7649bad1a39aa98af4b49f (patch) (unidiff) | |
tree | 4ff1b54dfb2fc025771f39528165e9e46d93a0e0 /ui-shared.c | |
parent | 488a214a81a25c6397c56822ed1713f51dddc520 (diff) | |
download | cgit-3ff58ddd51bcbcbc9b7649bad1a39aa98af4b49f.zip cgit-3ff58ddd51bcbcbc9b7649bad1a39aa98af4b49f.tar.gz cgit-3ff58ddd51bcbcbc9b7649bad1a39aa98af4b49f.tar.bz2 |
Add support for HEAD requests
This is a quick 'n dirty hack which makes cgit honor HEAD requests.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-shared.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ui-shared.c b/ui-shared.c index 86a7d29..0dafc83 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -331,271 +331,275 @@ void cgit_commit_link(char *name, char *title, char *class, char *head, | |||
331 | 331 | ||
332 | void cgit_refs_link(char *name, char *title, char *class, char *head, | 332 | void cgit_refs_link(char *name, char *title, char *class, char *head, |
333 | char *rev, char *path) | 333 | char *rev, char *path) |
334 | { | 334 | { |
335 | reporevlink("refs", name, title, class, head, rev, path); | 335 | reporevlink("refs", name, title, class, head, rev, path); |
336 | } | 336 | } |
337 | 337 | ||
338 | void cgit_snapshot_link(char *name, char *title, char *class, char *head, | 338 | void cgit_snapshot_link(char *name, char *title, char *class, char *head, |
339 | char *rev, char *archivename) | 339 | char *rev, char *archivename) |
340 | { | 340 | { |
341 | reporevlink("snapshot", name, title, class, head, rev, archivename); | 341 | reporevlink("snapshot", name, title, class, head, rev, archivename); |
342 | } | 342 | } |
343 | 343 | ||
344 | void cgit_diff_link(char *name, char *title, char *class, char *head, | 344 | void cgit_diff_link(char *name, char *title, char *class, char *head, |
345 | char *new_rev, char *old_rev, char *path) | 345 | char *new_rev, char *old_rev, char *path) |
346 | { | 346 | { |
347 | char *delim; | 347 | char *delim; |
348 | 348 | ||
349 | delim = repolink(title, class, "diff", head, path); | 349 | delim = repolink(title, class, "diff", head, path); |
350 | if (new_rev && strcmp(new_rev, ctx.qry.head)) { | 350 | if (new_rev && strcmp(new_rev, ctx.qry.head)) { |
351 | html(delim); | 351 | html(delim); |
352 | html("id="); | 352 | html("id="); |
353 | html_url_arg(new_rev); | 353 | html_url_arg(new_rev); |
354 | delim = "&"; | 354 | delim = "&"; |
355 | } | 355 | } |
356 | if (old_rev) { | 356 | if (old_rev) { |
357 | html(delim); | 357 | html(delim); |
358 | html("id2="); | 358 | html("id2="); |
359 | html_url_arg(old_rev); | 359 | html_url_arg(old_rev); |
360 | } | 360 | } |
361 | html("'>"); | 361 | html("'>"); |
362 | html_txt(name); | 362 | html_txt(name); |
363 | html("</a>"); | 363 | html("</a>"); |
364 | } | 364 | } |
365 | 365 | ||
366 | void cgit_patch_link(char *name, char *title, char *class, char *head, | 366 | void cgit_patch_link(char *name, char *title, char *class, char *head, |
367 | char *rev) | 367 | char *rev) |
368 | { | 368 | { |
369 | reporevlink("patch", name, title, class, head, rev, NULL); | 369 | reporevlink("patch", name, title, class, head, rev, NULL); |
370 | } | 370 | } |
371 | 371 | ||
372 | void cgit_stats_link(char *name, char *title, char *class, char *head, | 372 | void cgit_stats_link(char *name, char *title, char *class, char *head, |
373 | char *path) | 373 | char *path) |
374 | { | 374 | { |
375 | reporevlink("stats", name, title, class, head, NULL, path); | 375 | reporevlink("stats", name, title, class, head, NULL, path); |
376 | } | 376 | } |
377 | 377 | ||
378 | void cgit_object_link(struct object *obj) | 378 | void cgit_object_link(struct object *obj) |
379 | { | 379 | { |
380 | char *page, *shortrev, *fullrev, *name; | 380 | char *page, *shortrev, *fullrev, *name; |
381 | 381 | ||
382 | fullrev = sha1_to_hex(obj->sha1); | 382 | fullrev = sha1_to_hex(obj->sha1); |
383 | shortrev = xstrdup(fullrev); | 383 | shortrev = xstrdup(fullrev); |
384 | shortrev[10] = '\0'; | 384 | shortrev[10] = '\0'; |
385 | if (obj->type == OBJ_COMMIT) { | 385 | if (obj->type == OBJ_COMMIT) { |
386 | cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL, | 386 | cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL, |
387 | ctx.qry.head, fullrev); | 387 | ctx.qry.head, fullrev); |
388 | return; | 388 | return; |
389 | } else if (obj->type == OBJ_TREE) | 389 | } else if (obj->type == OBJ_TREE) |
390 | page = "tree"; | 390 | page = "tree"; |
391 | else if (obj->type == OBJ_TAG) | 391 | else if (obj->type == OBJ_TAG) |
392 | page = "tag"; | 392 | page = "tag"; |
393 | else | 393 | else |
394 | page = "blob"; | 394 | page = "blob"; |
395 | name = fmt("%s %s...", typename(obj->type), shortrev); | 395 | name = fmt("%s %s...", typename(obj->type), shortrev); |
396 | reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL); | 396 | reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL); |
397 | } | 397 | } |
398 | 398 | ||
399 | void cgit_print_date(time_t secs, char *format, int local_time) | 399 | void cgit_print_date(time_t secs, char *format, int local_time) |
400 | { | 400 | { |
401 | char buf[64]; | 401 | char buf[64]; |
402 | struct tm *time; | 402 | struct tm *time; |
403 | 403 | ||
404 | if (!secs) | 404 | if (!secs) |
405 | return; | 405 | return; |
406 | if(local_time) | 406 | if(local_time) |
407 | time = localtime(&secs); | 407 | time = localtime(&secs); |
408 | else | 408 | else |
409 | time = gmtime(&secs); | 409 | time = gmtime(&secs); |
410 | strftime(buf, sizeof(buf)-1, format, time); | 410 | strftime(buf, sizeof(buf)-1, format, time); |
411 | html_txt(buf); | 411 | html_txt(buf); |
412 | } | 412 | } |
413 | 413 | ||
414 | void cgit_print_age(time_t t, time_t max_relative, char *format) | 414 | void cgit_print_age(time_t t, time_t max_relative, char *format) |
415 | { | 415 | { |
416 | time_t now, secs; | 416 | time_t now, secs; |
417 | 417 | ||
418 | if (!t) | 418 | if (!t) |
419 | return; | 419 | return; |
420 | time(&now); | 420 | time(&now); |
421 | secs = now - t; | 421 | secs = now - t; |
422 | 422 | ||
423 | if (secs > max_relative && max_relative >= 0) { | 423 | if (secs > max_relative && max_relative >= 0) { |
424 | cgit_print_date(t, format, ctx.cfg.local_time); | 424 | cgit_print_date(t, format, ctx.cfg.local_time); |
425 | return; | 425 | return; |
426 | } | 426 | } |
427 | 427 | ||
428 | if (secs < TM_HOUR * 2) { | 428 | if (secs < TM_HOUR * 2) { |
429 | htmlf("<span class='age-mins'>%.0f min.</span>", | 429 | htmlf("<span class='age-mins'>%.0f min.</span>", |
430 | secs * 1.0 / TM_MIN); | 430 | secs * 1.0 / TM_MIN); |
431 | return; | 431 | return; |
432 | } | 432 | } |
433 | if (secs < TM_DAY * 2) { | 433 | if (secs < TM_DAY * 2) { |
434 | htmlf("<span class='age-hours'>%.0f hours</span>", | 434 | htmlf("<span class='age-hours'>%.0f hours</span>", |
435 | secs * 1.0 / TM_HOUR); | 435 | secs * 1.0 / TM_HOUR); |
436 | return; | 436 | return; |
437 | } | 437 | } |
438 | if (secs < TM_WEEK * 2) { | 438 | if (secs < TM_WEEK * 2) { |
439 | htmlf("<span class='age-days'>%.0f days</span>", | 439 | htmlf("<span class='age-days'>%.0f days</span>", |
440 | secs * 1.0 / TM_DAY); | 440 | secs * 1.0 / TM_DAY); |
441 | return; | 441 | return; |
442 | } | 442 | } |
443 | if (secs < TM_MONTH * 2) { | 443 | if (secs < TM_MONTH * 2) { |
444 | htmlf("<span class='age-weeks'>%.0f weeks</span>", | 444 | htmlf("<span class='age-weeks'>%.0f weeks</span>", |
445 | secs * 1.0 / TM_WEEK); | 445 | secs * 1.0 / TM_WEEK); |
446 | return; | 446 | return; |
447 | } | 447 | } |
448 | if (secs < TM_YEAR * 2) { | 448 | if (secs < TM_YEAR * 2) { |
449 | htmlf("<span class='age-months'>%.0f months</span>", | 449 | htmlf("<span class='age-months'>%.0f months</span>", |
450 | secs * 1.0 / TM_MONTH); | 450 | secs * 1.0 / TM_MONTH); |
451 | return; | 451 | return; |
452 | } | 452 | } |
453 | htmlf("<span class='age-years'>%.0f years</span>", | 453 | htmlf("<span class='age-years'>%.0f years</span>", |
454 | secs * 1.0 / TM_YEAR); | 454 | secs * 1.0 / TM_YEAR); |
455 | } | 455 | } |
456 | 456 | ||
457 | void cgit_print_http_headers(struct cgit_context *ctx) | 457 | void cgit_print_http_headers(struct cgit_context *ctx) |
458 | { | 458 | { |
459 | const char *method = getenv("REQUEST_METHOD"); | ||
460 | |||
459 | if (ctx->page.mimetype && ctx->page.charset) | 461 | if (ctx->page.mimetype && ctx->page.charset) |
460 | htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, | 462 | htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, |
461 | ctx->page.charset); | 463 | ctx->page.charset); |
462 | else if (ctx->page.mimetype) | 464 | else if (ctx->page.mimetype) |
463 | htmlf("Content-Type: %s\n", ctx->page.mimetype); | 465 | htmlf("Content-Type: %s\n", ctx->page.mimetype); |
464 | if (ctx->page.size) | 466 | if (ctx->page.size) |
465 | htmlf("Content-Length: %ld\n", ctx->page.size); | 467 | htmlf("Content-Length: %ld\n", ctx->page.size); |
466 | if (ctx->page.filename) | 468 | if (ctx->page.filename) |
467 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", | 469 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", |
468 | ctx->page.filename); | 470 | ctx->page.filename); |
469 | htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); | 471 | htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); |
470 | htmlf("Expires: %s\n", http_date(ctx->page.expires)); | 472 | htmlf("Expires: %s\n", http_date(ctx->page.expires)); |
471 | if (ctx->page.etag) | 473 | if (ctx->page.etag) |
472 | htmlf("ETag: \"%s\"\n", ctx->page.etag); | 474 | htmlf("ETag: \"%s\"\n", ctx->page.etag); |
473 | html("\n"); | 475 | html("\n"); |
476 | if (method && !strcmp(method, "HEAD")) | ||
477 | exit(0); | ||
474 | } | 478 | } |
475 | 479 | ||
476 | void cgit_print_docstart(struct cgit_context *ctx) | 480 | void cgit_print_docstart(struct cgit_context *ctx) |
477 | { | 481 | { |
478 | char *host = cgit_hosturl(); | 482 | char *host = cgit_hosturl(); |
479 | html(cgit_doctype); | 483 | html(cgit_doctype); |
480 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); | 484 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); |
481 | html("<head>\n"); | 485 | html("<head>\n"); |
482 | html("<title>"); | 486 | html("<title>"); |
483 | html_txt(ctx->page.title); | 487 | html_txt(ctx->page.title); |
484 | html("</title>\n"); | 488 | html("</title>\n"); |
485 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); | 489 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); |
486 | if (ctx->cfg.robots && *ctx->cfg.robots) | 490 | if (ctx->cfg.robots && *ctx->cfg.robots) |
487 | htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); | 491 | htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); |
488 | html("<link rel='stylesheet' type='text/css' href='"); | 492 | html("<link rel='stylesheet' type='text/css' href='"); |
489 | html_attr(ctx->cfg.css); | 493 | html_attr(ctx->cfg.css); |
490 | html("'/>\n"); | 494 | html("'/>\n"); |
491 | if (ctx->cfg.favicon) { | 495 | if (ctx->cfg.favicon) { |
492 | html("<link rel='shortcut icon' href='"); | 496 | html("<link rel='shortcut icon' href='"); |
493 | html_attr(ctx->cfg.favicon); | 497 | html_attr(ctx->cfg.favicon); |
494 | html("'/>\n"); | 498 | html("'/>\n"); |
495 | } | 499 | } |
496 | if (host && ctx->repo) { | 500 | if (host && ctx->repo) { |
497 | html("<link rel='alternate' title='Atom feed' href='http://"); | 501 | html("<link rel='alternate' title='Atom feed' href='http://"); |
498 | html_attr(cgit_hosturl()); | 502 | html_attr(cgit_hosturl()); |
499 | html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path, | 503 | html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path, |
500 | fmt("h=%s", ctx->qry.head))); | 504 | fmt("h=%s", ctx->qry.head))); |
501 | html("' type='application/atom+xml'/>"); | 505 | html("' type='application/atom+xml'/>"); |
502 | } | 506 | } |
503 | html("</head>\n"); | 507 | html("</head>\n"); |
504 | html("<body>\n"); | 508 | html("<body>\n"); |
505 | if (ctx->cfg.header) | 509 | if (ctx->cfg.header) |
506 | html_include(ctx->cfg.header); | 510 | html_include(ctx->cfg.header); |
507 | } | 511 | } |
508 | 512 | ||
509 | void cgit_print_docend() | 513 | void cgit_print_docend() |
510 | { | 514 | { |
511 | html("</div>"); | 515 | html("</div>"); |
512 | if (ctx.cfg.footer) | 516 | if (ctx.cfg.footer) |
513 | html_include(ctx.cfg.footer); | 517 | html_include(ctx.cfg.footer); |
514 | else { | 518 | else { |
515 | htmlf("<div class='footer'>generated by cgit %s at ", | 519 | htmlf("<div class='footer'>generated by cgit %s at ", |
516 | cgit_version); | 520 | cgit_version); |
517 | cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); | 521 | cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); |
518 | html("</div>\n"); | 522 | html("</div>\n"); |
519 | } | 523 | } |
520 | html("</body>\n</html>\n"); | 524 | html("</body>\n</html>\n"); |
521 | } | 525 | } |
522 | 526 | ||
523 | int print_branch_option(const char *refname, const unsigned char *sha1, | 527 | int print_branch_option(const char *refname, const unsigned char *sha1, |
524 | int flags, void *cb_data) | 528 | int flags, void *cb_data) |
525 | { | 529 | { |
526 | char *name = (char *)refname; | 530 | char *name = (char *)refname; |
527 | html_option(name, name, ctx.qry.head); | 531 | html_option(name, name, ctx.qry.head); |
528 | return 0; | 532 | return 0; |
529 | } | 533 | } |
530 | 534 | ||
531 | int print_archive_ref(const char *refname, const unsigned char *sha1, | 535 | int print_archive_ref(const char *refname, const unsigned char *sha1, |
532 | int flags, void *cb_data) | 536 | int flags, void *cb_data) |
533 | { | 537 | { |
534 | struct tag *tag; | 538 | struct tag *tag; |
535 | struct taginfo *info; | 539 | struct taginfo *info; |
536 | struct object *obj; | 540 | struct object *obj; |
537 | char buf[256], *url; | 541 | char buf[256], *url; |
538 | unsigned char fileid[20]; | 542 | unsigned char fileid[20]; |
539 | int *header = (int *)cb_data; | 543 | int *header = (int *)cb_data; |
540 | 544 | ||
541 | if (prefixcmp(refname, "refs/archives")) | 545 | if (prefixcmp(refname, "refs/archives")) |
542 | return 0; | 546 | return 0; |
543 | strncpy(buf, refname+14, sizeof(buf)); | 547 | strncpy(buf, refname+14, sizeof(buf)); |
544 | obj = parse_object(sha1); | 548 | obj = parse_object(sha1); |
545 | if (!obj) | 549 | if (!obj) |
546 | return 1; | 550 | return 1; |
547 | if (obj->type == OBJ_TAG) { | 551 | if (obj->type == OBJ_TAG) { |
548 | tag = lookup_tag(sha1); | 552 | tag = lookup_tag(sha1); |
549 | if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) | 553 | if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) |
550 | return 0; | 554 | return 0; |
551 | hashcpy(fileid, tag->tagged->sha1); | 555 | hashcpy(fileid, tag->tagged->sha1); |
552 | } else if (obj->type != OBJ_BLOB) { | 556 | } else if (obj->type != OBJ_BLOB) { |
553 | return 0; | 557 | return 0; |
554 | } else { | 558 | } else { |
555 | hashcpy(fileid, sha1); | 559 | hashcpy(fileid, sha1); |
556 | } | 560 | } |
557 | if (!*header) { | 561 | if (!*header) { |
558 | html("<h1>download</h1>\n"); | 562 | html("<h1>download</h1>\n"); |
559 | *header = 1; | 563 | *header = 1; |
560 | } | 564 | } |
561 | url = cgit_pageurl(ctx.qry.repo, "blob", | 565 | url = cgit_pageurl(ctx.qry.repo, "blob", |
562 | fmt("id=%s&path=%s", sha1_to_hex(fileid), | 566 | fmt("id=%s&path=%s", sha1_to_hex(fileid), |
563 | buf)); | 567 | buf)); |
564 | html_link_open(url, NULL, "menu"); | 568 | html_link_open(url, NULL, "menu"); |
565 | html_txt(strlpart(buf, 20)); | 569 | html_txt(strlpart(buf, 20)); |
566 | html_link_close(); | 570 | html_link_close(); |
567 | return 0; | 571 | return 0; |
568 | } | 572 | } |
569 | 573 | ||
570 | void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page) | 574 | void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page) |
571 | { | 575 | { |
572 | char *url; | 576 | char *url; |
573 | 577 | ||
574 | if (!ctx.cfg.virtual_root) { | 578 | if (!ctx.cfg.virtual_root) { |
575 | url = fmt("%s/%s", ctx.qry.repo, page); | 579 | url = fmt("%s/%s", ctx.qry.repo, page); |
576 | if (ctx.qry.path) | 580 | if (ctx.qry.path) |
577 | url = fmt("%s/%s", url, ctx.qry.path); | 581 | url = fmt("%s/%s", url, ctx.qry.path); |
578 | html_hidden("url", url); | 582 | html_hidden("url", url); |
579 | } | 583 | } |
580 | 584 | ||
581 | if (incl_head && ctx.qry.head && ctx.repo->defbranch && | 585 | if (incl_head && ctx.qry.head && ctx.repo->defbranch && |
582 | strcmp(ctx.qry.head, ctx.repo->defbranch)) | 586 | strcmp(ctx.qry.head, ctx.repo->defbranch)) |
583 | html_hidden("h", ctx.qry.head); | 587 | html_hidden("h", ctx.qry.head); |
584 | 588 | ||
585 | if (ctx.qry.sha1) | 589 | if (ctx.qry.sha1) |
586 | html_hidden("id", ctx.qry.sha1); | 590 | html_hidden("id", ctx.qry.sha1); |
587 | if (ctx.qry.sha2) | 591 | if (ctx.qry.sha2) |
588 | html_hidden("id2", ctx.qry.sha2); | 592 | html_hidden("id2", ctx.qry.sha2); |
589 | if (ctx.qry.showmsg) | 593 | if (ctx.qry.showmsg) |
590 | html_hidden("showmsg", "1"); | 594 | html_hidden("showmsg", "1"); |
591 | 595 | ||
592 | if (incl_search) { | 596 | if (incl_search) { |
593 | if (ctx.qry.grep) | 597 | if (ctx.qry.grep) |
594 | html_hidden("qt", ctx.qry.grep); | 598 | html_hidden("qt", ctx.qry.grep); |
595 | if (ctx.qry.search) | 599 | if (ctx.qry.search) |
596 | html_hidden("q", ctx.qry.search); | 600 | html_hidden("q", ctx.qry.search); |
597 | } | 601 | } |
598 | } | 602 | } |
599 | 603 | ||
600 | const char *fallback_cmd = "repolist"; | 604 | const char *fallback_cmd = "repolist"; |
601 | 605 | ||