Merge branch 'lh/mimetypes'

Lars Hjemli committed 17 years ago

Commit 7f7c1dd2 parents ef688e1 ed77b2e2 files · +3 −3Browse files

Unified · Split

2 files

tests/t0107-snapshot.sh +1 −1
ui-snapshot.c +2 −2

tests/t0107-snapshot.sh+1−1

@@ -10,7 +10,7 @@ run_test 'get foo/snapshot/test.tar.gz' ' · 9 unmodified lines
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."

ui-snapshot.c+2−2

@@ -58,8 +58,8 @@ static int write_tar_bzip2_archive(struct archiver_args *args) · 57 unmodified lines
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	};