From: Willy Tarreau <w@1wt.eu>
Date: Wed, 16 Feb 2022 09:45:23 +0000 (+0100)
Subject: REGTESTS: server: close an occasional race on dynamic_server_ssl.vtc
X-Git-Tag: v2.6-dev2~120
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42f2a511d32363121c667d51548d15204625301f;p=thirdparty%2Fhaproxy.git

REGTESTS: server: close an occasional race on dynamic_server_ssl.vtc

Sometimes when sending commands to shut down a server, haproxy complains
that some connections remain, this is because the server-side connection
might not always be completely released at the moment the client leaves
and the operation is emitted. While shutting down server sessions work,
it seems cleaner to just use "option httpclose" which releases the server
earlier and avoids the race.

This can be backported to 2.5.
---

diff --git a/reg-tests/ssl/dynamic_server_ssl.vtc b/reg-tests/ssl/dynamic_server_ssl.vtc
index 0e6ecb5ab9..e498a81ca2 100644
--- a/reg-tests/ssl/dynamic_server_ssl.vtc
+++ b/reg-tests/ssl/dynamic_server_ssl.vtc
@@ -23,6 +23,7 @@ haproxy h1 -conf {
 
 	defaults
 		mode http
+		option httpclose
 		timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
 		timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
 		timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"