From: Willy Tarreau <w@1wt.eu>
Date: Wed, 23 Sep 2020 16:12:11 +0000 (+0200)
Subject: MINOR: listeners: do not uselessly try to close zombie listeners in soft_stop()
X-Git-Tag: v2.3-dev6~58
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=987dbf5bab2d666275dfa6c3b28f4a8a3a838f6e;p=thirdparty%2Fhaproxy.git

MINOR: listeners: do not uselessly try to close zombie listeners in soft_stop()

The loop doesn't match anymore since the non-started listeners are in
LI_INIT and even if it had ever worked the benefit of closing zombies
at this point looks void at best.
---

diff --git a/src/proxy.c b/src/proxy.c
index e23268d98f..d5af92fc00 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -1237,21 +1237,6 @@ void soft_stop(void)
 	p = proxies_list;
 	tv_update_date(0,1); /* else, the old time before select will be used */
 	while (p) {
-		/* Zombie proxy, let's close the file descriptors */
-		if (p->state == PR_STSTOPPED &&
-		    !LIST_ISEMPTY(&p->conf.listeners) &&
-		    LIST_ELEM(p->conf.listeners.n,
-		    struct listener *, by_fe)->state > LI_ASSIGNED) {
-			struct listener *l;
-			list_for_each_entry(l, &p->conf.listeners, by_fe) {
-				if (l->state > LI_ASSIGNED) {
-					fd_delete(l->rx.fd);
-					l->rx.fd = -1;
-				}
-				l->state = LI_INIT;
-			}
-		}
-
 		if (p->state != PR_STSTOPPED) {
 			ha_warning("Stopping %s %s in %d ms.\n", proxy_cap_str(p->cap), p->id, p->grace);
 			send_log(p, LOG_WARNING, "Stopping %s %s in %d ms.\n", proxy_cap_str(p->cap), p->id, p->grace);