mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-28 22:31:06 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Christopher Faulet 2021-10-15 14:33:34 +02:00
parent 71d1892190
commit 6db9a97f61
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/proxy.c
View File

@ -1417,6 +1417,8 @@ void proxy_preset_defaults(struct proxy *defproxy)
*/ */
void proxy_free_defaults(struct proxy *defproxy) void proxy_free_defaults(struct proxy *defproxy)
{ {
struct acl *acl, *aclb;
ha_free(&defproxy->id); ha_free(&defproxy->id);
ha_free(&defproxy->conf.file); ha_free(&defproxy->conf.file);
ha_free(&defproxy->check_command); 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->orgto_hdr_name); defproxy->orgto_hdr_len = 0;
ha_free(&defproxy->server_id_hdr_name); defproxy->server_id_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 && if (defproxy->conf.logformat_string != default_http_log_format &&
defproxy->conf.logformat_string != default_tcp_log_format && defproxy->conf.logformat_string != default_tcp_log_format &&
defproxy->conf.logformat_string != clf_http_log_format && defproxy->conf.logformat_string != clf_http_log_format &&