From mboxrd@z Thu Jan 1 00:00:00 1970 From: peter at colberg.org (Peter Colberg) Date: Tue, 8 Dec 2015 12:53:09 -0500 Subject: [PATCH v2 2/2] ui-repolist: return HTTP 404 if no repositories found In-Reply-To: <1449597189-18086-1-git-send-email-peter@colberg.org> References: <20151207202819.GA1581@serenity.lan> <1449597189-18086-1-git-send-email-peter@colberg.org> Message-ID: <1449597189-18086-3-git-send-email-peter@colberg.org> Return HTTP status code 404 Not found when querying a non-existent repository, which signals to search engines that a repository no longer exists. Further, some webservers such as nginx permit logging requests to different files depending on the HTTP code. Signed-off-by: Peter Colberg --- ui-repolist.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/ui-repolist.c b/ui-repolist.c index f3f5353..95abb8d 100644 --- a/ui-repolist.c +++ b/ui-repolist.c @@ -115,6 +115,20 @@ static int is_visible(struct cgit_repo *repo) return 1; } +static int any_repos_visible() +{ + struct cgit_repo *repo; + int i; + + for (i = 0; i < cgit_repolist.count; i++) { + repo = &cgit_repolist.repos[i]; + if (is_visible(repo)) { + return 1; + } + } + return 0; +} + static void print_sort_header(const char *title, const char *sort) { char *currenturl = cgit_currenturl(); @@ -266,6 +280,11 @@ void cgit_print_repolist(void) char *section; int sorted = 0; + if (!any_repos_visible()) { + cgit_print_error_page(404, "Not found", "No repositories found"); + return; + } + if (ctx.cfg.enable_index_links) ++columns; if (ctx.cfg.enable_index_owner) @@ -347,9 +366,7 @@ void cgit_print_repolist(void) html("\n"); } html(""); - if (!hits) - cgit_print_error("No repositories found"); - else if (hits > ctx.cfg.max_repo_count) + if (hits > ctx.cfg.max_repo_count) print_pager(hits, ctx.cfg.max_repo_count, ctx.qry.search, ctx.qry.sort); cgit_print_docend(); } -- 2.6.2