List for cgit developers and users
 help / color / mirror / Atom feed
From: john at keeping.me.uk (John Keeping)
Subject: [PATCH v2 06/22] blob: use cgit_print_error_page() to add HTTP headers
Date: Fri, 14 Aug 2015 12:47:06 +0100	[thread overview]
Message-ID: <059376280c8997fef486f0e0da13ae23089c1235.1439552492.git.john@keeping.me.uk> (raw)
In-Reply-To: <cover.1439552492.git.john@keeping.me.uk>

This is a bugfix as well as an improvement to the HTTP status code
handling since previously we would not print HTTP headers on any of
these code paths.

Signed-off-by: John Keeping <john at keeping.me.uk>
---
 ui-blob.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/ui-blob.c b/ui-blob.c
index 388a017..b333f86 100644
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -126,12 +126,14 @@ void cgit_print_blob(const char *hex, char *path, const char *head, int file_onl
 
 	if (hex) {
 		if (get_sha1_hex(hex, sha1)) {
-			cgit_print_error("Bad hex value: %s", hex);
+			cgit_print_error_page(400, "Bad request",
+					"Bad hex value: %s", hex);
 			return;
 		}
 	} else {
 		if (get_sha1(head, sha1)) {
-			cgit_print_error("Bad ref: %s", head);
+			cgit_print_error_page(404, "Not found",
+					"Bad ref: %s", head);
 			return;
 		}
 	}
@@ -145,13 +147,15 @@ void cgit_print_blob(const char *hex, char *path, const char *head, int file_onl
 	}
 
 	if (type == OBJ_BAD) {
-		cgit_print_error("Bad object name: %s", hex);
+		cgit_print_error_page(404, "Not found",
+				"Bad object name: %s", hex);
 		return;
 	}
 
 	buf = read_sha1_file(sha1, &type, &size);
 	if (!buf) {
-		cgit_print_error("Error reading object %s", hex);
+		cgit_print_error_page(500, "Internal server error",
+				"Error reading object %s", hex);
 		return;
 	}
 
-- 
2.5.0.466.g9af26fa



  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   ` [PATCH v2 02/22] cgit: use cgit_print_error_page() where appropriate john
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   ` john [this message]
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=059376280c8997fef486f0e0da13ae23089c1235.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).