summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keeping <john@keeping.me.uk>2015-08-14 12:47:06 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2015-08-14 15:46:51 +0200
commit9a06211daacd2fff14c6211bfc8bad856694f0f9 (patch)
tree78a39c30881353cefae597dc26861eb075a498ad
parent048f195eaf2fedb56987f0c8c89b9fd46375aa87 (diff)
downloadcgit-9a06211daacd2fff14c6211bfc8bad856694f0f9.tar.gz
cgit-9a06211daacd2fff14c6211bfc8bad856694f0f9.tar.bz2
blob: use cgit_print_error_page() to add HTTP headers
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@keeping.me.uk>
-rw-r--r--ui-blob.c12
1 files 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;
}