From: Aurelien DARRAGON <adarragon@haproxy.com>
Date: Fri, 17 Nov 2023 17:01:37 +0000 (+0100)
Subject: Revert "MINOR: stktable: "stick" requires TCP or HTTP mode"
X-Git-Tag: v2.9-dev10~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c90d7dc46bc27b95b4c50db9979dee2c84ab7c2f;p=thirdparty%2Fhaproxy.git

Revert "MINOR: stktable: "stick" requires TCP or HTTP mode"

This reverts commit 098ae743fd17b3fae6671e53d9bdb74eb3f315fd since we
cannot perform the test during parsing as the effective proxy mode is
not yet known.
---

diff --git a/src/cfgparse-listen.c b/src/cfgparse-listen.c
index 49c7c7b255..8981ef2b42 100644
--- a/src/cfgparse-listen.c
+++ b/src/cfgparse-listen.c
@@ -1546,13 +1546,6 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
 			goto out;
 		}
 
-		if (curproxy->mode != PR_MODE_TCP && curproxy->mode != PR_MODE_HTTP) {
-			ha_alert("parsing [%s:%d] : 'stick-table' requires TCP or HTTP mode.\n",
-				 file, linenum);
-			err_code |= ERR_ALERT | ERR_FATAL;
-			goto out;
-		}
-
 		other = stktable_find_by_name(curproxy->id);
 		if (other) {
 			ha_alert("parsing [%s:%d] : stick-table name '%s' conflicts with table declared in %s '%s' at %s:%d.\n",
@@ -1605,13 +1598,6 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
 			goto out;
 		}
 
-		if (curproxy->mode != PR_MODE_TCP && curproxy->mode != PR_MODE_HTTP) {
-			ha_alert("parsing [%s:%d] : '%s' requires TCP or HTTP mode.\n",
-				 file, linenum, args[0]);
-			err_code |= ERR_ALERT | ERR_FATAL;
-			goto out;
-		}
-
 		if (warnifnotcap(curproxy, PR_CAP_BE, file, linenum, args[0], NULL)) {
 			err_code |= ERR_WARN;
 			goto out;