[master] 3d50d45 Only assert on complete IMS object if we have a good status.
Poul-Henning Kamp
phk at FreeBSD.org
Mon Jan 6 09:53:14 CET 2014
commit 3d50d453ad6cd2b9d4da72d970b3051862757123
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Mon Jan 6 08:52:54 2014 +0000
Only assert on complete IMS object if we have a good status.
diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index e142103..bb6c7b2 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -633,10 +633,11 @@ vbf_stp_condfetch(struct worker *wrk, struct busyobj *bo)
} while (ois == OIS_DATA || ois == OIS_STREAM);
ObjIterEnd(&oi);
bo->stats = NULL;
- assert(al == bo->ims_obj->len);
- assert(obj->len == al);
- if (bo->state != BOS_FAILED)
+ if (bo->state != BOS_FAILED) {
+ assert(al == bo->ims_obj->len);
+ assert(obj->len == al);
VBO_setstate(bo, BOS_FINISHED);
+ }
HSH_Complete(obj->objcore);
return (F_STP_DONE);
}
More information about the varnish-commit
mailing list