author | Lars Hjemli <hjemli@gmail.com> | 2009-01-11 11:22:31 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-01-11 11:22:31 (UTC) |
commit | 7f7c1ddd37f7286afc02fa06bf4f62cfa4e9ee12 (patch) (unidiff) | |
tree | fb96c654c08d8f0a0927ad8bdced60954b4adb53 | |
parent | ef688e16f05a5a3438e63645852c436fe33fab71 (diff) | |
parent | ed77b2e0bff52a44ce1e5bd64e1c784a9c2fa82f (diff) | |
download | cgit-7f7c1ddd37f7286afc02fa06bf4f62cfa4e9ee12.zip cgit-7f7c1ddd37f7286afc02fa06bf4f62cfa4e9ee12.tar.gz cgit-7f7c1ddd37f7286afc02fa06bf4f62cfa4e9ee12.tar.bz2 |
Merge branch 'lh/mimetypes'
-rwxr-xr-x | tests/t0107-snapshot.sh | 2 | ||||
-rw-r--r-- | ui-snapshot.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/t0107-snapshot.sh b/tests/t0107-snapshot.sh index d97c465..c42091a 100755 --- a/tests/t0107-snapshot.sh +++ b/tests/t0107-snapshot.sh | |||
@@ -5,17 +5,17 @@ | |||
5 | prepare_tests "Verify snapshot" | 5 | prepare_tests "Verify snapshot" |
6 | 6 | ||
7 | run_test 'get foo/snapshot/test.tar.gz' ' | 7 | run_test 'get foo/snapshot/test.tar.gz' ' |
8 | cgit_url "foo/snapshot/test.tar.gz" >trash/tmp | 8 | cgit_url "foo/snapshot/test.tar.gz" >trash/tmp |
9 | ' | 9 | ' |
10 | 10 | ||
11 | run_test 'check html headers' ' | 11 | run_test 'check html headers' ' |
12 | head -n 1 trash/tmp | | 12 | head -n 1 trash/tmp | |
13 | grep -e "Content-Type: application/x-tar" && | 13 | grep -e "Content-Type: application/x-gzip" && |
14 | 14 | ||
15 | head -n 2 trash/tmp | | 15 | head -n 2 trash/tmp | |
16 | grep -e "Content-Disposition: inline; filename=.test.tar.gz." | 16 | grep -e "Content-Disposition: inline; filename=.test.tar.gz." |
17 | ' | 17 | ' |
18 | 18 | ||
19 | run_test 'strip off the header lines' ' | 19 | run_test 'strip off the header lines' ' |
20 | tail -n +6 trash/tmp > trash/test.tar.gz | 20 | tail -n +6 trash/tmp > trash/test.tar.gz |
21 | ' | 21 | ' |
diff --git a/ui-snapshot.c b/ui-snapshot.c index 6f09151..5f813fc 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c | |||
@@ -53,18 +53,18 @@ static int write_tar_gzip_archive(struct archiver_args *args) | |||
53 | 53 | ||
54 | static int write_tar_bzip2_archive(struct archiver_args *args) | 54 | static int write_tar_bzip2_archive(struct archiver_args *args) |
55 | { | 55 | { |
56 | return write_compressed_tar_archive(args,"bzip2"); | 56 | return write_compressed_tar_archive(args,"bzip2"); |
57 | } | 57 | } |
58 | 58 | ||
59 | const struct cgit_snapshot_format cgit_snapshot_formats[] = { | 59 | const struct cgit_snapshot_format cgit_snapshot_formats[] = { |
60 | { ".zip", "application/x-zip", write_zip_archive, 0x1 }, | 60 | { ".zip", "application/x-zip", write_zip_archive, 0x1 }, |
61 | { ".tar.gz", "application/x-tar", write_tar_gzip_archive, 0x2 }, | 61 | { ".tar.gz", "application/x-gzip", write_tar_gzip_archive, 0x2 }, |
62 | { ".tar.bz2", "application/x-tar", write_tar_bzip2_archive, 0x4 }, | 62 | { ".tar.bz2", "application/x-bzip2", write_tar_bzip2_archive, 0x4 }, |
63 | { ".tar", "application/x-tar", write_tar_archive, 0x8 }, | 63 | { ".tar", "application/x-tar", write_tar_archive, 0x8 }, |
64 | {} | 64 | {} |
65 | }; | 65 | }; |
66 | 66 | ||
67 | static const struct cgit_snapshot_format *get_format(const char *filename) | 67 | static const struct cgit_snapshot_format *get_format(const char *filename) |
68 | { | 68 | { |
69 | const struct cgit_snapshot_format *fmt; | 69 | const struct cgit_snapshot_format *fmt; |
70 | int fl, sl; | 70 | int fl, sl; |