[6.0] 767cb7a1c Try to straighten out resp.body processing.

[Dridi Boukelmoune]

commit 767cb7a1c3bed127138aebed1323b918af9f55e4
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Nov 14 11:01:58 2018 +0000

    Try to straighten out resp.body processing.
    
    Conflicts:
            bin/varnishd/cache/cache_req_fsm.c

diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index b29f484e1..f81891207 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -350,70 +350,66 @@ cnt_transmit(struct worker *wrk, struct req *req)
 	CHECK_OBJ_NOTNULL(req->transport, TRANSPORT_MAGIC);
 	CHECK_OBJ_NOTNULL(req->objcore, OBJCORE_MAGIC);
 	AZ(req->stale_oc);
+	AZ(req->res_mode);
 
-	/* Grab a ref to the bo if there is one */
+	/* Grab a ref to the bo if there is one (=streaming) */
 	boc = HSH_RefBoc(req->objcore);
-
 	clval = http_GetContentLength(req->resp);
+	/* RFC 7230, 3.3.3 */
+	status = http_GetStatus(req->resp);
+	head = !strcmp(req->http0->hd[HTTP_HDR_METHOD].b, "HEAD");
+	err = 0;
+
 	if (boc != NULL)
 		req->resp_len = clval;
 	else
 		req->resp_len = ObjGetLen(req->wrk, req->objcore);
 
-	req->res_mode = 0;
-
-	/* RFC 7230, 3.3.3 */
-	status = http_GetStatus(req->resp);
-	head = !strcmp(req->http0->hd[HTTP_HDR_METHOD].b, "HEAD");
-	if (head) {
-		if (req->objcore->flags & OC_F_PASS)
-			sendbody = -1;
-		else
-			sendbody = 0;
-	} else if (status < 200 || status == 204 || status == 304) {
-		req->resp_len = -1;
-		sendbody = 0;
-	} else
+	if (head || status < 200 || status == 204 || status == 304)
+		sendbody = 0;	/* rfc7230,l,1748,1752 */
+	else
 		sendbody = 1;
 
-	err = 0;
-	if (sendbody >= 0) {
-		if (!req->disable_esi && req->resp_len != 0 &&
-		    ObjHasAttr(wrk, req->objcore, OA_ESIDATA) &&
-		    VDP_push(req, &VDP_esi, NULL, 0) < 0)
-			err++;
-
-		if (cache_param->http_gzip_support &&
-		    ObjCheckFlag(req->wrk, req->objcore, OF_GZIPED) &&
-		    !RFC2616_Req_Gzip(req->http) &&
-		    VDP_push(req, &VDP_gunzip, NULL, 1) < 0)
-			err++;
-
-		if (cache_param->http_range_support &&
-		    http_IsStatus(req->resp, 200)) {
-			http_ForceHeader(req->resp, H_Accept_Ranges, "bytes");
-			if (sendbody && http_GetHdr(req->http, H_Range, &r))
-				VRG_dorange(req, r);
-		}
-	}
+	if (!req->disable_esi && req->resp_len != 0 &&
+	    ObjHasAttr(wrk, req->objcore, OA_ESIDATA) &&
+	    VDP_push(req, &VDP_esi, NULL, 0) < 0)
+		err++;
 
