From: Lars Hjemli <hjemli@gmail.com>
Date: Wed, 1 Sep 2010 12:32:57 +0000 (+0000)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/bf8293d3196d49d6c4a48b254a04415183ca2762?hp=-c

Merge branch 'stable'
---

bf8293d3196d49d6c4a48b254a04415183ca2762
diff --combined ui-snapshot.c
index 1b25dca,dbb5564..6e3412c
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@@ -35,17 -35,11 +35,17 @@@ static int write_tar_bzip2_archive(stru
  	return write_compressed_tar_archive(args,"bzip2");
  }
  
 +static int write_tar_xz_archive(struct archiver_args *args)
 +{
 +	return write_compressed_tar_archive(args,"xz");
 +}
 +
  const struct cgit_snapshot_format cgit_snapshot_formats[] = {
 -	{ ".zip", "application/x-zip", write_zip_archive, 0x1 },
 -	{ ".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 },
 +	{ ".zip", "application/x-zip", write_zip_archive, 0x01 },
 +	{ ".tar.gz", "application/x-gzip", write_tar_gzip_archive, 0x02 },
 +	{ ".tar.bz2", "application/x-bzip2", write_tar_bzip2_archive, 0x04 },
 +	{ ".tar", "application/x-tar", write_tar_archive, 0x08 },
 +	{ ".tar.xz", "application/x-xz", write_tar_xz_archive, 0x10 },
  	{}
  };
  
@@@ -92,6 -86,7 +92,7 @@@ static int make_snapshot(const struct c
  	}
  	args.tree = commit->tree;
  	args.time = commit->date;
+ 	args.compression_level = Z_DEFAULT_COMPRESSION;
  	ctx.page.mimetype = xstrdup(format->mimetype);
  	ctx.page.filename = xstrdup(filename);
  	cgit_print_http_headers(&ctx);