[6.0] 2b4adddee Unbotch my refactoring of || and && handling in VCL expressions.

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Thu Aug 16 08:53:22 UTC 2018


commit 2b4adddeea32a4a7a2066ab2edd613a09cc6406e
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Aug 6 16:00:20 2018 +0000

    Unbotch my refactoring of || and && handling in VCL expressions.
    
    Fixes: #2729

diff --git a/lib/libvcc/vcc_expr.c b/lib/libvcc/vcc_expr.c
index dacb32260..39a01af38 100644
--- a/lib/libvcc/vcc_expr.c
+++ b/lib/libvcc/vcc_expr.c
@@ -1215,7 +1215,7 @@ vcc_expr_bin_bool(struct vcc *tl, struct expr **e, vcc_type_t fmt,
 	while (tl->t->tok == ourtok) {
 		vcc_NextToken(tl);
 		tk = tl->t;
-		vcc_expr_not(tl, &e2, fmt);
+		up(tl, &e2, fmt);
 		ERRCHK(tl);
 		vcc_expr_tobool(tl, &e2);
 		ERRCHK(tl);


More information about the varnish-commit mailing list