[master] 2643a6c Polish

[Poul-Henning Kamp]

commit 2643a6cad0aed05eab549dd348e849addd9096bc
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu May 23 07:30:16 2013 +0000

    Polish

diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index 4bf15de..3fcf0ba 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -791,7 +791,7 @@ VBF_Fetch(struct worker *wrk, struct req *req)
 
 	bo = req->busyobj;
 	CHECK_OBJ_NOTNULL(bo, BUSYOBJ_MAGIC);
-	xxxassert(bo->refcount == 2);	// Req might abandon early ?
+	assert(bo->refcount == 2);
 	CHECK_OBJ_NOTNULL(bo->vcl, VCL_CONF_MAGIC);
 
 	bo->fetch_objcore = req->objcore;
@@ -803,13 +803,8 @@ VBF_Fetch(struct worker *wrk, struct req *req)
 	if (i)
 		return (i);
 
-	if (bo->fetch_objcore->objhead == NULL) {
+	if (bo->fetch_objcore->objhead == NULL) 
 		AN(bo->do_pass);
-		/* This is a pass from vcl_recv */
-		bo->do_pass = 1;
-		/* VCL may have fiddled this, but that doesn't help */
-		// bo->exp.ttl = -1.;
-	}
 
 	/*
 	 * The VCL variables beresp.do_g[un]zip tells us how we want the
diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index 6f4e49b..86586da 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -356,6 +356,8 @@ cnt_fetch(struct worker *wrk, struct req *req)
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
 
+	AN(req->busyobj);
+	AN(req->objcore);
 	i = VBF_Fetch(wrk, req);
 	AN(req->busyobj);
 	assert(req->busyobj->refcount > 0);