From: Baptiste Assmann <bedis9@gmail.com>
Date: Mon, 25 Apr 2016 11:40:51 +0000 (+0200)
Subject: MAJOR: listen section: don't use first bind port anymore when no server ports are... 
X-Git-Tag: v1.7-dev4~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d260e1dea6689985f01835f009a24da180ee6c01;p=thirdparty%2Fhaproxy.git

MAJOR: listen section: don't use first bind port anymore when no server ports are provided

Up to HAProxy 1.7-dev3, HAProxy used to use the first bind port from it's
local 'listen' section when no port is configured on the server.

IE, in the configuration below, the server port would be 25:

  listen smtp
   bind :25
   server s1 1.0.0.1 check

This way of working is now obsolete and can be removed, furthermore it is not
documented!

This will make the possibility to change the server's port much easier.
---

diff --git a/src/server.c b/src/server.c
index 39fc4db61b..62c08b0569 100644
--- a/src/server.c
+++ b/src/server.c
@@ -1767,19 +1767,6 @@ int parse_server(const char *file, int linenum, char **args, struct proxy *curpr
 			if (!newsrv->check.port)
 				newsrv->check.port = realport; /* by default */
 
-			if (!newsrv->check.port) {
-				/* not yet valid, because no port was set on
-				 * the server either. We'll check if we have
-				 * a known port on the first listener.
-				 */
-				struct listener *l;
-
-				list_for_each_entry(l, &curproxy->conf.listeners, by_fe) {
-					newsrv->check.port = get_host_port(&l->addr);
-					if (newsrv->check.port)
-						break;
-				}
-			}
 			/*
 			 * We need at least a service port, a check port or the first tcp-check rule must
 			 * be a 'connect' one when checking an IPv4/IPv6 server.