mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 14:21:25 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: proxy: Remove support of the option 'http-tunnel'

Browse Source 
The option 'http-tunnel' is deprecated and it was only used in the legacy HTTP
mode. So this option is now totally ignored and a warning is emitted during
HAProxy startup if it is found in a configuration file.
This commit is contained in:
Christopher Faulet 2019-07-16 15:04:46 +02:00
parent 0fe5c5e1d2
commit 73e8ede156
3 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/types/proxy.h
View File

@ -117,8 +117,8 @@ enum PR_SRV_STATE_FILE {
#define PR_O_HTTP_KAL 0x00000000 /* HTTP keep-alive mode (http-keep-alive) */ #define PR_O_HTTP_KAL 0x00000000 /* HTTP keep-alive mode (http-keep-alive) */
#define PR_O_HTTP_CLO 0x01000000 /* HTTP close mode (httpclose) */ #define PR_O_HTTP_CLO 0x01000000 /* HTTP close mode (httpclose) */
#define PR_O_HTTP_SCL 0x02000000 /* HTTP server close mode (http-server-close) */ #define PR_O_HTTP_SCL 0x02000000 /* HTTP server close mode (http-server-close) */
#define PR_O_HTTP_TUN 0x04000000 /* HTTP tunnel mode : no analysis past first request/response */ #define PR_O_HTTP_MODE 0x03000000 /* MASK to retrieve the HTTP mode */
#define PR_O_HTTP_MODE 0x07000000 /* MASK to retrieve the HTTP mode */ /* unused: 0x04000000 */
#define PR_O_TCPCHK_SSL 0x08000000 /* at least one TCPCHECK connect rule requires SSL */ #define PR_O_TCPCHK_SSL 0x08000000 /* at least one TCPCHECK connect rule requires SSL */
#define PR_O_CONTSTATS 0x10000000 /* continuous counters */ #define PR_O_CONTSTATS 0x10000000 /* continuous counters */

20
src/cfgparse-listen.c
View File

@ -2232,22 +2232,10 @@ stats_error_parsing:
} }
} }
else if (strcmp(args[1], "http-tunnel") == 0) { else if (strcmp(args[1], "http-tunnel") == 0) {
if (warnifnotcap(curproxy, PR_CAP_FE, file, linenum, args[1], NULL)) { ha_warning("parsing [%s:%d]: the option '%s' is deprecated and will be removed in next version.\n",
err_code |= ERR_WARN; file, linenum, args[1]);
goto out; err_code |= ERR_WARN;
} goto out;
if (alertif_too_many_args_idx(0, 1, file, linenum, args, &err_code))
goto out;
if (kwm == KWM_STD) {
curproxy->options &= ~PR_O_HTTP_MODE;
curproxy->options |= PR_O_HTTP_TUN;
goto out;
}
else if (kwm == KWM_NO) {
if ((curproxy->options & PR_O_HTTP_MODE) == PR_O_HTTP_TUN)
curproxy->options &= ~PR_O_HTTP_MODE;
goto out;
}
} }
/* Redispatch can take an integer argument that control when the /* Redispatch can take an integer argument that control when the

7
src/cfgparse.c
View File

@ -3611,13 +3611,6 @@ out_uri_auth_compat:
newsrv->mux_proto = mux_ent; newsrv->mux_proto = mux_ent;
} }
/* the option "http-tunnel" is deprecated and ignored. So emit a warning if the option is set. */
if ((curproxy->options & PR_O_HTTP_MODE) == PR_O_HTTP_TUN) {
ha_warning("config : %s '%s' : the option 'http-tunnel' is deprecated and will be removed in next version.\n",
proxy_type_str(curproxy), curproxy->id);
curproxy->options &= ~PR_O_HTTP_MODE;
}
/* initialize idle conns lists */ /* initialize idle conns lists */
for (newsrv = curproxy->srv; newsrv; newsrv = newsrv->next) { for (newsrv = curproxy->srv; newsrv; newsrv = newsrv->next) {
int i; int i;