CLEANUP: acl: remove unused references to ACL_USE_*
Now that acl->requires is not used anymore, we can remove all references
to it as well as all ACL_USE_* flags.
diff --git a/src/proto_http.c b/src/proto_http.c
index 2dd3d73..c38a58a 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -9522,104 +9522,104 @@
* Please take care of keeping this list alphabetically sorted.
*/
static struct acl_kw_list acl_kws = {{ },{
- { "base", "base", acl_parse_str, acl_match_str, ACL_USE_L7REQ_VOLATILE },
- { "base_beg", "base", acl_parse_str, acl_match_beg, ACL_USE_L7REQ_VOLATILE },
- { "base_dir", "base", acl_parse_str, acl_match_dir, ACL_USE_L7REQ_VOLATILE },
- { "base_dom", "base", acl_parse_str, acl_match_dom, ACL_USE_L7REQ_VOLATILE },
- { "base_end", "base", acl_parse_str, acl_match_end, ACL_USE_L7REQ_VOLATILE },
- { "base_len", "base", acl_parse_int, acl_match_len, ACL_USE_L7REQ_VOLATILE },
- { "base_reg", "base", acl_parse_reg, acl_match_reg, ACL_USE_L7REQ_VOLATILE },
- { "base_sub", "base", acl_parse_str, acl_match_sub, ACL_USE_L7REQ_VOLATILE },
+ { "base", "base", acl_parse_str, acl_match_str },
+ { "base_beg", "base", acl_parse_str, acl_match_beg },
+ { "base_dir", "base", acl_parse_str, acl_match_dir },
+ { "base_dom", "base", acl_parse_str, acl_match_dom },
+ { "base_end", "base", acl_parse_str, acl_match_end },
+ { "base_len", "base", acl_parse_int, acl_match_len },
+ { "base_reg", "base", acl_parse_reg, acl_match_reg },
+ { "base_sub", "base", acl_parse_str, acl_match_sub },
- { "cook", "req.cook", acl_parse_str, acl_match_str, ACL_USE_L7REQ_VOLATILE },
- { "cook_beg", "req.cook", acl_parse_str, acl_match_beg, ACL_USE_L7REQ_VOLATILE },
- { "cook_cnt", "req.cook_cnt", acl_parse_int, acl_match_int, ACL_USE_L7REQ_VOLATILE },
- { "cook_dir", "req.cook", acl_parse_str, acl_match_dir, ACL_USE_L7REQ_VOLATILE },
- { "cook_dom", "req.cook", acl_parse_str, acl_match_dom, ACL_USE_L7REQ_VOLATILE },
- { "cook_end", "req.cook", acl_parse_str, acl_match_end, ACL_USE_L7REQ_VOLATILE },
- { "cook_len", "req.cook", acl_parse_int, acl_match_len, ACL_USE_L7REQ_VOLATILE },
- { "cook_reg", "req.cook", acl_parse_reg, acl_match_reg, ACL_USE_L7REQ_VOLATILE },
- { "cook_sub", "req.cook", acl_parse_str, acl_match_sub, ACL_USE_L7REQ_VOLATILE },
- { "cook_val", "req.cook_val", acl_parse_int, acl_match_int, ACL_USE_L7REQ_VOLATILE },
+ { "cook", "req.cook", acl_parse_str, acl_match_str },
+ { "cook_beg", "req.cook", acl_parse_str, acl_match_beg },
+ { "cook_cnt", "req.cook_cnt", acl_parse_int, acl_match_int },
+ { "cook_dir", "req.cook", acl_parse_str, acl_match_dir },
+ { "cook_dom", "req.cook", acl_parse_str, acl_match_dom },
+ { "cook_end", "req.cook", acl_parse_str, acl_match_end },
+ { "cook_len", "req.cook", acl_parse_int, acl_match_len },
+ { "cook_reg", "req.cook", acl_parse_reg, acl_match_reg },
+ { "cook_sub", "req.cook", acl_parse_str, acl_match_sub },
+ { "cook_val", "req.cook_val", acl_parse_int, acl_match_int },
- { "hdr", "req.hdr", acl_parse_str, acl_match_str, ACL_USE_L7REQ_VOLATILE },
- { "hdr_beg", "req.hdr", acl_parse_str, acl_match_beg, ACL_USE_L7REQ_VOLATILE },
- { "hdr_cnt", "req.hdr_cnt", acl_parse_int, acl_match_int, ACL_USE_L7REQ_VOLATILE },
- { "hdr_dir", "req.hdr", acl_parse_str, acl_match_dir, ACL_USE_L7REQ_VOLATILE },
- { "hdr_dom", "req.hdr", acl_parse_str, acl_match_dom, ACL_USE_L7REQ_VOLATILE },
- { "hdr_end", "req.hdr", acl_parse_str, acl_match_end, ACL_USE_L7REQ_VOLATILE },
- { "hdr_ip", "req.hdr_ip", acl_parse_ip, acl_match_ip, ACL_USE_L7REQ_VOLATILE },
- { "hdr_len", "req.hdr", acl_parse_int, acl_match_len, ACL_USE_L7REQ_VOLATILE },
- { "hdr_reg", "req.hdr", acl_parse_reg, acl_match_reg, ACL_USE_L7REQ_VOLATILE },
- { "hdr_sub", "req.hdr", acl_parse_str, acl_match_sub, ACL_USE_L7REQ_VOLATILE },
- { "hdr_val", "req.hdr_val", acl_parse_int, acl_match_int, ACL_USE_L7REQ_VOLATILE },
+ { "hdr", "req.hdr", acl_parse_str, acl_match_str },
+ { "hdr_beg", "req.hdr", acl_parse_str, acl_match_beg },
+ { "hdr_cnt", "req.hdr_cnt", acl_parse_int, acl_match_int },
+ { "hdr_dir", "req.hdr", acl_parse_str, acl_match_dir },
+ { "hdr_dom", "req.hdr", acl_parse_str, acl_match_dom },
+ { "hdr_end", "req.hdr", acl_parse_str, acl_match_end },
+ { "hdr_ip", "req.hdr_ip", acl_parse_ip, acl_match_ip },
+ { "hdr_len", "req.hdr", acl_parse_int, acl_match_len },
+ { "hdr_reg", "req.hdr", acl_parse_reg, acl_match_reg },
+ { "hdr_sub", "req.hdr", acl_parse_str, acl_match_sub },
+ { "hdr_val", "req.hdr_val", acl_parse_int, acl_match_int },
- { "http_auth", NULL, acl_parse_nothing, acl_match_nothing, ACL_USE_L7REQ_VOLATILE },
- { "http_auth_group", NULL, acl_parse_strcat, acl_match_auth, ACL_USE_L7REQ_VOLATILE },
+ { "http_auth", NULL, acl_parse_nothing, acl_match_nothing },
+ { "http_auth_group", NULL, acl_parse_strcat, acl_match_auth },
- { "http_first_req", NULL, acl_parse_nothing, acl_match_nothing, ACL_USE_L7REQ_PERMANENT },
+ { "http_first_req", NULL, acl_parse_nothing, acl_match_nothing },
- { "method", NULL, acl_parse_meth, acl_match_meth, ACL_USE_L7REQ_PERMANENT },
+ { "method", NULL, acl_parse_meth, acl_match_meth },
- { "path", "path", acl_parse_str, acl_match_str, ACL_USE_L7REQ_VOLATILE },
- { "path_beg", "path", acl_parse_str, acl_match_beg, ACL_USE_L7REQ_VOLATILE },
- { "path_dir", "path", acl_parse_str, acl_match_dir, ACL_USE_L7REQ_VOLATILE },
- { "path_dom", "path", acl_parse_str, acl_match_dom, ACL_USE_L7REQ_VOLATILE },
- { "path_end", "path", acl_parse_str, acl_match_end, ACL_USE_L7REQ_VOLATILE },
- { "path_len", "path", acl_parse_int, acl_match_len, ACL_USE_L7REQ_VOLATILE },
- { "path_reg", "path", acl_parse_reg, acl_match_reg, ACL_USE_L7REQ_VOLATILE },
- { "path_sub", "path", acl_parse_str, acl_match_sub, ACL_USE_L7REQ_VOLATILE },
+ { "path", "path", acl_parse_str, acl_match_str },
+ { "path_beg", "path", acl_parse_str, acl_match_beg },
+ { "path_dir", "path", acl_parse_str, acl_match_dir },
+ { "path_dom", "path", acl_parse_str, acl_match_dom },
+ { "path_end", "path", acl_parse_str, acl_match_end },
+ { "path_len", "path", acl_parse_int, acl_match_len },
+ { "path_reg", "path", acl_parse_reg, acl_match_reg },
+ { "path_sub", "path", acl_parse_str, acl_match_sub },
- { "req_proto_http", "req.proto_http",acl_parse_nothing, acl_match_nothing, ACL_USE_L7REQ_PERMANENT },
- { "req_ver", "req.ver", acl_parse_ver, acl_match_str, ACL_USE_L7REQ_VOLATILE },
- { "resp_ver", "res.ver", acl_parse_ver, acl_match_str, ACL_USE_L7RTR_VOLATILE },
+ { "req_proto_http", "req.proto_http",acl_parse_nothing, acl_match_nothing },
+ { "req_ver", "req.ver", acl_parse_ver, acl_match_str },
+ { "resp_ver", "res.ver", acl_parse_ver, acl_match_str },
- { "scook", "res.cook", acl_parse_str, acl_match_str, ACL_USE_L7RTR_VOLATILE },
- { "scook_beg", "res.cook", acl_parse_str, acl_match_beg, ACL_USE_L7RTR_VOLATILE },
- { "scook_cnt", "res.cook_cnt", acl_parse_int, acl_match_int, ACL_USE_L7RTR_VOLATILE },
- { "scook_dir", "res.cook", acl_parse_str, acl_match_dir, ACL_USE_L7RTR_VOLATILE },
- { "scook_dom", "res.cook", acl_parse_str, acl_match_dom, ACL_USE_L7RTR_VOLATILE },
- { "scook_end", "res.cook", acl_parse_str, acl_match_end, ACL_USE_L7RTR_VOLATILE },
- { "scook_len", "res.cook", acl_parse_int, acl_match_len, ACL_USE_L7RTR_VOLATILE },
- { "scook_reg", "res.cook", acl_parse_reg, acl_match_reg, ACL_USE_L7RTR_VOLATILE },
- { "scook_sub", "res.cook", acl_parse_str, acl_match_sub, ACL_USE_L7RTR_VOLATILE },
- { "scook_val", "res.cook_val", acl_parse_int, acl_match_int, ACL_USE_L7RTR_VOLATILE },
+ { "scook", "res.cook", acl_parse_str, acl_match_str },
+ { "scook_beg", "res.cook", acl_parse_str, acl_match_beg },
+ { "scook_cnt", "res.cook_cnt", acl_parse_int, acl_match_int },
+ { "scook_dir", "res.cook", acl_parse_str, acl_match_dir },
+ { "scook_dom", "res.cook", acl_parse_str, acl_match_dom },
+ { "scook_end", "res.cook", acl_parse_str, acl_match_end },
+ { "scook_len", "res.cook", acl_parse_int, acl_match_len },
+ { "scook_reg", "res.cook", acl_parse_reg, acl_match_reg },
+ { "scook_sub", "res.cook", acl_parse_str, acl_match_sub },
+ { "scook_val", "res.cook_val", acl_parse_int, acl_match_int },
- { "shdr", "res.hdr", acl_parse_str, acl_match_str, ACL_USE_L7RTR_VOLATILE },
- { "shdr_beg", "res.hdr", acl_parse_str, acl_match_beg, ACL_USE_L7RTR_VOLATILE },
- { "shdr_cnt", "res.hdr_cnt", acl_parse_int, acl_match_int, ACL_USE_L7RTR_VOLATILE },
- { "shdr_dir", "res.hdr", acl_parse_str, acl_match_dir, ACL_USE_L7RTR_VOLATILE },
- { "shdr_dom", "res.hdr", acl_parse_str, acl_match_dom, ACL_USE_L7RTR_VOLATILE },
- { "shdr_end", "res.hdr", acl_parse_str, acl_match_end, ACL_USE_L7RTR_VOLATILE },
- { "shdr_ip", "res.hdr_ip", acl_parse_ip, acl_match_ip, ACL_USE_L7RTR_VOLATILE },
- { "shdr_len", "res.hdr", acl_parse_int, acl_match_len, ACL_USE_L7RTR_VOLATILE },
- { "shdr_reg", "res.hdr", acl_parse_reg, acl_match_reg, ACL_USE_L7RTR_VOLATILE },
- { "shdr_sub", "res.hdr", acl_parse_str, acl_match_sub, ACL_USE_L7RTR_VOLATILE },
- { "shdr_val", "res.hdr_val", acl_parse_int, acl_match_int, ACL_USE_L7RTR_VOLATILE },
+ { "shdr", "res.hdr", acl_parse_str, acl_match_str },
+ { "shdr_beg", "res.hdr", acl_parse_str, acl_match_beg },
+ { "shdr_cnt", "res.hdr_cnt", acl_parse_int, acl_match_int },
+ { "shdr_dir", "res.hdr", acl_parse_str, acl_match_dir },
+ { "shdr_dom", "res.hdr", acl_parse_str, acl_match_dom },
+ { "shdr_end", "res.hdr", acl_parse_str, acl_match_end },
+ { "shdr_ip", "res.hdr_ip", acl_parse_ip, acl_match_ip },
+ { "shdr_len", "res.hdr", acl_parse_int, acl_match_len },
+ { "shdr_reg", "res.hdr", acl_parse_reg, acl_match_reg },
+ { "shdr_sub", "res.hdr", acl_parse_str, acl_match_sub },
+ { "shdr_val", "res.hdr_val", acl_parse_int, acl_match_int },
- { "status", NULL, acl_parse_int, acl_match_int, ACL_USE_L7RTR_PERMANENT },
+ { "status", NULL, acl_parse_int, acl_match_int },
- { "url", "url", acl_parse_str, acl_match_str, ACL_USE_L7REQ_VOLATILE },
- { "url_beg", "url", acl_parse_str, acl_match_beg, ACL_USE_L7REQ_VOLATILE },
- { "url_dir", "url", acl_parse_str, acl_match_dir, ACL_USE_L7REQ_VOLATILE },
- { "url_dom", "url", acl_parse_str, acl_match_dom, ACL_USE_L7REQ_VOLATILE },
- { "url_end", "url", acl_parse_str, acl_match_end, ACL_USE_L7REQ_VOLATILE },
- { "url_ip", "url_ip", acl_parse_ip, acl_match_ip, ACL_USE_L7REQ_VOLATILE },
- { "url_len", "url", acl_parse_int, acl_match_len, ACL_USE_L7REQ_VOLATILE },
- { "url_port", "url_port", acl_parse_int, acl_match_int, ACL_USE_L7REQ_VOLATILE },
- { "url_reg", "url", acl_parse_reg, acl_match_reg, ACL_USE_L7REQ_VOLATILE },
- { "url_sub", "url", acl_parse_str, acl_match_sub, ACL_USE_L7REQ_VOLATILE },
+ { "url", "url", acl_parse_str, acl_match_str },
+ { "url_beg", "url", acl_parse_str, acl_match_beg },
+ { "url_dir", "url", acl_parse_str, acl_match_dir },
+ { "url_dom", "url", acl_parse_str, acl_match_dom },
+ { "url_end", "url", acl_parse_str, acl_match_end },
+ { "url_ip", "url_ip", acl_parse_ip, acl_match_ip },
+ { "url_len", "url", acl_parse_int, acl_match_len },
+ { "url_port", "url_port", acl_parse_int, acl_match_int },
+ { "url_reg", "url", acl_parse_reg, acl_match_reg },
+ { "url_sub", "url", acl_parse_str, acl_match_sub },
- { "urlp", "urlp", acl_parse_str, acl_match_str, ACL_USE_L7REQ_VOLATILE },
- { "urlp_beg", "urlp", acl_parse_str, acl_match_beg, ACL_USE_L7REQ_VOLATILE },
- { "urlp_dir", "urlp", acl_parse_str, acl_match_dir, ACL_USE_L7REQ_VOLATILE },
- { "urlp_dom", "urlp", acl_parse_str, acl_match_dom, ACL_USE_L7REQ_VOLATILE },
- { "urlp_end", "urlp", acl_parse_str, acl_match_end, ACL_USE_L7REQ_VOLATILE },
- { "urlp_ip", "urlp", acl_parse_ip, acl_match_ip, ACL_USE_L7REQ_VOLATILE },
- { "urlp_len", "urlp", acl_parse_int, acl_match_len, ACL_USE_L7REQ_VOLATILE },
- { "urlp_reg", "urlp", acl_parse_reg, acl_match_reg, ACL_USE_L7REQ_VOLATILE },
- { "urlp_sub", "urlp", acl_parse_str, acl_match_sub, ACL_USE_L7REQ_VOLATILE },
- { "urlp_val", "urlp_val", acl_parse_int, acl_match_int, ACL_USE_L7REQ_VOLATILE },
+ { "urlp", "urlp", acl_parse_str, acl_match_str },
+ { "urlp_beg", "urlp", acl_parse_str, acl_match_beg },
+ { "urlp_dir", "urlp", acl_parse_str, acl_match_dir },
+ { "urlp_dom", "urlp", acl_parse_str, acl_match_dom },
+ { "urlp_end", "urlp", acl_parse_str, acl_match_end },
+ { "urlp_ip", "urlp", acl_parse_ip, acl_match_ip },
+ { "urlp_len", "urlp", acl_parse_int, acl_match_len },
+ { "urlp_reg", "urlp", acl_parse_reg, acl_match_reg },
+ { "urlp_sub", "urlp", acl_parse_str, acl_match_sub },
+ { "urlp_val", "urlp_val", acl_parse_int, acl_match_int },
{ /* END */ },
}};