You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

36 lines
1.0 KiB

  1. From 793a74065926b0da87120d4b1e6330234475505c Mon Sep 17 00:00:00 2001
  2. From: Godbach <nylzhaowei@gmail.com>
  3. Date: Tue, 9 Jun 2015 19:41:52 +0800
  4. Subject: [PATCH 17/18] CLEANUP: deinit: remove codes for cleaning
  5. p->block_rules
  6. Since all rules listed in p->block_rules have been moved to the beginning of
  7. the http-request rules in check_config_validity(), there is no need to clean
  8. p->block_rules in deinit().
  9. Signed-off-by: Godbach <nylzhaowei@gmail.com>
  10. (cherry picked from commit 28b48ccbc879a552f988e6e1db22941e3362b4db)
  11. ---
  12. src/haproxy.c | 6 ------
  13. 1 file changed, 6 deletions(-)
  14. diff --git a/src/haproxy.c b/src/haproxy.c
  15. index 0dddd53..eac6f44 100644
  16. --- a/src/haproxy.c
  17. +++ b/src/haproxy.c
  18. @@ -1020,12 +1020,6 @@ void deinit(void)
  19. free(cwl);
  20. }
  21. - list_for_each_entry_safe(cond, condb, &p->block_rules, list) {
  22. - LIST_DEL(&cond->list);
  23. - prune_acl_cond(cond);
  24. - free(cond);
  25. - }
  26. -
  27. list_for_each_entry_safe(cond, condb, &p->mon_fail_cond, list) {
  28. LIST_DEL(&cond->list);
  29. prune_acl_cond(cond);
  30. --
  31. 2.3.6