-	if (sendbody < 0 || head) {
-		/* Don't touch HEAD C-L */
-		sendbody = 0;
-	} else if (clval >= 0 && clval == req->resp_len) {
-		/* Reuse C-L header */
-	} else {
-		http_Unset(req->resp, H_Content_Length);
-		if (req->resp_len >= 0 && sendbody)
-			http_PrintfHeader(req->resp,
-			    "Content-Length: %jd", req->resp_len);
+	if (cache_param->http_gzip_support &&
+	    ObjCheckFlag(req->wrk, req->objcore, OF_GZIPED) &&
+	    !RFC2616_Req_Gzip(req->http) &&
+	    VDP_push(req, &VDP_gunzip, NULL, 1) < 0)
+		err++;
+
+	if (cache_param->http_range_support && status == 200) {
+		http_ForceHeader(req->resp, H_Accept_Ranges, "bytes");
+		if (http_GetHdr(req->http, H_Range, &r))
+			VRG_dorange(req, r);
 	}
 
-	if (err == 0)
-		req->transport->deliver(req, boc, sendbody);
-	else {
+	if (err) {
 		VSLb(req->vsl, SLT_Error, "Failure to push processors");
 		req->doclose = SC_OVERLOAD;
+	} else {
+		if (status < 200 || status == 204) {
+			// rfc7230,l,1691,1695
+			http_Unset(req->resp, H_Content_Length);
+		} else if (status == 304) {
+			// rfc7230,l,1675,1677
+			http_Unset(req->resp, H_Content_Length);
+		} else if (clval >= 0 && clval == req->resp_len) {
+			/* Reuse C-L header */
+		} else if (head && req->objcore->flags & OC_F_PASS) {
+			/* Don't touch C-L header */
+		} else {
+			http_Unset(req->resp, H_Content_Length);
+			if (req->resp_len >= 0)
+				http_PrintfHeader(req->resp,
+				    "Content-Length: %jd", req->resp_len);
+		}
+		if (req->resp_len == 0)
+			sendbody = 0;
+		req->transport->deliver(req, boc, sendbody);
 	}
 
 	VSLb_ts_req(req, "Resp", W_TIM_real(wrk));
@@ -434,6 +430,7 @@ cnt_transmit(struct worker *wrk, struct req *req)
 	(void)HSH_DerefObjCore(wrk, &req->objcore, HSH_RUSH_POLICY);
 	http_Teardown(req->resp);
 
+	req->res_mode = 0;
 	return (REQ_FSM_DONE);
 }
 
diff --git a/bin/varnishtest/tests/b00065.vtc b/bin/varnishtest/tests/b00065.vtc
index 5eb86d8d9..daf030659 100644
--- a/bin/varnishtest/tests/b00065.vtc
+++ b/bin/varnishtest/tests/b00065.vtc
@@ -1,20 +1,33 @@
-varnishtest "Test that C-L on HEAD request aren't nuked"
+varnishtest "Check that HEAD+pass returns Content-Length if backend provides it"
 
 server s1 {
+	rxreq
+	expect req.method == "GET"
+	txresp -bodylen 5
 	rxreq
 	expect req.method == "HEAD"
-	txresp -nolen -hdr "content-length: 17"
+	txresp -nolen -hdr "Content-Length: 6"
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_backend_fetch {
-		set bereq.method = "HEAD";
+	sub vcl_recv {
+		if (req.url == "/2") {
+			return (pass);
+		}
+	}
+	sub vcl_backend_response {
+		set beresp.do_stream = false;
 	}
 } -start
 
 client c1 {
-	txreq -req HEAD -hdr "connection: close"
-	rxresphdrs
-	expect resp.http.content-length == 17
-	expect_close
+	txreq -req HEAD
+	rxresp -no_obj
+	expect resp.http.content-length == 5
+} -run
+
+client c1 {
+	txreq -req HEAD -url /2
+	rxresp -no_obj
+	expect resp.http.content-length == 6
 } -run
diff --git a/bin/varnishtest/tests/r00730.vtc b/bin/varnishtest/tests/r00730.vtc
deleted file mode 100644
index e28c8c912..000000000
--- a/bin/varnishtest/tests/r00730.vtc
+++ /dev/null
@@ -1,31 +0,0 @@
-varnishtest "Check that HEAD returns Content-Length if backend provides it"
-
-server s1 {
-	rxreq
-	txresp -bodylen 5
-	rxreq
-	txresp -nolen -hdr "Content-Length: 6"
-} -start
-
-varnish v1 -vcl+backend {
-	sub vcl_recv {
-		if (req.url == "/2") {
-			return (pass);
-		}
-	}
-	sub vcl_backend_response {
-		set beresp.do_stream = false;
-	}
-} -start
-
-client c1 {
-	txreq -req HEAD
-	rxresp -no_obj
-	expect resp.http.content-length == 5
-} -run
-
-client c1 {
-	txreq -req HEAD -url /2
-	rxresp -no_obj
-	expect resp.http.content-length == 6
-} -run