Move the responsibility for conclusively deciding beresp->body_status

to the VDIR.

Move the responsibility for conclusively deciding beresp->body_status
to the VDIR.
503a6430 · Poul-Henning Kamp · 5fbe576f · 503a6430 · 503a6430
Commit 503a6430 authored Sep 20, 2017 by Poul-Henning Kamp
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

cache_http1_fetch.c bin/varnishd/http1/cache_http1_fetch.c +1 -0

No files found.
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -304,7 +304,6 @@ vbf_stp_startfetch(struct worker *wrk, struct busyobj *bo)

 	http_VSL_log(bo->beresp);

-	RFC2616_Response_Body(wrk, bo);
 	if (bo->htc->body_status == BS_ERROR) {
 		bo->htc->doclose = SC_RX_BODY;
 		VDI_Finish(bo->wrk, bo);

--- a/bin/varnishd/http1/cache_http1_fetch.c
+++ b/bin/varnishd/http1/cache_http1_fetch.c
@@ -201,6 +201,7 @@ V1F_FetchRespHdr(struct busyobj *bo)
 	}

 	htc->doclose = http_DoConnection(hp);
+	RFC2616_Response_Body(bo->wrk, bo);

 	return (0);
 }