|
diff --git a/cgit.c b/cgit.c index ad62d10..af9832f 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -634,85 +634,86 @@ static void cgit_parse_args(int argc, const char **argv) |
634 | */ |
634 | */ |
635 | ctx.cfg.snapshots = 0xFF; |
635 | ctx.cfg.snapshots = 0xFF; |
636 | scan++; |
636 | scan++; |
637 | scan_tree(argv[i] + 12, repo_config); |
637 | scan_tree(argv[i] + 12, repo_config); |
638 | } |
638 | } |
639 | } |
639 | } |
640 | if (scan) { |
640 | if (scan) { |
641 | qsort(cgit_repolist.repos, cgit_repolist.count, |
641 | qsort(cgit_repolist.repos, cgit_repolist.count, |
642 | sizeof(struct cgit_repo), cmp_repos); |
642 | sizeof(struct cgit_repo), cmp_repos); |
643 | print_repolist(stdout, &cgit_repolist, 0); |
643 | print_repolist(stdout, &cgit_repolist, 0); |
644 | exit(0); |
644 | exit(0); |
645 | } |
645 | } |
646 | } |
646 | } |
647 | |
647 | |
648 | static int calc_ttl() |
648 | static int calc_ttl() |
649 | { |
649 | { |
650 | if (!ctx.repo) |
650 | if (!ctx.repo) |
651 | return ctx.cfg.cache_root_ttl; |
651 | return ctx.cfg.cache_root_ttl; |
652 | |
652 | |
653 | if (!ctx.qry.page) |
653 | if (!ctx.qry.page) |
654 | return ctx.cfg.cache_repo_ttl; |
654 | return ctx.cfg.cache_repo_ttl; |
655 | |
655 | |
656 | if (ctx.qry.has_symref) |
656 | if (ctx.qry.has_symref) |
657 | return ctx.cfg.cache_dynamic_ttl; |
657 | return ctx.cfg.cache_dynamic_ttl; |
658 | |
658 | |
659 | if (ctx.qry.has_sha1) |
659 | if (ctx.qry.has_sha1) |
660 | return ctx.cfg.cache_static_ttl; |
660 | return ctx.cfg.cache_static_ttl; |
661 | |
661 | |
662 | return ctx.cfg.cache_repo_ttl; |
662 | return ctx.cfg.cache_repo_ttl; |
663 | } |
663 | } |
664 | |
664 | |
665 | int main(int argc, const char **argv) |
665 | int main(int argc, const char **argv) |
666 | { |
666 | { |
667 | const char *path; |
667 | const char *path; |
668 | char *qry; |
668 | char *qry; |
669 | int err, ttl; |
669 | int err, ttl; |
670 | |
670 | |
671 | prepare_context(&ctx); |
671 | prepare_context(&ctx); |
672 | cgit_repolist.length = 0; |
672 | cgit_repolist.length = 0; |
673 | cgit_repolist.count = 0; |
673 | cgit_repolist.count = 0; |
674 | cgit_repolist.repos = NULL; |
674 | cgit_repolist.repos = NULL; |
675 | |
675 | |
676 | cgit_parse_args(argc, argv); |
676 | cgit_parse_args(argc, argv); |
677 | parse_configfile(ctx.env.cgit_config, config_cb); |
677 | parse_configfile(ctx.env.cgit_config, config_cb); |
678 | ctx.repo = NULL; |
678 | ctx.repo = NULL; |
679 | http_parse_querystring(ctx.qry.raw, querystring_cb); |
679 | http_parse_querystring(ctx.qry.raw, querystring_cb); |
680 | |
680 | |
681 | /* If virtual-root isn't specified in cgitrc, lets pretend |
681 | /* If virtual-root isn't specified in cgitrc, lets pretend |
682 | * that virtual-root equals SCRIPT_NAME. |
682 | * that virtual-root equals SCRIPT_NAME, minus any possibly |
| |
683 | * trailing slashes. |
683 | */ |
684 | */ |
684 | if (!ctx.cfg.virtual_root) |
685 | if (!ctx.cfg.virtual_root) |
685 | ctx.cfg.virtual_root = ctx.cfg.script_name; |
686 | ctx.cfg.virtual_root = trim_end(ctx.cfg.script_name, '/'); |
686 | |
687 | |
687 | /* If no url parameter is specified on the querystring, lets |
688 | /* If no url parameter is specified on the querystring, lets |
688 | * use PATH_INFO as url. This allows cgit to work with virtual |
689 | * use PATH_INFO as url. This allows cgit to work with virtual |
689 | * urls without the need for rewriterules in the webserver (as |
690 | * urls without the need for rewriterules in the webserver (as |
690 | * long as PATH_INFO is included in the cache lookup key). |
691 | * long as PATH_INFO is included in the cache lookup key). |
691 | */ |
692 | */ |
692 | path = ctx.env.path_info; |
693 | path = ctx.env.path_info; |
693 | if (!ctx.qry.url && path) { |
694 | if (!ctx.qry.url && path) { |
694 | if (path[0] == '/') |
695 | if (path[0] == '/') |
695 | path++; |
696 | path++; |
696 | ctx.qry.url = xstrdup(path); |
697 | ctx.qry.url = xstrdup(path); |
697 | if (ctx.qry.raw) { |
698 | if (ctx.qry.raw) { |
698 | qry = ctx.qry.raw; |
699 | qry = ctx.qry.raw; |
699 | ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry)); |
700 | ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry)); |
700 | free(qry); |
701 | free(qry); |
701 | } else |
702 | } else |
702 | ctx.qry.raw = xstrdup(ctx.qry.url); |
703 | ctx.qry.raw = xstrdup(ctx.qry.url); |
703 | cgit_parse_url(ctx.qry.url); |
704 | cgit_parse_url(ctx.qry.url); |
704 | } |
705 | } |
705 | |
706 | |
706 | ttl = calc_ttl(); |
707 | ttl = calc_ttl(); |
707 | ctx.page.expires += ttl*60; |
708 | ctx.page.expires += ttl*60; |
708 | if (ctx.env.request_method && !strcmp(ctx.env.request_method, "HEAD")) |
709 | if (ctx.env.request_method && !strcmp(ctx.env.request_method, "HEAD")) |
709 | ctx.cfg.nocache = 1; |
710 | ctx.cfg.nocache = 1; |
710 | if (ctx.cfg.nocache) |
711 | if (ctx.cfg.nocache) |
711 | ctx.cfg.cache_size = 0; |
712 | ctx.cfg.cache_size = 0; |
712 | err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root, |
713 | err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root, |
713 | ctx.qry.raw, ttl, process_request, &ctx); |
714 | ctx.qry.raw, ttl, process_request, &ctx); |
714 | if (err) |
715 | if (err) |
715 | cgit_print_error(fmt("Error processing page: %s (%d)", |
716 | cgit_print_error(fmt("Error processing page: %s (%d)", |
716 | strerror(err), err)); |
717 | strerror(err), err)); |
717 | return err; |
718 | return err; |
718 | } |
719 | } |
|