Mailing List Archive

commit e0b164f9f134c0e594df8cb543036a441836da25
Author: Nils Goroll <nils.goroll@uplex.de>
Date: Wed Jan 31 11:05:12 2024 +0100

Polish

diff --git a/bin/varnishd/cache/cache_vrt_vcl.c b/bin/varnishd/cache/cache_vrt_vcl.c
index fb7043963..a454b14d9 100644
--- a/bin/varnishd/cache/cache_vrt_vcl.c
+++ b/bin/varnishd/cache/cache_vrt_vcl.c
@@ -154,6 +154,17 @@ vcldir_free(struct vcldir *vdir)
FREE_OBJ(vdir);
}

+static VCL_BACKEND
+vcldir_surplus(struct vcldir *vdir)
+{
+
+ CHECK_OBJ_NOTNULL(vdir, VCLDIR_MAGIC);
+ assert(vdir->refcnt == 1);
+ vdir->refcnt = 0;
+ vcldir_free(vdir);
+ return (NULL);
+}
+
VCL_BACKEND
VRT_AddDirector(VRT_CTX, const struct vdi_methods *m, void *priv,
const char *fmt, ...)
@@ -217,12 +228,9 @@ VRT_AddDirector(VRT_CTX, const struct vdi_methods *m, void *priv,
VDI_Event(vdir->dir, VCL_EVENT_WARM);
Lck_Unlock(&vcl_mtx);

- if (temp == VCL_TEMP_COOLING) {
- assert(vdir->refcnt == 1);
- vdir->refcnt = 0;
- vcldir_free(vdir);
- return (NULL);
- }
+ if (temp == VCL_TEMP_COOLING)
+ return (vcldir_surplus(vdir));
+
if (!temp->is_warm && temp != VCL_TEMP_INIT)
WRONG("Dynamic Backends can only be added to warm VCLs");

_______________________________________________
varnish-commit mailing list
varnish-commit@varnish-cache.org
https://www.varnish-cache.org/lists/mailman/listinfo/varnish-commit