[master] 47028c7 Alloc vmods to bail out of ->init, now that we have mechanism for doing the right thing during fini.

Poul-Henning Kamp phk at FreeBSD.org
Thu Jun 11 12:08:55 CEST 2015


commit 47028c70f9ffa99a1533cf1d3e1725442fda56ca
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Jun 11 09:47:58 2015 +0000

    Alloc vmods to bail out of ->init, now that we have mechanism for
    doing the right thing during fini.
    
    Patch by: Martin

diff --git a/lib/libvcc/vcc_vmod.c b/lib/libvcc/vcc_vmod.c
index 9f140db..c88c2ad 100644
--- a/lib/libvcc/vcc_vmod.c
+++ b/lib/libvcc/vcc_vmod.c
@@ -199,7 +199,8 @@ vcc_ParseImport(struct vcc *tl)
 			if (ifp == NULL)
 				ifp = New_IniFin(tl);
 			VSB_printf(ifp->ini,
-			    "\t%s(&vmod_priv_%.*s, &VCL_conf);",
+			    "\tif (%s(&vmod_priv_%.*s, &VCL_conf))\n"
+			    "\t\treturn(1);",
 			    p, PF(mod));
 		} else {
 			sym = VCC_AddSymbolStr(tl, p, SYM_FUNC);



More information about the varnish-commit mailing list