[master] 759574a Make space for another 8 bytes of GZIP data

[Poul-Henning Kamp]

commit 759574ac84f9de37f56c5f1740f125d2bf268059
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Oct 29 09:40:40 2014 +0000

    Make space for another 8 bytes of GZIP data

diff --git a/bin/varnishd/cache/cache_esi_deliver.c b/bin/varnishd/cache/cache_esi_deliver.c
index deabbf6..3e6e9d3 100644
--- a/bin/varnishd/cache/cache_esi_deliver.c
+++ b/bin/varnishd/cache/cache_esi_deliver.c
@@ -457,7 +457,7 @@ ved_stripgzip(struct req *req)
 
 	p = ObjGetattr(req->wrk, req->objcore, OA_GZIPBITS, &l);
 	AN(p);
-	assert(l == 24);
+	assert(l == 32);
 	start = vbe64dec(p);
 	last = vbe64dec(p + 8);
 	stop = vbe64dec(p + 16);
diff --git a/bin/varnishd/cache/cache_gzip.c b/bin/varnishd/cache/cache_gzip.c
index 583abc5..f4e3796 100644
--- a/bin/varnishd/cache/cache_gzip.c
+++ b/bin/varnishd/cache/cache_gzip.c
@@ -333,7 +333,7 @@ VGZ_UpdateObj(const struct vfp_ctx *vc, const struct vgz *vg)
 	char *p;
 
 	CHECK_OBJ_NOTNULL(vg, VGZ_MAGIC);
-	p = ObjSetattr(vc->wrk, vc->oc, OA_GZIPBITS, 24, NULL);
+	p = ObjSetattr(vc->wrk, vc->oc, OA_GZIPBITS, 32, NULL);
 	AN(p);
 	vbe64enc(p, vg->vz.start_bit);
 	vbe64enc(p + 8, vg->vz.last_bit);
diff --git a/bin/varnishd/storage/storage.h b/bin/varnishd/storage/storage.h
index 0d162ca..311f6a6 100644
--- a/bin/varnishd/storage/storage.h
+++ b/bin/varnishd/storage/storage.h
@@ -69,7 +69,7 @@ struct object {
 	uint8_t			*oa_vary;
 	uint8_t			*oa_http;
 	uint8_t			oa_flags[1];
-	char			oa_gzipbits[24];
+	char			oa_gzipbits[32];
 	char			oa_lastmodified[8];
 
 	struct storagehead	list;