From: john at keeping.me.uk (John Keeping)
Subject: [PATCH v2 02/22] cgit: use cgit_print_error_page() where appropriate
Date: Fri, 14 Aug 2015 12:47:02 +0100 [thread overview]
Message-ID: <a57bc125eb85d0b1256e85406b273e784439d5ff.1439552492.git.john@keeping.me.uk> (raw)
In-Reply-To: <cover.1439552492.git.john@keeping.me.uk>
These are more-or-less one-to-one translations but in the final hunk we
gain an HTTP error code where we used to send "200 OK", which is an
improvement.
Signed-off-by: John Keeping <john at keeping.me.uk>
---
cgit.c | 27 +++++++--------------------
1 file changed, 7 insertions(+), 20 deletions(-)
diff --git a/cgit.c b/cgit.c
index d84b4be..3a97563 100644
--- a/cgit.c
+++ b/cgit.c
@@ -614,13 +614,8 @@ static int prepare_repo_cmd(void)
if (get_sha1(ctx.qry.head, sha1)) {
char *tmp = xstrdup(ctx.qry.head);
ctx.qry.head = ctx.repo->defbranch;
- ctx.page.status = 404;
- ctx.page.statusmsg = "Not found";
- cgit_print_http_headers();
- cgit_print_docstart();
- cgit_print_pageheader();
- cgit_print_error("Invalid branch: %s", tmp);
- cgit_print_docend();
+ cgit_print_error_page(404, "Not found",
+ "Invalid branch: %s", tmp);
free(tmp);
return 1;
}
@@ -713,18 +708,13 @@ static void process_request(void)
cmd = cgit_get_cmd();
if (!cmd) {
ctx.page.title = "cgit error";
- ctx.page.status = 404;
- ctx.page.statusmsg = "Not found";
- cgit_print_http_headers();
- cgit_print_docstart();
- cgit_print_pageheader();
- cgit_print_error("Invalid request");
- cgit_print_docend();
+ cgit_print_error_page(404, "Not found", "Invalid request");
return;
}
if (!ctx.cfg.enable_http_clone && cmd->is_clone) {
- html_status(404, "Not found", 0);
+ ctx.page.title = "cgit error";
+ cgit_print_error_page(404, "Not found", "Invalid request");
return;
}
@@ -735,11 +725,8 @@ static void process_request(void)
ctx.qry.vpath = cmd->want_vpath ? ctx.qry.path : NULL;
if (cmd->want_repo && !ctx.repo) {
- cgit_print_http_headers();
- cgit_print_docstart();
- cgit_print_pageheader();
- cgit_print_error("No repository selected");
- cgit_print_docend();
+ cgit_print_error_page(400, "Bad request",
+ "No repository selected");
return;
}
--
2.5.0.466.g9af26fa
next prev parent reply other threads:[~2015-08-14 11:47 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-05 15:54 [PATCH 00/17] HTTP response code improvements john
2015-04-05 15:54 ` [PATCH 01/17] ui-shared: add cgit_print_error_page() function john
2015-04-07 13:23 ` Jason
2015-04-07 13:32 ` john
2015-04-07 13:36 ` Jason
2015-04-07 18:17 ` john
2015-04-05 15:54 ` [PATCH 02/17] cgit: use cgit_print_error_page() where appropriate john
2015-04-05 15:54 ` [PATCH 03/17] clone: use cgit_print_error_page() instead of html_status() john
2015-04-05 15:54 ` [PATCH 04/17] plain: " john
2015-04-05 15:54 ` [PATCH 05/17] snapshot: " john
2015-04-05 15:54 ` [PATCH 06/17] html: remove html_status() john
2015-04-05 15:54 ` [PATCH 07/17] ui-shared: add cgit_print_layout_{start,end}() john
2015-04-05 15:54 ` [PATCH 08/17] about: move layout into page functions john
2015-04-05 15:54 ` [PATCH 09/17] commit: move layout into page function john
2015-04-05 15:54 ` [PATCH 10/17] diff: move layout to " john
2015-04-05 15:54 ` [PATCH 11/17] log: move layout into " john
2015-04-05 15:54 ` [PATCH 12/17] refs: move layout to " john
2015-04-05 15:54 ` [PATCH 13/17] stats: move layout into " john
2015-04-05 15:55 ` [PATCH 14/17] summary: " john
2015-04-05 15:55 ` [PATCH 15/17] tag: " john
2015-04-05 15:55 ` [PATCH 16/17] tree: " john
2015-04-05 18:31 ` john
2015-04-05 15:55 ` [PATCH 17/17] cmd: remove "want_layout" field john
2015-04-05 16:28 ` [PATCH 00/17] HTTP response code improvements john
2015-08-14 11:47 ` [PATCH v2 00/22] HTTP status " john
2015-08-14 11:47 ` [PATCH v2 01/22] ui-shared: add cgit_print_error_page() function john
2015-08-14 11:47 ` john [this message]
2015-08-14 11:47 ` [PATCH v2 03/22] clone: use cgit_print_error_page() instead of html_status() john
2015-08-14 11:47 ` [PATCH v2 04/22] plain: " john
2015-08-14 11:47 ` [PATCH v2 05/22] snapshot: " john
2015-08-14 11:47 ` [PATCH v2 06/22] blob: use cgit_print_error_page() to add HTTP headers john
2015-08-14 11:47 ` [PATCH v2 07/22] patch: use cgit_print_error_page() for HTTP status codes john
2015-08-14 11:47 ` [PATCH v2 08/22] snapshot: " john
2015-08-14 11:47 ` [PATCH v2 09/22] snapshot: don't reimplement cgit_print_error_page() john
2015-08-14 11:47 ` [PATCH v2 10/22] html: remove html_status() john
2015-08-14 11:47 ` [PATCH v2 11/22] ui-shared: add cgit_print_layout_{start,end}() john
2015-08-14 11:47 ` [PATCH v2 12/22] about: move layout into page functions john
2015-08-14 11:47 ` [PATCH v2 13/22] commit: move layout into page function john
2015-08-14 11:47 ` [PATCH v2 14/22] diff: move layout to " john
2015-08-14 11:47 ` [PATCH v2 15/22] log: move layout into " john
2015-08-14 11:47 ` [PATCH v2 16/22] refs: move layout to " john
2015-08-14 11:47 ` [PATCH v2 17/22] stats: move layout into " john
2015-08-14 11:47 ` [PATCH v2 18/22] summary: " john
2015-08-14 11:47 ` [PATCH v2 19/22] tag: " john
2015-08-14 11:47 ` [PATCH v2 20/22] tree: " john
2015-08-14 11:47 ` [PATCH v2 21/22] cmd: remove "want_layout" field john
2015-08-14 11:47 ` [PATCH v2 22/22] ui-shared: cache errors for "dynamic TTL" john
2015-08-14 12:17 ` [PATCH v2 00/22] HTTP status code improvements nicolas.dely
2015-08-14 13:56 ` Jason
2015-08-14 14:20 ` john
2015-08-14 14:24 ` list
2015-08-14 14:40 ` 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=a57bc125eb85d0b1256e85406b273e784439d5ff.1439552492.git.john@keeping.me.uk \
--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).