]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
[MINOR] acl: don't complain anymore when using L7 acls in TCP
authorWilly Tarreau <w@1wt.eu>
Tue, 14 Jul 2009 11:53:17 +0000 (13:53 +0200)
committerWilly Tarreau <w@1wt.eu>
Tue, 14 Jul 2009 11:53:17 +0000 (13:53 +0200)
Since TCP can now check contents using L7 acls, we must not
complain anymore.

src/proto_tcp.c

index ff32726cd94813d69018d6934056bf6ba1a78923..3bdb2786749100b511b496421e79c18d640bf2cb 100644 (file)
@@ -609,17 +609,16 @@ static int tcp_parse_tcp_req(char **args, int section_type, struct proxy *curpx,
                // cond->line = linenum;
                if (cond)
                        curpx->acl_requires |= cond->requires;
-               if (cond && cond->requires & (ACL_USE_RTR_ANY | ACL_USE_L7_ANY)) {
+               if (cond && (cond->requires & ACL_USE_RTR_ANY)) {
                        struct acl *acl;
                        const char *name;
 
-                       acl = cond_find_require(cond, ACL_USE_RTR_ANY|ACL_USE_L7_ANY);
+                       acl = cond_find_require(cond, ACL_USE_RTR_ANY);
                        name = acl ? acl->name : "(unknown)";
 
                        retlen = snprintf(err, errlen,
-                                         "acl '%s' involves some %s criteria which will be ignored.",
-                                         name,
-                                         (acl->requires & ACL_USE_RTR_ANY) ? "response-only" : "layer 7");
+                                         "acl '%s' involves some response-only criteria which will be ignored.",
+                                         name);
                        warn++;
                }
                rule = (struct tcp_rule *)calloc(1, sizeof(*rule));