Commit 00aaf2f8 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Allow for pass opbjects not having a objcore



git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@3774 d4fa192b-c00b-0410-8231-f00ffab90ce4
parent bc7e06ec
......@@ -377,11 +377,13 @@ HSH_Drop(struct sess *sp)
CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
o = sp->obj;
CHECK_OBJ_NOTNULL(o, OBJECT_MAGIC);
AN(ObjIsBusy(o));
if (o->objcore != NULL) /* Pass has no objcore */
AN(ObjIsBusy(o));
assert(o->refcnt > 0);
o->ttl = 0;
o->cacheable = 0;
HSH_Unbusy(sp);
if (o->objcore != NULL) /* Pass has no objcore */
HSH_Unbusy(sp);
HSH_Deref(&sp->obj);
}
......
......@@ -643,7 +643,8 @@ VRT_ESI(struct sess *sp)
CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
CHECK_OBJ_NOTNULL(sp->obj, OBJECT_MAGIC);
AN(ObjIsBusy(sp->obj));
if (sp->obj->objcore != NULL) /* Pass has no objcore */
AN(ObjIsBusy(sp->obj));
if (sp->cur_method != VCL_MET_FETCH) {
/* XXX: we should catch this at compile time */
WSP(sp, SLT_VCL_error,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment