From: Willy Tarreau <w@1wt.eu>
Date: Fri, 31 May 2024 16:30:16 +0000 (+0200)
Subject: BUG/MINOR: cfgparse: remove the correct option on httpcheck send-state warning
X-Git-Tag: v3.1-dev1~87
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8194fab8205364d65cf5364e6daeca517eb75e0;p=thirdparty%2Fhaproxy.git

BUG/MINOR: cfgparse: remove the correct option on httpcheck send-state warning

In GH issue #2586 @Bbulatov reported a bug where the http-check
send-state flag is removed from options instead of options2 when
http-check is disabled. It only has an effect when this option is
set and http-check disabled, where it displays a warning indicating
this will be ignored. The option removed instead is srvtcpka when
this happens. It's likely that both options being so minor, nobody
ever faced it.

This can be backported to all versions.
---

diff --git a/src/cfgparse.c b/src/cfgparse.c
index f5cde502cb..701a370036 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -3053,7 +3053,7 @@ init_proxies_list_stage1:
 				ha_warning("'%s' will be ignored for %s '%s' (requires 'option httpchk').\n",
 					   "send-state", proxy_type_str(curproxy), curproxy->id);
 				err_code |= ERR_WARN;
-				curproxy->options &= ~PR_O2_CHK_SNDST;
+				curproxy->options2 &= ~PR_O2_CHK_SNDST;
 			}
 		}