[master] 285deaa Don't put chunked headers in the esi-specification, we won't need them.

Poul-Henning Kamp phk at varnish-cache.org
Thu Mar 24 15:01:34 CET 2011


commit 285deaaf1dc357923231f1506dd59672fb78f001
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Mar 24 14:00:57 2011 +0000

    Don't put chunked headers in the esi-specification, we won't need them.

diff --git a/bin/varnishd/cache_esi_deliver.c b/bin/varnishd/cache_esi_deliver.c
index 2295358..22cb765 100644
--- a/bin/varnishd/cache_esi_deliver.c
+++ b/bin/varnishd/cache_esi_deliver.c
@@ -211,7 +211,7 @@ ved_pretend_gzip(const struct sess *sp, const uint8_t *p, ssize_t l)
 /*---------------------------------------------------------------------
  */
 
-static const char gzip_hdr[] = {
+static const uint8_t gzip_hdr[] = {
 	0x1f, 0x8b, 0x08,
 	0x00, 0x00, 0x00, 0x00,
 	0x00,
@@ -291,8 +291,6 @@ ESI_Deliver(struct sess *sp)
 		case VEC_V8:
 			l = ved_decode_len(&p);
 			r = p;
-			q = (void*)strchr((const char*)p, '\0');
-			p = q + 1;
 			if (isgzip) {
 				assert(*p == VEC_C1 || *p == VEC_C2 ||
 				    *p == VEC_C8);
diff --git a/bin/varnishd/cache_esi_parse.c b/bin/varnishd/cache_esi_parse.c
index 937a857..48ca71e 100644
--- a/bin/varnishd/cache_esi_parse.c
+++ b/bin/varnishd/cache_esi_parse.c
@@ -287,8 +287,6 @@ vep_emit_verbatim(const struct vep_state *vep, ssize_t l, ssize_t l_crc)
 		Debug("---> VERBATIM(%jd)\n", (intmax_t)l);
 	}
 	vep_emit_len(vep, l, VEC_V1, VEC_V2, VEC_V8);
-	/* Emit Chunked header */
-	vsb_printf(vep->vsb, "%lx\r\n%c", l, 0);
 	if (vep->dogzip) {
 		vep_emit_len(vep, l_crc, VEC_C1, VEC_C2, VEC_C8);
 		vbe32enc(buf, vep->crc);



More information about the varnish-commit mailing list