BUG/MINOR: proxy: Release ACLs and TCP/HTTP rules of default proxies

It is now possible to have TCP/HTTP rules and ACLs defined in defaults
sections. So we must try to release corresponding lists when a default proxy
is destroyed.

No backport needed.

diff --git a/src/proxy.c b/src/proxy.c
index 27a917dfde76c47b925a60ff1522923fdf9ba5c0..ff5e35e2cc73ba5d274460ceec53e0b6de63b833 100644 (file)
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -1417,6 +1417,8 @@ void proxy_preset_defaults(struct proxy *defproxy)
  */
 void proxy_free_defaults(struct proxy *defproxy)
 {
+       struct acl *acl, *aclb;
+
        ha_free(&defproxy->id);
        ha_free(&defproxy->conf.file);
        ha_free(&defproxy->check_command);
@@ -1435,6 +1437,20 @@ void proxy_free_defaults(struct proxy *defproxy)
        ha_free(&defproxy->orgto_hdr_name); defproxy->orgto_hdr_len = 0;
        ha_free(&defproxy->server_id_hdr_name); defproxy->server_id_hdr_len = 0;
 
+       list_for_each_entry_safe(acl, aclb, &defproxy->acl, list) {
+               LIST_DELETE(&acl->list);
+               prune_acl(acl);
+               free(acl);
+       }
+
+       free_act_rules(&defproxy->tcp_req.inspect_rules);
+       free_act_rules(&defproxy->tcp_rep.inspect_rules);
+       free_act_rules(&defproxy->tcp_req.l4_rules);
+       free_act_rules(&defproxy->tcp_req.l5_rules);
+       free_act_rules(&defproxy->http_req_rules);
+       free_act_rules(&defproxy->http_res_rules);
+       free_act_rules(&defproxy->http_after_res_rules);
+
        if (defproxy->conf.logformat_string != default_http_log_format &&
            defproxy->conf.logformat_string != default_tcp_log_format &&
            defproxy->conf.logformat_string != clf_http_log_format &&