Use TTL-settings even in nocache mode

[ps-cgit] / cgit.c

diff --git a/cgit.c b/cgit.c
index ac434410a484d9f06c4bec3cf96c0af352c0a4eb..5dcba768f0baefe15196053799c0d53b498b126e 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -16,7 +16,7 @@ static void cgit_print_repo_page(struct cacheitem *item)
            cgit_read_config("info/cgit", cgit_repo_config_cb)) {
                char *title = fmt("%s - %s", cgit_root_title, "Bad request");
                cgit_print_docstart(title, item);
            cgit_read_config("info/cgit", cgit_repo_config_cb)) {
                char *title = fmt("%s - %s", cgit_root_title, "Bad request");
                cgit_print_docstart(title, item);

-               cgit_print_pageheader(title);
+               cgit_print_pageheader(title, 0);

                cgit_print_error(fmt("Unable to scan repository: %s",
                                     strerror(errno)));
                cgit_print_docend();
                cgit_print_error(fmt("Unable to scan repository: %s",
                                     strerror(errno)));
                cgit_print_docend();


@@ -24,12 +24,15 @@ static void cgit_print_repo_page(struct cacheitem *item)
        }
        setenv("GIT_DIR", fmt("%s/%s", cgit_root, cgit_query_repo), 1);
        char *title = fmt("%s - %s", cgit_repo_name, cgit_repo_desc);
        }
        setenv("GIT_DIR", fmt("%s/%s", cgit_root, cgit_query_repo), 1);
        char *title = fmt("%s - %s", cgit_repo_name, cgit_repo_desc);

+       int show_search = 0;
+       if (cgit_query_page && !strcmp(cgit_query_page, "log"))
+               show_search = 1;

        cgit_print_docstart(title, item);
        cgit_print_docstart(title, item);

-       cgit_print_pageheader(title);
+       cgit_print_pageheader(title, show_search);

        if (!cgit_query_page) {
                cgit_print_summary();
        } else if (!strcmp(cgit_query_page, "log")) {
        if (!cgit_query_page) {
                cgit_print_summary();
        } else if (!strcmp(cgit_query_page, "log")) {

-               cgit_print_log(cgit_query_head, cgit_query_ofs, 100);
+               cgit_print_log(cgit_query_head, cgit_query_ofs, 100, cgit_query_search);

        } else if (!strcmp(cgit_query_page, "tree")) {
                cgit_print_tree(cgit_query_sha1);
        } else if (!strcmp(cgit_query_page, "commit")) {
        } else if (!strcmp(cgit_query_page, "tree")) {
                cgit_print_tree(cgit_query_sha1);
        } else if (!strcmp(cgit_query_page, "commit")) {


@@ -150,6 +153,7 @@ int main(int argc, const char **argv)
        cgit_parse_query(cgit_querystring, cgit_querystring_cb);
 
        if (cgit_nocache) {
        cgit_parse_query(cgit_querystring, cgit_querystring_cb);
 
        if (cgit_nocache) {

+               cache_prepare(&item);

                item.fd = STDOUT_FILENO;
                cgit_fill_cache(&item);
        } else {
                item.fd = STDOUT_FILENO;
                cgit_fill_cache(&item);
        } else {