[4.1] 8405235 Insist that VCL events are only sent from CLI thread

PÃ¥l Hermunn Johansen hermunn at varnish-software.com
Mon Sep 12 15:48:17 CEST 2016


commit 8405235d270ace0003e24e4e9ade51146af34401
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Sep 5 21:13:07 2016 +0000

    Insist that VCL events are only sent from CLI thread

diff --git a/bin/varnishd/cache/cache_vcl.c b/bin/varnishd/cache/cache_vcl.c
index b4ad437..37927f7 100644
--- a/bin/varnishd/cache/cache_vcl.c
+++ b/bin/varnishd/cache/cache_vcl.c
@@ -480,6 +480,7 @@ static int
 vcl_setup_event(VRT_CTX, enum vcl_event_e ev)
 {
 
+	ASSERT_CLI();
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
 	CHECK_OBJ_NOTNULL(ctx->vcl, VCL_MAGIC);
 	CHECK_OBJ_NOTNULL(ctx->vcl->conf, VCL_CONF_MAGIC);
@@ -495,6 +496,7 @@ static void
 vcl_failsafe_event(VRT_CTX, enum vcl_event_e ev)
 {
 
+	ASSERT_CLI();
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
 	CHECK_OBJ_NOTNULL(ctx->vcl, VCL_MAGIC);
 	CHECK_OBJ_NOTNULL(ctx->vcl->conf, VCL_CONF_MAGIC);



More information about the varnish-commit mailing list