[master] 67a7b98 Also include the actual fix for 1253...

[Poul-Henning Kamp]

commit 67a7b98e8ecb5e36fde9918717da8823837ed261
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Jan 22 11:00:51 2013 +0000

    Also include the actual fix for 1253...

diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index 3d5693d..8925610 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -430,7 +430,9 @@ cnt_fetch(struct worker *wrk, struct req *req)
 	/* Clean up partial fetch */
 	AZ(bo->vbc);
 
-	if (req->objcore->objhead != NULL || req->handling == VCL_RET_ERROR) {
+	if (req->objcore->objhead != NULL ||
+	    req->handling == VCL_RET_RESTART ||
+	    req->handling == VCL_RET_ERROR) {
 		CHECK_OBJ_NOTNULL(req->objcore, OBJCORE_MAGIC);
 		AZ(HSH_Deref(&wrk->stats, req->objcore, NULL));
 		req->objcore = NULL;
@@ -1088,6 +1090,7 @@ cnt_recv(const struct worker *wrk, struct req *req)
 	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
 	CHECK_OBJ_NOTNULL(req->vcl, VCL_CONF_MAGIC);
 	AZ(req->obj);
+	AZ(req->objcore);
 	AZ(req->busyobj);
 
 	VSLb(req->vsl, SLT_ReqStart, "%s %s", req->sp->addr, req->sp->port);