From: Christopher Faulet <cfaulet@haproxy.com>
Date: Thu, 4 Feb 2021 09:17:15 +0000 (+0100)
Subject: MINOR: server: Don't set the check port during the update from a state file
X-Git-Tag: v2.4-dev7~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99497d7dba818ee6beeb90db75bd5bf3caf5bcc8;p=thirdparty%2Fhaproxy.git

MINOR: server: Don't set the check port during the update from a state file

When the server state is loaded from a server-state file, there is no reason
to set an unconfigured check port with the server port. Because by default,
if the check port is not set, the server's one is used. Thus we can remove
this useless assignment. It is mandatory for next improvements.
---

diff --git a/src/server.c b/src/server.c
index 99b7e91812..04e00d54a7 100644
--- a/src/server.c
+++ b/src/server.c
@@ -2973,11 +2973,6 @@ static void srv_update_state(struct server *srv, int version, char **params)
 					goto out;
 				}
 
-				/* configure check.port accordingly */
-				if ((srv->check.state & CHK_ST_CONFIGURED) &&
-				    !(srv->flags & SRV_F_CHECKPORT))
-					srv->check.port = port;
-
 				/* Unset SRV_F_MAPPORTS for SRV records.
 				 * SRV_F_MAPPORTS is unfortunately set by parse_server()
 				 * because no ports are provided in the configuration file.