[master] be21c60 Make the gzip_stack_buffer parameter have units of bytes for consistency.

Poul-Henning Kamp phk at varnish-cache.org
Tue Jan 25 11:15:44 CET 2011


commit be21c60c8b4ab104d4237f2b5b66abfbd6eca6ba
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Jan 25 10:09:39 2011 +0000

    Make the gzip_stack_buffer parameter have units of bytes for consistency.

diff --git a/bin/varnishd/cache_esi_deliver.c b/bin/varnishd/cache_esi_deliver.c
index b16c345..c687dd7 100644
--- a/bin/varnishd/cache_esi_deliver.c
+++ b/bin/varnishd/cache_esi_deliver.c
@@ -239,7 +239,7 @@ ESI_Deliver(struct sess *sp)
 	uint8_t tailbuf[8 + 5];
 	int isgzip;
 	struct vgz *vgz = NULL;
-	char obuf[1024 * params->gzip_stack_buffer];
+	char obuf[params->gzip_stack_buffer];
 	ssize_t obufl = 0;
 	size_t dl;
 	const void *dp;
diff --git a/bin/varnishd/cache_esi_fetch.c b/bin/varnishd/cache_esi_fetch.c
index 909d77b..499f6b6 100644
--- a/bin/varnishd/cache_esi_fetch.c
+++ b/bin/varnishd/cache_esi_fetch.c
@@ -101,7 +101,7 @@ vfp_esi_bytes_gu(struct sess *sp, struct http_conn *htc, ssize_t bytes)
 {
 	struct vgz *vg;
 	ssize_t w;
-	uint8_t	ibuf[1024 * params->gzip_stack_buffer];
+	uint8_t	ibuf[params->gzip_stack_buffer];
 	int i;
 	size_t dl;
 	const void *dp;
@@ -211,7 +211,7 @@ static int __match_proto__()
 vfp_esi_bytes_ug(struct sess *sp, struct http_conn *htc, ssize_t bytes)
 {
 	ssize_t w;
-	char ibuf[1024 * params->gzip_stack_buffer];
+	char ibuf[params->gzip_stack_buffer];
 	struct vef_priv *vef;
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
@@ -247,8 +247,8 @@ static int __match_proto__()
 vfp_esi_bytes_gg(struct sess *sp, struct http_conn *htc, size_t bytes)
 {
 	ssize_t w;
-	char ibuf[1024 * params->gzip_stack_buffer];
-	char ibuf2[1024 * params->gzip_stack_buffer];
+	char ibuf[params->gzip_stack_buffer];
+	char ibuf2[params->gzip_stack_buffer];
 	struct vef_priv *vef;
 	size_t dl;
 	const void *dp;
diff --git a/bin/varnishd/cache_gzip.c b/bin/varnishd/cache_gzip.c
index 9d83462..4b62d24 100644
--- a/bin/varnishd/cache_gzip.c
+++ b/bin/varnishd/cache_gzip.c
@@ -368,7 +368,7 @@ vfp_gunzip_bytes(struct sess *sp, struct http_conn *htc, ssize_t bytes)
 	struct vgz *vg;
 	ssize_t l, w;
 	int i = -100;
-	uint8_t	ibuf[1024 * params->gzip_stack_buffer];
+	uint8_t	ibuf[params->gzip_stack_buffer];
 	size_t dl;
 	const void *dp;
 
@@ -437,7 +437,7 @@ vfp_gzip_bytes(struct sess *sp, struct http_conn *htc, ssize_t bytes)
 	struct vgz *vg;
 	ssize_t l, w;
 	int i = -100;
-	uint8_t ibuf[1024 * params->gzip_stack_buffer];
+	uint8_t ibuf[params->gzip_stack_buffer];
 	size_t dl;
 	const void *dp;
 
@@ -513,7 +513,7 @@ vfp_testgzip_bytes(struct sess *sp, struct http_conn *htc, ssize_t bytes)
 	struct vgz *vg;
 	ssize_t l, w;
 	int i = -100;
-	uint8_t	ibuf[1024 * params->gzip_stack_buffer];
+	uint8_t	ibuf[params->gzip_stack_buffer];
 	size_t dl;
 	const void *dp;
 	struct storage *st;
diff --git a/bin/varnishd/cache_response.c b/bin/varnishd/cache_response.c
index 6347d82..c210482 100644
--- a/bin/varnishd/cache_response.c
+++ b/bin/varnishd/cache_response.c
@@ -247,7 +247,7 @@ res_WriteGunzipObj(struct sess *sp)
 	struct vgz *vg;
 	const void *dp;
 	char lenbuf[20];
-	char obuf[1024 * params->gzip_stack_buffer];
+	char obuf[params->gzip_stack_buffer];
 	size_t dl;
 	int i;
 
diff --git a/bin/varnishd/mgt_param.c b/bin/varnishd/mgt_param.c
index 2f71eef..e2151ad 100644
--- a/bin/varnishd/mgt_param.c
+++ b/bin/varnishd/mgt_param.c
@@ -818,10 +818,10 @@ static const struct parspec input_parspec[] = {
 		EXPERIMENTAL,
 		"on", "bool" },
 	{ "gzip_stack_buffer", tweak_uint, &master.gzip_stack_buffer,
-	        4, UINT_MAX,
+	        2048, UINT_MAX,
 		"Size of stack buffer used for gzip processing.\n",
 		EXPERIMENTAL,
-		"64", "Kilobytes" },
+		"32768", "Bytes" },
 	{ "critbit_cooloff", tweak_timeout_double,
 		&master.critbit_cooloff, 60, 254,
 		"How long time the critbit hasher keeps deleted objheads "



More information about the varnish-commit mailing list