[master] d427ba9 Always nuke the IMS-candidate object if we successfully IMS fetch it.

Poul-Henning Kamp phk at FreeBSD.org
Fri Feb 7 12:40:16 CET 2014


commit d427ba97b2b769941cc405c5b1bd843043d4755c
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Fri Feb 7 11:39:53 2014 +0000

    Always nuke the IMS-candidate object if we successfully IMS fetch it.

diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index c6514fd..9254c8e 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -660,6 +660,7 @@ vbf_stp_condfetch(struct worker *wrk, struct busyobj *bo)
 		assert(al == bo->ims_obj->len);
 		assert(obj->len == al);
 		VBO_setstate(bo, BOS_FINISHED);
+		EXP_Rearm(bo->ims_obj, bo->ims_obj->exp.t_origin, 0, 0, 0);
 	}
 	HSH_Complete(obj->objcore);
 	return (F_STP_DONE);



More information about the varnish-commit mailing list