[4.0] d63efb1 Correctly initialize esi-included req->http0

Martin Blix Grydeland martin at varnish-software.com
Wed Mar 23 11:27:03 CET 2016


commit d63efb1af5a6528ba10ce56aa0e937c2f7c50b16
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Tue Mar 15 18:37:39 2016 +0000

    Correctly initialize esi-included req->http0
    
    Merge from VC master commit ea251504784faab57e0d47941317a7a046ed78a3.

diff --git a/bin/varnishd/cache/cache_esi_deliver.c b/bin/varnishd/cache/cache_esi_deliver.c
index 45cfb32..ce98a3d 100644
--- a/bin/varnishd/cache/cache_esi_deliver.c
+++ b/bin/varnishd/cache/cache_esi_deliver.c
@@ -70,10 +70,11 @@ ved_include(struct req *preq, const char *src, const char *host)
 
 	HTTP_Copy(req->http0, preq->http0);
 
+	req->http0->ws = req->ws;
+	req->http0->vsl = req->vsl;
+	req->http0->logtag = SLT_ReqMethod;
 	req->http0->conds = 0;
 
-	HTTP_Setup(req->http, req->ws, req->vsl, SLT_ReqMethod);
-
 	http_SetH(req->http0, HTTP_HDR_URL, src);
 	if (host != NULL && *host != '\0')  {
 		http_Unset(req->http0, H_Host);



More information about the varnish-commit mailing list