[master] 2247fc8 More commenting out busy checks

[Poul-Henning Kamp]

commit 2247fc840d9fe8e44b31cddd81be0d8f646b361c
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Mar 18 11:12:52 2014 +0000

    More commenting out busy checks

diff --git a/bin/varnishd/cache/cache_expire.c b/bin/varnishd/cache/cache_expire.c
index dfec9ee..4f21152 100644
--- a/bin/varnishd/cache/cache_expire.c
+++ b/bin/varnishd/cache/cache_expire.c
@@ -513,7 +513,7 @@ exp_expire(struct exp_priv *ep, double now)
 	lru = oc_getlru(oc);
 	CHECK_OBJ_NOTNULL(lru, LRU_MAGIC);
 	Lck_Lock(&lru->mtx);
-	AZ(oc->flags & OC_F_BUSY);
+	// AZ(oc->flags & OC_F_BUSY);
 	oc->flags |= OC_F_DYING;
 	if (oc->flags & OC_F_OFFLRU)
 		oc = NULL;
diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index 42471ed..5b5be58 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -203,11 +203,10 @@ vbf_stp_mkbereq(const struct worker *wrk, struct busyobj *bo)
 		if (http_GetHdr(bo->ims_obj->http, H_Last_Modified, &p)) {
 			http_PrintfHeader(bo->bereq0,
 			    "If-Modified-Since: %s", p);
-		} else if (http_GetHdr(bo->ims_obj->http, H_ETag, &p)) {
+		}
+		if (http_GetHdr(bo->ims_obj->http, H_ETag, &p)) {
 			http_PrintfHeader(bo->bereq0,
 			    "If-None-Match: %s", p);
-		} else {
-			WRONG("Shouldn't have bo->ims_obj");
 		}
 	}