r4252 - branches/2.0/varnish-cache/bin/varnishd

[tfheen at projects.linpro.no]

Author: tfheen
Date: 2009-09-28 12:34:47 +0200 (Mon, 28 Sep 2009)
New Revision: 4252

Modified:
   branches/2.0/varnish-cache/bin/varnishd/cache_center.c
   branches/2.0/varnish-cache/bin/varnishd/cache_hash.c
Log:
Merge r4055: Check that object has a ban before we unbusy it.



Modified: branches/2.0/varnish-cache/bin/varnishd/cache_center.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/cache_center.c	2009-09-28 10:23:25 UTC (rev 4251)
+++ branches/2.0/varnish-cache/bin/varnishd/cache_center.c	2009-09-28 10:34:47 UTC (rev 4252)
@@ -445,6 +445,7 @@
 	if (sp->obj->objhead != NULL) {
 		VRY_Create(sp);
 		EXP_Insert(sp->obj);
+		AN(sp->obj->ban);
 		HSH_Unbusy(sp);
 	}
 	sp->acct_req.fetch++;

Modified: branches/2.0/varnish-cache/bin/varnishd/cache_hash.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/cache_hash.c	2009-09-28 10:23:25 UTC (rev 4251)
+++ branches/2.0/varnish-cache/bin/varnishd/cache_hash.c	2009-09-28 10:34:47 UTC (rev 4252)
@@ -389,6 +389,7 @@
 	o = sp->obj;
 	CHECK_OBJ_NOTNULL(o, OBJECT_MAGIC);
 	assert(o->busy);
+	AN(o->ban);
 	assert(o->refcnt > 0);
 	if (o->ws_o->overflow)
 		VSL_stats->n_objoverflow++;