Hi Willy,
On 2015/6/9 15:51, Willy Tarreau wrote:
Yes, please feel free to do so, we'll backport it into 1.5 as well.
BTW, I only checked this issue in 1.5 branch.
It must affect 1.6 as well in my opinion.
Attached is the patch.
The patch is generated in 1.5 branch because I failed to update 1.6
branch(maybe caused by my local network). As you said, both 1.6 and 1.5
branches should apply this patch.
--
Best Regards,
Godbach
>From f8fa9c908b5b817e1a5804584bc8433ab91f4767 Mon Sep 17 00:00:00 2001
From: Godbach <[email protected]>
Date: Tue, 9 Jun 2015 19:41:52 +0800
Subject: [PATCH] CLEANUP: deinit: remove codes for cleaning p->block_rules
Since all rules listed in p->block_rules have been moved to the beginning of
the http-request rules in check_config_validity(), there is no need to clean
p->block_rules in deinit().
Signed-off-by: Godbach <[email protected]>
---
src/haproxy.c | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/src/haproxy.c b/src/haproxy.c
index 0dddd53..eac6f44 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -1020,12 +1020,6 @@ void deinit(void)
free(cwl);
}
- list_for_each_entry_safe(cond, condb, &p->block_rules, list) {
- LIST_DEL(&cond->list);
- prune_acl_cond(cond);
- free(cond);
- }
-
list_for_each_entry_safe(cond, condb, &p->mon_fail_cond, list) {
LIST_DEL(&cond->list);
prune_acl_cond(cond);
--
1.7.7
