summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2009-01-11 11:22:31 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-01-11 11:22:31 (UTC)
commit7f7c1ddd37f7286afc02fa06bf4f62cfa4e9ee12 (patch) (side-by-side diff)
treefb96c654c08d8f0a0927ad8bdced60954b4adb53
parentef688e16f05a5a3438e63645852c436fe33fab71 (diff)
parented77b2e0bff52a44ce1e5bd64e1c784a9c2fa82f (diff)
downloadcgit-7f7c1ddd37f7286afc02fa06bf4f62cfa4e9ee12.zip
cgit-7f7c1ddd37f7286afc02fa06bf4f62cfa4e9ee12.tar.gz
cgit-7f7c1ddd37f7286afc02fa06bf4f62cfa4e9ee12.tar.bz2
Merge branch 'lh/mimetypes'
Diffstat (more/less context) (show whitespace changes)
-rwxr-xr-xtests/t0107-snapshot.sh2
-rw-r--r--ui-snapshot.c4
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
@@ -10,7 +10,7 @@ run_test 'get foo/snapshot/test.tar.gz' '
run_test 'check html headers' '
head -n 1 trash/tmp |
- grep -e "Content-Type: application/x-tar" &&
+ grep -e "Content-Type: application/x-gzip" &&
head -n 2 trash/tmp |
grep -e "Content-Disposition: inline; filename=.test.tar.gz."
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 6f09151..5f813fc 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -58,8 +58,8 @@ static int write_tar_bzip2_archive(struct archiver_args *args)
const struct cgit_snapshot_format cgit_snapshot_formats[] = {
{ ".zip", "application/x-zip", write_zip_archive, 0x1 },
- { ".tar.gz", "application/x-tar", write_tar_gzip_archive, 0x2 },
- { ".tar.bz2", "application/x-tar", write_tar_bzip2_archive, 0x4 },
+ { ".tar.gz", "application/x-gzip", write_tar_gzip_archive, 0x2 },
+ { ".tar.bz2", "application/x-bzip2", write_tar_bzip2_archive, 0x4 },
{ ".tar", "application/x-tar", write_tar_archive, 0x8 },
{}
};