[master] 380a5b2 Remove the gzip_window param, it is useless.
Poul-Henning Kamp
phk at varnish-cache.org
Wed Jun 13 14:49:58 CEST 2012
commit 380a5b23a66673ee6c62a6dc1a26f69c34d40747
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Wed Jun 13 12:49:45 2012 +0000
Remove the gzip_window param, it is useless.
diff --git a/bin/varnishd/cache/cache_gzip.c b/bin/varnishd/cache/cache_gzip.c
index f7dba8e..80ce07b 100644
--- a/bin/varnishd/cache/cache_gzip.c
+++ b/bin/varnishd/cache/cache_gzip.c
@@ -128,7 +128,7 @@ VGZ_NewGzip(struct vsl_log *vsl, const char *id)
i = deflateInit2(&vg->vz,
cache_param->gzip_level, /* Level */
Z_DEFLATED, /* Method */
- 16 + cache_param->gzip_window, /* Window bits (16=gzip + 15) */
+ 16 + 15, /* Window bits (16=gzip) */
cache_param->gzip_memlevel, /* memLevel */
Z_DEFAULT_STRATEGY);
assert(Z_OK == i);
diff --git a/bin/varnishd/common/params.h b/bin/varnishd/common/params.h
index 1e13657..2e8bf37 100644
--- a/bin/varnishd/common/params.h
+++ b/bin/varnishd/common/params.h
@@ -185,7 +185,6 @@ struct params {
unsigned http_gzip_support;
unsigned gzip_buffer;
unsigned gzip_level;
- unsigned gzip_window;
unsigned gzip_memlevel;
unsigned obj_readonly;
diff --git a/bin/varnishd/mgt/mgt_param.c b/bin/varnishd/mgt/mgt_param.c
index 8e3e56d..c425882 100644
--- a/bin/varnishd/mgt/mgt_param.c
+++ b/bin/varnishd/mgt/mgt_param.c
@@ -1125,11 +1125,6 @@ static const struct parspec input_parspec[] = {
"Gzip compression level: 0=debug, 1=fast, 9=best",
0,
"6", ""},
- { "gzip_window", tweak_uint, &mgt_param.gzip_window, 8, 15,
- "Gzip window size 8=least, 15=most compression.\n"
- "Memory impact is 8=1k, 9=2k, ... 15=128k.",
- 0,
- "15", ""},
{ "gzip_memlevel", tweak_uint, &mgt_param.gzip_memlevel, 1, 9,
"Gzip memory level 1=slow/least, 9=fast/most compression.\n"
"Memory impact is 1=1k, 2=2k, ... 9=256k.",
diff --git a/bin/varnishtest/tests/e00022.vtc b/bin/varnishtest/tests/e00022.vtc
index 1f13cd3..b4b3572 100644
--- a/bin/varnishtest/tests/e00022.vtc
+++ b/bin/varnishtest/tests/e00022.vtc
@@ -25,7 +25,6 @@ varnish v1 -arg "-p thread_pool_stack=262144" -vcl+backend {
varnish v1 -cliok "param.set esi_syntax 0xc"
varnish v1 -cliok "param.set http_gzip_support true"
-varnish v1 -cliok "param.set gzip_window 8"
varnish v1 -cliok "param.set gzip_memlevel 1"
client c1 {
More information about the varnish-commit
mailing list