Merge branch 'lh/mimetypes'

This commit is contained in:
Lars Hjemli 2009-01-11 12:22:31 +01:00
commit 7f7c1ddd37
2 changed files with 3 additions and 3 deletions

View File

@ -10,7 +10,7 @@ run_test 'get foo/snapshot/test.tar.gz' '
run_test 'check html headers' ' run_test 'check html headers' '
head -n 1 trash/tmp | head -n 1 trash/tmp |
grep -e "Content-Type: application/x-tar" && grep -e "Content-Type: application/x-gzip" &&
head -n 2 trash/tmp | head -n 2 trash/tmp |
grep -e "Content-Disposition: inline; filename=.test.tar.gz." grep -e "Content-Disposition: inline; filename=.test.tar.gz."

View File

@ -58,8 +58,8 @@ static int write_tar_bzip2_archive(struct archiver_args *args)
const struct cgit_snapshot_format cgit_snapshot_formats[] = { const struct cgit_snapshot_format cgit_snapshot_formats[] = {
{ ".zip", "application/x-zip", write_zip_archive, 0x1 }, { ".zip", "application/x-zip", write_zip_archive, 0x1 },
{ ".tar.gz", "application/x-tar", write_tar_gzip_archive, 0x2 }, { ".tar.gz", "application/x-gzip", write_tar_gzip_archive, 0x2 },
{ ".tar.bz2", "application/x-tar", write_tar_bzip2_archive, 0x4 }, { ".tar.bz2", "application/x-bzip2", write_tar_bzip2_archive, 0x4 },
{ ".tar", "application/x-tar", write_tar_archive, 0x8 }, { ".tar", "application/x-tar", write_tar_archive, 0x8 },
{} {}
}; };