X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/2f8648ff7f5c7119ab035c134504f04eefe068fb..edb3403f00f14ac5cc23b9ba3a122cb4ee8b81fa:/ui-snapshot.c?ds=sidebyside diff --git a/ui-snapshot.c b/ui-snapshot.c index 83ce6e8..fa3ceaf 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c @@ -86,6 +86,7 @@ static int write_tar_xz_archive(const char *hex, const char *prefix) } const struct cgit_snapshot_format cgit_snapshot_formats[] = { + /* .tar must remain the 0 index */ { ".tar", "application/x-tar", write_tar_archive }, { ".tar.gz", "application/x-gzip", write_tar_gzip_archive }, { ".tar.bz2", "application/x-bzip2", write_tar_bzip2_archive }, @@ -174,7 +175,7 @@ static int write_sig(const struct cgit_snapshot_format *format, return 0; } - buf = read_sha1_file(note->hash, &type, &size); + buf = read_object_file(note, &type, &size); if (!buf) { cgit_print_error_page(404, "Not found", "Not found"); return 0; @@ -268,7 +269,7 @@ void cgit_print_snapshot(const char *head, const char *hex, } f = get_format(filename); - if (!f || !(ctx.repo->snapshots & cgit_snapshot_format_bit(f))) { + if (!f || (!sig_filename && !(ctx.repo->snapshots & cgit_snapshot_format_bit(f)))) { cgit_print_error_page(400, "Bad request", "Unsupported snapshot format: %s", filename); return;