[master] da1d27362 vcc_action: Accept vmod returned strings for return(fail())
Nils Goroll
nils.goroll at uplex.de
Mon Sep 16 13:09:06 UTC 2024
commit da1d273629bbfe299c195584f7f8653b167da7e6
Author: Walid Boudebouda <walid.boudebouda at gmail.com>
Date: Thu Sep 5 18:01:39 2024 +0200
vcc_action: Accept vmod returned strings for return(fail())
Fixes: #4170
diff --git a/bin/varnishtest/tests/v00018.vtc b/bin/varnishtest/tests/v00018.vtc
index 7e515e967..3ee4a5221 100644
--- a/bin/varnishtest/tests/v00018.vtc
+++ b/bin/varnishtest/tests/v00018.vtc
@@ -155,3 +155,13 @@ varnish v1 -errvcl {Expected '.' got ';'} {
rr;
}
}
+
+varnish v1 -vcl {
+ backend default none;
+
+ import debug;
+
+ sub vcl_recv {
+ return (fail(debug.author()));
+ }
+}
diff --git a/lib/libvcc/vcc_action.c b/lib/libvcc/vcc_action.c
index f7c2ce29f..86141d4a7 100644
--- a/lib/libvcc/vcc_action.c
+++ b/lib/libvcc/vcc_action.c
@@ -269,7 +269,7 @@ static void
vcc_act_return_fail(struct vcc *tl)
{
SkipToken(tl, '(');
- Fb(tl, 1, "VRT_fail(ctx,\n");
+ Fb(tl, 1, "VRT_fail(ctx, \"%%s\",\n");
tl->indent += INDENT;
vcc_Expr(tl, STRING);
tl->indent -= INDENT;
More information about the varnish-commit
mailing list