Reset output buffer on VGZ_WrwFlush()

Fixes: #1123

Reset output buffer on VGZ_WrwFlush()
Fixes: #1123
f992125b · Martin Blix Grydeland · 0679d603 · f992125b · f992125b
Commit f992125b authored Mar 27, 2012 by Martin Blix Grydeland
Hide whitespace changes
Inline Side-by-side

Showing with 26 additions and 0 deletions

cache_gzip.c bin/varnishd/cache/cache_gzip.c +1 -0

r01123.vtc bin/varnishtest/tests/r01123.vtc +25 -0

No files found.
--- a/bin/varnishd/cache/cache_gzip.c
+++ b/bin/varnishd/cache/cache_gzip.c
@@ -366,6 +366,7 @@ VGZ_WrwFlush(const struct worker *wrk, struct vgz *vg)
 	(void)WRW_Write(wrk, vg->m_buf, vg->m_len);
 	(void)WRW_Flush(wrk);
 	vg->m_len = 0;
+	VGZ_Obuf(vg, vg->m_buf, vg->m_sz);
 }

 /*--------------------------------------------------------------------*/

--- a/bin/varnishtest/tests/r01123.vtc
+++ b/bin/varnishtest/tests/r01123.vtc
+varnishtest "Test case for #1123 - gunzip buffer reset"
+
+server s1 {
+	rxreq
+	txresp -body {<html>start <esi:include src="/included"/> end}
+	rxreq
+	expect req.url == "/included"
+	txresp -body {INCLUDED}
+} -start
+
+varnish v1 -vcl+backend {
+	sub vcl_fetch {
+		if (req.url == "/") {
+			set beresp.do_esi = true;
+		}
+		set beresp.do_gzip = true;
+	}
+} -start
+
+client c1 {
+	txreq
+	rxresp
+	expect resp.bodylen == 24
+	expect resp.body == "<html>start INCLUDED end"
+} -run