commit 7d27f3c12d2aaa3514cdd02ed94ce4421c32fd6d
author Emeric Brun <ebrun@haproxy.com> Mon Jul 03 17:54:23 2017 +0200
committer Willy Tarreau <w@1wt.eu> Tue Jul 04 10:45:53 2017 +0200
tree b22506b17d57f9922a6ba40701c4a2896347a553
parent e0ee0be4e74af11f47a7bcf0b1e8cfd0e3092b2a

BUG/MEDIUM: map/acl: fix unwanted flags inheritance.

The bug: Maps/ACLs using the same file/id can mistakenly inherit
their flags from the last declared one.

i.e.

    $ cat haproxy.conf
    listen mylistener
	mode http
	bind 0.0.0.0:8080

	acl myacl1 url -i -f mine.acl
	acl myacl2 url -f mine.acl
	acl myacl3 url -i -f mine.acl
	redirect location / if myacl2
    $ cat mine.acl
    foobar

Shows an unexpected redirect for request 'GET /FOObAR HTTP/1.0\n\n'.

This fix should be backported on mainline branches v1.6 and v1.7.

include/proto/pattern.h

diff --git a/include/proto/pattern.h b/include/proto/pattern.h
index 9c93db9..5b99296 100644
--- a/include/proto/pattern.h
+++ b/include/proto/pattern.h
@@ -209,7 +209,7 @@
 void pattern_init_expr(struct pattern_expr *expr);
 struct pattern_expr *pattern_lookup_expr(struct pattern_head *head, struct pat_ref *ref);
 struct pattern_expr *pattern_new_expr(struct pattern_head *head, struct pat_ref *ref,
-                                      char **err, int *reuse);
+                                      int patflags, char **err, int *reuse);
 struct sample_data **pattern_find_smp(struct pattern_expr *expr, struct pat_ref_elt *elt);
 int pattern_delete(struct pattern_expr *expr, struct pat_ref_elt *ref);