Align ESI bodybytes accounting with #3354

Ref varnish-cache f087fe6d37679d8d709cfec85451fde4f68fbb95

Original patch by Poul-Henning Kamp <phk@FreeBSD.org>

src/tests/e00000.vtc

@@ -40,6 +40,7 @@ client c1 {
 client c1 -run
 logexpect l1 -wait
 varnish v1 -expect esi_errors == 0
+varnish v1 -expect MAIN.s_resp_bodybytes == 33
 
 ## HTTP/2
 

src/tests/e00001.vtc

@@ -48,6 +48,7 @@ client c1 {
 client c1 -run
 logexpect l1 -wait
 varnish v1 -expect esi_errors == 2
+varnish v1 -expect MAIN.s_resp_bodybytes == 40
 
 ## HTTP/2
 

src/tests/e00002.vtc

@@ -37,6 +37,7 @@ client c1 {
 
 client c1 -run
 varnish v1 -expect esi_errors == 0
+varnish v1 -expect MAIN.s_resp_bodybytes == 35
 
 ## HTTP/2
 

src/tests/e00003.vtc

@@ -98,6 +98,7 @@ client c1 {
 
 client c1 -run
 varnish v1 -expect esi_errors == 0
+varnish v1 -expect MAIN.s_resp_bodybytes == 150
 delay 1
 
 logexpect l1 -v v1 -d 1 -g vxid -q "vxid == 1001" {

src/tests/e00004.vtc

@@ -47,6 +47,7 @@ client c1 {
 
 client c1 -run
 varnish v1 -expect esi_errors == 0
+varnish v1 -expect MAIN.s_resp_bodybytes == 67
 
 ## HTTP/2
 

src/tests/e00005.vtc

@@ -40,6 +40,7 @@ client c1 {
 
 client c1 -run
 varnish v1 -expect esi_errors == 0
+varnish v1 -expect MAIN.s_resp_bodybytes == 67
 
 ## HTTP/2
 

src/tests/e00006.vtc

@@ -57,6 +57,7 @@ client c1 {
 
 client c1 -run
 varnish v1 -expect esi_errors == 0
+varnish v1 -expect MAIN.s_resp_bodybytes == 78
 
 # Now try with invalid URLs
 
@@ -93,18 +94,23 @@ client c1 {
 	expect resp.status == 200
 	expect resp.bodylen == 4
 	expect resp.body == "1234"
+} -run
+
+varnish v1 -expect esi_errors == 1
+varnish v1 -expect MAIN.s_resp_bodybytes == 82
+
+client c1 {
 	txreq -url /https
 	rxresp
 	expect resp.status == 200
 	expect resp.bodylen == 6
 	expect resp.body == "123456"
-}
-
-client c1 -run
+} -run
 
 logexpect l1 -wait
 
 varnish v1 -expect esi_errors == 2
+varnish v1 -expect MAIN.s_resp_bodybytes == 88
 
 ## HTTP/2
 

src/tests/e00007.vtc

@@ -61,6 +61,7 @@ client c1 {
 
 client c1 -run
 varnish v1 -expect esi_errors == 0
+varnish v1 -expect MAIN.s_resp_bodybytes == 120
 
 ## HTTP/2
 

src/tests/e00008.vtc

@@ -178,6 +178,7 @@ logexpect l1 -wait
 logexpect l2 -wait
 logexpect l3 -wait
 varnish v1 -expect esi_errors == 18
+varnish v1 -expect MAIN.s_resp_bodybytes == 472
 
 
 ## HTTP/2

src/tests/e00009.vtc

@@ -42,6 +42,7 @@ client c1 {
 } -run
 
 logexpect l1 -wait
+varnish v1 -expect MAIN.s_resp_bodybytes == 57
 
 varnish v1  -cli "param.set feature +esi_disable_xml_check"
 
@@ -57,6 +58,7 @@ client c1 {
 	}
 } -run
 varnish v1 -expect esi_errors == 0
+varnish v1 -expect MAIN.s_resp_bodybytes == 79
 
 ## HTTP/2
 

src/tests/e00015.vtc

@@ -53,6 +53,7 @@ client c1 {
 varnish v1 -vsl_catchup
 
 varnish v1 -expect esi_errors == 0
+varnish v1 -expect MAIN.s_resp_bodybytes == 149
 
 server s1 {
 	rxreq

src/tests/e00017.vtc

@@ -245,6 +245,7 @@ client c1 {
 
 client c1 -run
 varnish v1 -expect esi_errors == 0
+varnish v1 -expect MAIN.s_resp_bodybytes == 684
 
 varnish v1 -vsc MEMPOOL.pesi.*
 varnish v1 -expect MEMPOOL.pesi.pool > 0

src/tests/e00019.vtc

@@ -83,6 +83,7 @@ logexpect l1 -wait
 
 varnish v1 -expect esi_errors == 5
 varnish v1 -expect esi_warnings == 1
+varnish v1 -expect MAIN.s_resp_bodybytes == 65856
 
 ##
 ## XXX: repeating this test with HTTP/2 fails both here and for