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>

diff --git a/ui-blob.c b/ui-blob.c
index 388a0177a30487959c0fb35d40cff64ce278aedf..b333f869f3c0cb15a737dcab3e6bc2a1872a1b4b 100644 (file)
--- 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)) {
 
        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)) {
                        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;
                }
        }
                        return;
                }
        }


@@ -145,13 +147,15 @@ void cgit_print_blob(const char *hex, char *path, const char *head, int file_onl
        }
 
        if (type == OBJ_BAD) {
        }
 
        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) {
                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;
        }
 
                return;
        }