[master] 93a188354 fix glitches
Nils Goroll
nils.goroll at uplex.de
Mon Mar 4 14:48:07 UTC 2019
commit 93a188354338133439c34a0d8f1d4bc4e747e9a2
Author: Nils Goroll <nils.goroll at uplex.de>
Date: Mon Mar 4 15:41:14 2019 +0100
fix glitches
Ref: #2896
diff --git a/bin/varnishtest/tests/o00004.vtc b/bin/varnishtest/tests/o00004.vtc
index 6aa345c33..5effa2890 100644
--- a/bin/varnishtest/tests/o00004.vtc
+++ b/bin/varnishtest/tests/o00004.vtc
@@ -49,5 +49,5 @@ varnish v2 -vcl {
server s1 -wait
delay 1
-varnish v2 -cliexpect "vcl1.bp1[ ]+probe[ ]+1/1[ ]+good" backend.list
-varnish v2 -cliexpect "vcl1.bp2[ ]+probe[ ]+1/1[ ]+good" backend.list
+varnish v2 -cliexpect "vcl1.bp1[ ]+probe[ ]+1/1[ ]+healthy" backend.list
+varnish v2 -cliexpect "vcl1.bp2[ ]+probe[ ]+1/1[ ]+healthy" backend.list
diff --git a/bin/varnishtest/tests/r02702.vtc b/bin/varnishtest/tests/r02702.vtc
index c9a938a90..a68c9acb3 100644
--- a/bin/varnishtest/tests/r02702.vtc
+++ b/bin/varnishtest/tests/r02702.vtc
@@ -29,7 +29,7 @@ varnish v1 -vcl {
delay 1
-varnish v1 -cliexpect "vcl1.s1[ ]+probe[ ]+1/1[ ]+good" backend.list
+varnish v1 -cliexpect "vcl1.s1[ ]+probe[ ]+1/1[ ]+healthy" backend.list
# For PROXYv2, we apply a trick similar to o0000[24].vtc, since
# Varnish accepts (and ignores) PROXY LOCAL.
@@ -63,7 +63,7 @@ server s1 -wait
delay 1
-varnish v3 -cliexpect "vcl1.bp[ ]+probe[ ]+1/1[ ]+good" backend.list
+varnish v3 -cliexpect "vcl1.bp[ ]+probe[ ]+1/1[ ]+healthy" backend.list
# Verify in the v2 log that PROXY LOCAL was sent.
diff --git a/lib/libvmod_directors/round_robin.c b/lib/libvmod_directors/round_robin.c
index f7c3afb60..ff8ff7799 100644
--- a/lib/libvmod_directors/round_robin.c
+++ b/lib/libvmod_directors/round_robin.c
@@ -63,7 +63,7 @@ vmod_rr_list(VRT_CTX, VCL_BACKEND dir, struct vsb *vsb, int pflag, int jflag)
CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
CHECK_OBJ_NOTNULL(dir, DIRECTOR_MAGIC);
CAST_OBJ_NOTNULL(rr, dir->priv, VMOD_DIRECTORS_ROUND_ROBIN_MAGIC);
- return (vdir_list(ctx, rr->vd, vsb, pflag, jflag));
+ vdir_list(ctx, rr->vd, vsb, pflag, jflag);
}
static VCL_BACKEND v_matchproto_(vdi_resolve_f)
More information about the varnish-commit
mailing list