From: Willy Tarreau Date: Tue, 11 Jun 2013 19:22:58 +0000 (+0200) Subject: MEDIUM: acl: remove 15 additional useless ACLs that are equivalent to their fetches X-Git-Tag: v1.5-dev19~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c32484ed355126e280faa2306fd2d8e62c7562a7;p=thirdparty%2Fhaproxy.git MEDIUM: acl: remove 15 additional useless ACLs that are equivalent to their fetches The following 15 ACLs were missed from previous review, and are not needed either. hdr_cnt, hdr_ip, hdr_val, rep_ssl_hello_type, req_len, req_ssl_hello_type, scook_cnt, scook_val, shdr_cnt, shdr_ip, shdr_val, url_ip, url_port, urlp_val, req_proto_http. --- diff --git a/src/payload.c b/src/payload.c index 207fbb06ee..ee3e6ebbf2 100644 --- a/src/payload.c +++ b/src/payload.c @@ -683,11 +683,8 @@ static struct sample_fetch_kw_list smp_kws = {{ },{ static struct acl_kw_list acl_kws = {{ },{ { "payload", "req.payload", acl_parse_str, acl_match_str }, { "payload_lv", "req.payload_lv", acl_parse_str, acl_match_str }, - { "rep_ssl_hello_type", "res.ssl_hello_type", acl_parse_int, acl_match_int }, - { "req_len", "req.len", acl_parse_int, acl_match_int }, { "req_rdp_cookie", "req.rdp_cookie", acl_parse_str, acl_match_str }, { "req_rdp_cookie_cnt", "req.rdp_cookie_cnt", acl_parse_int, acl_match_int }, - { "req_ssl_hello_type", "req.ssl_hello_type", acl_parse_int, acl_match_int }, { "req_ssl_sni", "req.ssl_sni", acl_parse_str, acl_match_str }, { "req_ssl_ver", "req.ssl_ver", acl_parse_dotted_ver, acl_match_int }, { /* END */ }, diff --git a/src/proto_http.c b/src/proto_http.c index 67b91ce225..a4ed6a1c30 100644 --- a/src/proto_http.c +++ b/src/proto_http.c @@ -10116,26 +10116,21 @@ static struct acl_kw_list acl_kws = {{ },{ { "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 }, { "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_group", NULL, acl_parse_strcat, acl_match_auth }, @@ -10150,41 +10145,33 @@ static struct acl_kw_list acl_kws = {{ },{ { "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 }, { "req_ver", "req.ver", acl_parse_str, acl_match_str }, { "resp_ver", "res.ver", acl_parse_str, acl_match_str }, { "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 }, { "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 }, { "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 }, @@ -10197,7 +10184,6 @@ static struct acl_kw_list acl_kws = {{ },{ { "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 */ }, }};