[4.0] db1d398 Fix an assert to look at the right objcore

Poul-Henning Kamp phk at FreeBSD.org
Tue Apr 1 15:09:55 CEST 2014


commit db1d3987b8f5113495905a953f68b5ccf61ba28d
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Fri Mar 28 09:10:21 2014 +0000

    Fix an assert to look at the right objcore

diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index 9826ae7..090e0b6 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -414,7 +414,7 @@ cnt_lookup(struct worker *wrk, struct req *req)
 		if (boc != NULL) {
 			AZ(oc->flags & (OC_F_FAILED|OC_F_PASS));
 			AZ(oc->exp_flags & OC_EF_DYING);
-			AZ(oc->busyobj);
+			AZ(boc->busyobj);
 			VBF_Fetch(wrk, req, boc, o, VBF_BACKGROUND);
 		} else {
 			(void)HTTP1_DiscardReqBody(req);// XXX: handle err



More information about the varnish-commit mailing list