[master] 298ffb6 Relax an assertion for the IMS update candidate object
Martin Blix Grydeland
martin at varnish-software.com
Wed Dec 17 13:50:26 CET 2014
commit 298ffb63d3fb0c3e4a683acba0d9639d6901a655
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date: Tue Dec 16 18:05:54 2014 +0100
Relax an assertion for the IMS update candidate object
The streaming fetch of an object can fail between lookup time and when
we actually use it. Relax this assertion.
Fixes: #1647
diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index 1078d34..b2e5aef 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -356,7 +356,7 @@ 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_PASS));
+ AZ(oc->flags & OC_F_PASS);
AZ(oc->exp_flags & OC_EF_DYING);
AZ(boc->busyobj);
VBF_Fetch(wrk, req, boc, oc, VBF_BACKGROUND);
More information about the varnish-commit
mailing list