mirror of
https://git.haproxy.org/git/haproxy.git/
synced 2025-09-22 14:21:25 +02:00
[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.
This commit is contained in:
parent
446024e7fb
commit
1a211943f6
@ -609,17 +609,16 @@ static int tcp_parse_tcp_req(char **args, int section_type, struct proxy *curpx,
|
|||||||
// cond->line = linenum;
|
// cond->line = linenum;
|
||||||
if (cond)
|
if (cond)
|
||||||
curpx->acl_requires |= cond->requires;
|
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;
|
struct acl *acl;
|
||||||
const char *name;
|
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)";
|
name = acl ? acl->name : "(unknown)";
|
||||||
|
|
||||||
retlen = snprintf(err, errlen,
|
retlen = snprintf(err, errlen,
|
||||||
"acl '%s' involves some %s criteria which will be ignored.",
|
"acl '%s' involves some response-only criteria which will be ignored.",
|
||||||
name,
|
name);
|
||||||
(acl->requires & ACL_USE_RTR_ANY) ? "response-only" : "layer 7");
|
|
||||||
warn++;
|
warn++;
|
||||||
}
|
}
|
||||||
rule = (struct tcp_rule *)calloc(1, sizeof(*rule));
|
rule = (struct tcp_rule *)calloc(1, sizeof(*rule));
|
||||||
|
Loading…
x
Reference in New Issue
Block a user