[master] efb159e Put delivery G(un)zip VSL on req->vsl

Poul-Henning Kamp phk at varnish-cache.org
Mon Feb 20 10:19:59 CET 2012


commit efb159e0829aab387ca2cfd2528a4ec30a08bf02
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Feb 20 09:19:45 2012 +0000

    Put delivery G(un)zip VSL on req->vsl

diff --git a/bin/varnishd/cache/cache_esi_deliver.c b/bin/varnishd/cache/cache_esi_deliver.c
index 2d697cb..669a594 100644
--- a/bin/varnishd/cache/cache_esi_deliver.c
+++ b/bin/varnishd/cache/cache_esi_deliver.c
@@ -258,7 +258,7 @@ ESI_Deliver(struct sess *sp)
 	}
 
 	if (isgzip && !sp->req->gzip_resp) {
-		vgz = VGZ_NewUngzip(sp->wrk->vsl, "U D E");
+		vgz = VGZ_NewUngzip(sp->req->vsl, "U D E");
 		AZ(VGZ_WrwInit(vgz));
 
 		/* Feed a gzip header to gunzip to make it happy */
diff --git a/bin/varnishd/cache/cache_response.c b/bin/varnishd/cache/cache_response.c
index 5a33d08..4760c12 100644
--- a/bin/varnishd/cache/cache_response.c
+++ b/bin/varnishd/cache/cache_response.c
@@ -160,7 +160,7 @@ res_WriteGunzipObj(const struct sess *sp)
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 
-	vg = VGZ_NewUngzip(sp->wrk->vsl, "U D -");
+	vg = VGZ_NewUngzip(sp->req->vsl, "U D -");
 	AZ(VGZ_WrwInit(vg));
 
 	VTAILQ_FOREACH(st, &sp->req->obj->store, list) {



More information about the varnish-commit mailing list