From: Godbach <nylzhaowei@gmail.com>
Date: Tue, 9 Jun 2015 11:41:52 +0000 (+0800)
Subject: CLEANUP: deinit: remove codes for cleaning p->block_rules
X-Git-Tag: v1.6-dev2~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28b48ccbc879a552f988e6e1db22941e3362b4db;p=thirdparty%2Fhaproxy.git

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 <nylzhaowei@gmail.com>
---

diff --git a/src/haproxy.c b/src/haproxy.c
index df48990c91..d45914f59f 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -1291,12 +1291,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);