summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2008-12-26 10:33:59 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-12-26 10:33:59 (UTC)
commited77b2e0bff52a44ce1e5bd64e1c784a9c2fa82f (patch) (side-by-side diff)
treeefc0ecd9aaa557b058f30091441a74476884e601
parent06de14d0fdb141feab10383ba18c0e81d56f483b (diff)
downloadcgit-ed77b2e0bff52a44ce1e5bd64e1c784a9c2fa82f.zip
cgit-ed77b2e0bff52a44ce1e5bd64e1c784a9c2fa82f.tar.gz
cgit-ed77b2e0bff52a44ce1e5bd64e1c784a9c2fa82f.tar.bz2
ui-snapshot.c: change mime-type for tar.gz and tar.bz2
The updated mime-types seems to work better than the old ones with both safari and firefox. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
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
@@ -1,25 +1,25 @@
#!/bin/sh
. ./setup.sh
prepare_tests "Verify snapshot"
run_test 'get foo/snapshot/test.tar.gz' '
cgit_url "foo/snapshot/test.tar.gz" >trash/tmp
'
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."
'
run_test 'strip off the header lines' '
tail -n +6 trash/tmp > trash/test.tar.gz
'
run_test 'verify gzip format' 'gunzip --test trash/test.tar.gz'
run_test 'untar' '
rm -rf trash/foo &&
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 6f09151..5f813fc 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -49,26 +49,26 @@ static int write_compressed_tar_archive(struct archiver_args *args,const char *f
static int write_tar_gzip_archive(struct archiver_args *args)
{
return write_compressed_tar_archive(args,"gzip");
}
static int write_tar_bzip2_archive(struct archiver_args *args)
{
return write_compressed_tar_archive(args,"bzip2");
}
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 },
{}
};
static const struct cgit_snapshot_format *get_format(const char *filename)
{
const struct cgit_snapshot_format *fmt;
int fl, sl;
fl = strlen(filename);
for(fmt = cgit_snapshot_formats; fmt->suffix; fmt++) {
sl = strlen(fmt->suffix);