condfetch: Check stale_oc bans before and after revalidation

varnishcache · Mar 15, 2024 · b452cdb · b452cdb
1 parent 44827f5
commit b452cdb
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
@@ -269,6 +269,9 @@ vbf_stp_mkbereq(struct worker *wrk, struct busyobj *bo)
 	}
 	http_ForceField(bo->bereq0, HTTP_HDR_PROTO, "HTTP/1.1");
 
+	if (bo->stale_oc != NULL)
+		HSH_CheckBans(wrk, bo->stale_oc);
+
 	if (bo->stale_oc != NULL && !(bo->stale_oc->flags & OC_F_DYING) &&
 	    ObjCheckFlag(bo->wrk, bo->stale_oc, OF_IMSCAND) &&
 	    (bo->stale_oc->boc != NULL || ObjGetLen(wrk, bo->stale_oc) != 0)) {
@@ -835,6 +838,8 @@ vbf_stp_condfetch(struct worker *wrk, struct busyobj *bo)
 	stale_oc = bo->stale_oc;
 	CHECK_OBJ_NOTNULL(stale_oc, OBJCORE_MAGIC);
 
+	HSH_CheckBans(wrk, stale_oc);
+
 	if (stale_oc->flags & OC_F_DYING) {
 		(void)VFP_Error(bo->vfc, "Template object invalidated");
 		vbf_cleanup(bo);