[4.0] d381e24 Relax an assertion for the IMS update candidate object

Lasse Karstensen lkarsten at varnish-software.com
Thu Jan 15 16:35:43 CET 2015


commit d381e2458f39989df202be7c5719e1f60b20fb19
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 9c60b0f..cc5ede9 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -426,7 +426,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, o, VBF_BACKGROUND);



More information about the varnish-commit mailing list