From dac168bc15f603a4a8abddea8cdb0d56f72afb24 Mon Sep 17 00:00:00 2001
From: Tim Duesterhus <tim@bastelstu.be>
Date: Tue, 14 May 2019 20:57:58 +0200
Subject: [PATCH] MEDIUM: Make 'redispatch' directive fatal

It was deprecated with HAProxy 1.5. Time to remove it.
---
 doc/configuration.txt  | 26 --------------------------
 include/types/global.h |  2 +-
 src/cfgparse-listen.c  | 14 +++-----------
 3 files changed, 4 insertions(+), 38 deletions(-)

diff --git a/doc/configuration.txt b/doc/configuration.txt
index 62f02af51..db51c07d1 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -2449,8 +2449,6 @@ external-check path                       X          -         X         X
 persist rdp-cookie                        X          -         X         X
 rate-limit sessions                       X          X         X         -
 redirect                                  -          X         X         X
-redisp                      (deprecated)  X          -         X         X
-redispatch                  (deprecated)  X          -         X         X
 reqadd                      (deprecated)  -          X         X         X
 reqallow                    (deprecated)  -          X         X         X
 reqdel                      (deprecated)  -          X         X         X
@@ -7760,30 +7758,6 @@ redirect scheme   <sch> [code <code>] <option> [{if | unless} <condition>]
   See section 7 about ACL usage.
 
 
-redisp (deprecated)
-redispatch (deprecated)
-  Enable or disable session redistribution in case of connection failure
-  May be used in sections:    defaults | frontend | listen | backend
-                                 yes   |    no    |   yes  |   yes
-  Arguments : none
-
-  In HTTP mode, if a server designated by a cookie is down, clients may
-  definitely stick to it because they cannot flush the cookie, so they will not
-  be able to access the service anymore.
-
-  Specifying "redispatch" will allow the proxy to break their persistence and
-  redistribute them to a working server.
-
-  It also allows to retry last connection to another server in case of multiple
-  connection failures. Of course, it requires having "retries" set to a nonzero
-  value.
-
-  This form is deprecated, do not use it in any new configuration, use the new
-  "option redispatch" instead.
-
-  See also : "option redispatch"
-
-
 reqadd  <string> [{if | unless} <cond>] (deprecated)
   Add a header at the end of the HTTP request
   May be used in sections :   defaults | frontend | listen | backend
diff --git a/include/types/global.h b/include/types/global.h
index fb0c5e123..ce8a93d3e 100644
--- a/include/types/global.h
+++ b/include/types/global.h
@@ -251,7 +251,7 @@ extern int atexit_flag;
 /* bit values to go with "warned" above */
 /* unassigned : 0x00000001 (previously: WARN_BLOCK_DEPRECATED) */
 /* unassigned : 0x00000002 */
-#define WARN_REDISPATCH_DEPRECATED  0x00000004
+/* unassigned : 0x00000004 (previously: WARN_REDISPATCH_DEPRECATED) */
 #define WARN_CLITO_DEPRECATED       0x00000008
 #define WARN_SRVTO_DEPRECATED       0x00000010
 #define WARN_CONTO_DEPRECATED       0x00000020
diff --git a/src/cfgparse-listen.c b/src/cfgparse-listen.c
index 5fd8ecf5a..9c98a2371 100644
--- a/src/cfgparse-listen.c
+++ b/src/cfgparse-listen.c
@@ -2822,18 +2822,10 @@ stats_error_parsing:
 			goto out;
 	}
 	else if (!strcmp(args[0], "redispatch") || !strcmp(args[0], "redisp")) {
-		if (warnifnotcap(curproxy, PR_CAP_BE, file, linenum, args[0], NULL))
-			err_code |= ERR_WARN;
-
-		if (!already_warned(WARN_REDISPATCH_DEPRECATED))
-			ha_warning("parsing [%s:%d]: keyword '%s' is deprecated in favor of 'option redispatch', and will not be supported by future versions.\n",
-				   file, linenum, args[0]);
-		err_code |= ERR_WARN;
-		/* enable reconnections to dispatch */
-		curproxy->options |= PR_O_REDISP;
+		ha_alert("parsing [%s:%d] : keyword '%s' directive is not supported anymore since HAProxy 2.1. Use 'option redispatch'.\n", file, linenum, args[0]);
 
-		if (alertif_too_many_args_idx(1, 0, file, linenum, args, &err_code))
-			goto out;
+		err_code |= ERR_ALERT | ERR_FATAL;
+		goto out;
 	}
 	else if (!strcmp(args[0], "http-reuse")) {
 		if (warnifnotcap(curproxy, PR_CAP_BE, file, linenum, args[0], NULL))
-- 
2.47.3