From 1a211943f664ef0326da42f80c879ce87621c2e4 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Tue, 14 Jul 2009 13:53:17 +0200 Subject: [PATCH] [MINOR] acl: don't complain anymore when using L7 acls in TCP Since TCP can now check contents using L7 acls, we must not complain anymore. --- src/proto_tcp.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/proto_tcp.c b/src/proto_tcp.c index ff32726cd..3bdb27867 100644 --- a/src/proto_tcp.c +++ b/src/proto_tcp.c @@ -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));