[experimental-ims] a343a0d Beef the gzip parameters up to the usual defaults: window=15 and memlevel 8.

[Geoff Simmons]

commit a343a0dad8bd4faa7ad46187f5914e5d4fefb852
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Jun 22 14:48:57 2011 +0000

    Beef the gzip parameters up to the usual defaults: window=15 and
    memlevel 8.
    
    Fix testcases which depend on older values.

diff --git a/bin/varnishd/mgt_param.c b/bin/varnishd/mgt_param.c
index 1b996e5..26fcb31 100644
--- a/bin/varnishd/mgt_param.c
+++ b/bin/varnishd/mgt_param.c
@@ -888,13 +888,15 @@ static const struct parspec input_parspec[] = {
 		0,
 		"6", ""},
 	{ "gzip_window", tweak_uint, &master.gzip_window, 8, 15,
-		"Gzip window size 8=least, 15=most compression",
+		"Gzip window size 8=least, 15=most compression.\n"
+		"Memory impact is 8=1k, 9=2k, ... 15=128k.",
 		0,
-		"8", ""},
-	{ "gzip_window", tweak_uint, &master.gzip_memlevel, 1, 9,
-		"Gzip memory level 1=least, 9=most compression",
+		"15", ""},
+	{ "gzip_memlevel", tweak_uint, &master.gzip_memlevel, 1, 9,
+		"Gzip memory level 1=slow/least, 9=fast/most compression.\n"
+		"Memory impact is 1=1k, 2=2k, ... 9=256k.",
 		0,
-		"1", ""},
+		"8", ""},
 	{ "gzip_stack_buffer", tweak_uint, &master.gzip_stack_buffer,
 	        2048, UINT_MAX,
 		"Size of stack buffer used for gzip processing.\n"
diff --git a/bin/varnishtest/tests/e00022.vtc b/bin/varnishtest/tests/e00022.vtc
index e402c5e..39302b4 100644
--- a/bin/varnishtest/tests/e00022.vtc
+++ b/bin/varnishtest/tests/e00022.vtc
@@ -26,6 +26,8 @@ varnish v1 -arg "-p sess_workspace=131072 -p thread_pool_stack=262144" -vcl+back
 varnish v1 -cliok "param.set esi_syntax 0xc"
 varnish v1 -cliok "param.set http_gzip_support true"
 varnish v1 -cliok "param.set gzip_tmp_space 1"
+varnish v1 -cliok "param.set gzip_window 8"
+varnish v1 -cliok "param.set gzip_memlevel 1"
 
 client c1 {
 	txreq  -hdr "Accept-Encoding: gzip"
diff --git a/bin/varnishtest/tests/g00002.vtc b/bin/varnishtest/tests/g00002.vtc
index 4d713c7..dba75ae 100644
--- a/bin/varnishtest/tests/g00002.vtc
+++ b/bin/varnishtest/tests/g00002.vtc
@@ -11,7 +11,10 @@ server s1 {
 	txresp -body {<H1><esi:include src="/foo"/></H1>}
 } -start
 
-varnish v1 -cliok "param.set http_gzip_support true" -vcl+backend {
+varnish v1 \
+	-cliok "param.set http_gzip_support true" \
+	-cliok "param.set gzip_memlevel 1" \
+	-vcl+backend {
 
 	sub vcl_fetch {
 		set beresp.do_esi = true;