List for cgit developers and users
 help / color / mirror / Atom feed
From: peter at colberg.org (Peter Colberg)
Subject: [PATCH v2 2/2] ui-repolist: return HTTP 404 if no repositories found
Date: Tue,  8 Dec 2015 12:53:09 -0500	[thread overview]
Message-ID: <1449597189-18086-3-git-send-email-peter@colberg.org> (raw)
In-Reply-To: <1449597189-18086-1-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 <peter at colberg.org>
---
 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("</tr>\n");
 	}
 	html("</table>");
-	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



  parent reply	other threads:[~2015-12-08 17:53 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-07 19:28 [PATCH] " peter
2015-12-07 19:28 ` peter
2015-12-07 20:28   ` john
2015-12-08 17:53     ` [PATCH v2 0/2] " peter
2015-12-08 17:53       ` [PATCH v2 1/2] ui-repolist: extract repo visibility criteria to separate function peter
2016-01-13 16:15         ` Jason
2015-12-08 17:53       ` peter [this message]
2016-01-13 16:21         ` [PATCH v2 2/2] ui-repolist: return HTTP 404 if no repositories found Jason
2016-01-13 22:25           ` peter
2016-01-13 22:25             ` [PATCH 1/2] Compile with -Wstrict-prototypes -Wmissing-prototypes peter
2016-01-13 23:29               ` john
2016-01-14 13:01                 ` Jason
2016-01-14 13:12                   ` mailings
2016-01-14 13:32                   ` john
2016-01-14 13:35                     ` Jason
2016-01-13 22:25             ` [PATCH 2/2] Fix missing prototype declarations peter
2016-01-14 13:02               ` Jason

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1449597189-18086-3-git-send-email-peter@colberg.org \
    --to=cgit@lists.zx2c4.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).