From: Christopher Faulet <cfaulet@haproxy.com>
Date: Mon, 25 May 2020 05:59:59 +0000 (+0200)
Subject: REGTESTS: checks: Fix tls_health_checks when IPv6 addresses are used
X-Git-Tag: v2.2-dev9~202
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ed48657e0297268d83d4b07027843c0a8ab05d36;p=thirdparty%2Fhaproxy.git

REGTESTS: checks: Fix tls_health_checks when IPv6 addresses are used

In tls_health_checks.vtc, when IPv6 addresses are used, A config error is
reported because of the "addr" server parameter. Because there is no specified
port, the IPv6 address must be enclosed into brackets to be properly parsed. It
also works with IPv4 addresses. But instead, a dummy port is added to the addr
parameter. This way, we also check the port parameter, when specified, is used
in priority over the port found in the addr parameter.

This patch should fix the issue #646.
---

diff --git a/reg-tests/checks/tls_health_checks.vtc b/reg-tests/checks/tls_health_checks.vtc
index cd9290ddd9..ebc3c280af 100644
--- a/reg-tests/checks/tls_health_checks.vtc
+++ b/reg-tests/checks/tls_health_checks.vtc
@@ -116,7 +116,7 @@ haproxy h2 -conf {
         option log-health-checks
         option httpchk OPTIONS * HTTP/1.1\r\nHost:\ www
         log ${S6_addr}:${S6_port} daemon
-        server srv3 127.0.0.1:80 crt ${testdir}/common.pem verify none check check-ssl port ${h1_fe3_port} addr ${h1_fe3_addr}
+        server srv3 127.0.0.1:80 crt ${testdir}/common.pem verify none check check-ssl port ${h1_fe3_port} addr ${h1_fe3_addr}:80
 } -start
 
 syslog S1 -wait