[master] 44f4a82 Add a couple of clarifying asserts

Poul-Henning Kamp phk at FreeBSD.org
Mon Jan 6 21:12:47 CET 2014


commit 44f4a821fcdcd1d4954b17a6b2390c756ad5920f
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Jan 6 20:12:33 2014 +0000

    Add a couple of clarifying asserts

diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index ca15070..07436cf 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -417,6 +417,8 @@ cnt_lookup(struct worker *wrk, struct req *req)
 	switch (wrk->handling) {
 	case VCL_RET_DELIVER:
 		if (boc != NULL) {
+			AZ(oc->flags & (OC_F_FAILED|OC_F_DYING|OC_F_PASS));
+			AZ(oc->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