[master] 70e143c Fix linkage to the top request

Nils Goroll nils.goroll at uplex.de
Mon Mar 9 18:46:54 CET 2015


commit 70e143c18a2ced2ba3bd117ad49115758c305707
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Mar 9 18:44:47 2015 +0100

    Fix linkage to the top request

diff --git a/bin/varnishd/cache/cache_esi_deliver.c b/bin/varnishd/cache/cache_esi_deliver.c
index 01cbcc2..d9764be 100644
--- a/bin/varnishd/cache/cache_esi_deliver.c
+++ b/bin/varnishd/cache/cache_esi_deliver.c
@@ -83,12 +83,12 @@ ved_include(struct req *preq, const char *src, const char *host)
 	VSLb(preq->vsl, SLT_Link, "req %u esi", VXID(req->vsl->wid));
 	req->esi_level = preq->esi_level + 1;
 
-	if (preq->esi_level == 0) {
+	if (preq->esi_level == 0)
 		assert(preq->top == preq);
-	} else {
+	else
 		CHECK_OBJ_NOTNULL(preq->top, REQ_MAGIC);
-		req->top = preq->top;
-	}
+
+	req->top = preq->top;
 
 	HTTP_Copy(req->http0, preq->http0);
 



More information about the varnish-commit mailing list