[master] 175c8ddea fix ban.list obj.http.* rendering
Nils Goroll
nils.goroll at uplex.de
Thu Apr 25 08:45:10 UTC 2019
commit 175c8ddea715a2270d6205e74874aaa8aa12140b
Author: Nils Goroll <nils.goroll at uplex.de>
Date: Thu Apr 25 10:43:57 2019 +0200
fix ban.list obj.http.* rendering
Fixes #2985
diff --git a/bin/varnishd/cache/cache_ban.c b/bin/varnishd/cache/cache_ban.c
index 283cad024..0bfca2d04 100644
--- a/bin/varnishd/cache/cache_ban.c
+++ b/bin/varnishd/cache/cache_ban.c
@@ -798,7 +798,7 @@ ban_render(struct cli *cli, const uint8_t *bs, int quote)
ASSERT_BAN_OPER(bt.oper);
if (BANS_HAS_ARG1_SPEC(bt.arg1))
- VCLI_Out(cli, "%s.%.*s",
+ VCLI_Out(cli, "%s%.*s",
arg_name[BAN_ARGIDX(bt.arg1)],
bt.arg1_spec[0] - 1, bt.arg1_spec + 1);
else
diff --git a/bin/varnishtest/tests/c00019.vtc b/bin/varnishtest/tests/c00019.vtc
index 3a4a3b2f8..9c8bd4e55 100644
--- a/bin/varnishtest/tests/c00019.vtc
+++ b/bin/varnishtest/tests/c00019.vtc
@@ -92,5 +92,5 @@ varnish v1 -clierr 106 "ban req.url ~ [[["
# Ban expression with quoting
varnish v1 -cliok {ban req.url ~ "BAR"}
shell {varnishadm -n ${tmpdir}/v1 ban 'obj.http.Host ~ \"Foo\"'}
-varnish v1 -cliok "ban.list"
+varnish v1 -cliexpect {(?s)\d+\.\d+\s+\d+\s+-\s+\Qobj.http.Host ~ "Foo"\E} "ban.list"
varnish v1 -clijson "ban.list -j"
More information about the varnish-commit
mailing list