[master] 4fc2d87 Make vdir->getbody() optional.

Poul-Henning Kamp phk at FreeBSD.org
Wed Sep 20 19:01:04 UTC 2017


commit 4fc2d87fed53839ea9c87cb12140fd90da93241e
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Sep 20 13:53:09 2017 +0000

    Make vdir->getbody() optional.

diff --git a/bin/varnishd/cache/cache_director.c b/bin/varnishd/cache/cache_director.c
index 2fc5b5a..0f65369 100644
--- a/bin/varnishd/cache/cache_director.c
+++ b/bin/varnishd/cache/cache_director.c
@@ -99,10 +99,11 @@ VDI_GetBody(struct worker *wrk, struct busyobj *bo)
 	d = bo->director_resp;
 	CHECK_OBJ_NOTNULL(d, DIRECTOR_MAGIC);
 	AZ(d->resolve);
-	AN(d->getbody);
 
 	assert(bo->director_state == DIR_S_HDRS);
 	bo->director_state = DIR_S_BODY;
+	if (d->getbody == NULL)
+		return (0);
 	return (d->getbody(d, wrk, bo));
 }
 


More information about the varnish-commit mailing list