1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MEDIUM: Make 'option forceclose' actually warn

Browse Source 
It is deprecated since 315b39c3914f4c2301ce19a93564566caa2ede50 (1.9-dev),
but only was deprecated in the docs.

Make it warn when being used and remove it from the docs.
This commit is contained in:
Tim Duesterhus 2019-05-14 20:58:00 +02:00 committed by Willy Tarreau
parent c1f40dd492
commit 10c6c16cde
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/configuration.txt
View File

@ -2342,7 +2342,6 @@ option clitcpka (*) X X X -
option contstats (*) X X X - option contstats (*) X X X -
option dontlog-normal (*) X X X - option dontlog-normal (*) X X X -
option dontlognull (*) X X X - option dontlognull (*) X X X -
option forceclose (deprecated) (*) X X X X
-- keyword -------------------------- defaults - frontend - listen -- backend - -- keyword -------------------------- defaults - frontend - listen -- backend -
option forwardfor X X X X option forwardfor X X X X
option http-buffer-request (*) X X X X option http-buffer-request (*) X X X X
@ -6047,13 +6046,6 @@ no option dontlognull
section 8 about logging. section 8 about logging.
option forceclose (deprecated)
no option forceclose (deprecated)
This is an alias for "option httpclose". Thus this option is deprecated.
See also : "option httpclose" and "option http-pretend-keepalive"
option forwardfor [ except <network> ] [ header <name> ] [ if-none ] option forwardfor [ except <network> ] [ header <name> ] [ if-none ]
Enable insertion of the X-Forwarded-For header to requests sent to servers Enable insertion of the X-Forwarded-For header to requests sent to servers
May be used in sections : defaults | frontend | listen | backend May be used in sections : defaults | frontend | listen | backend

2
examples/haproxy.vim
View File

@ -82,7 +82,7 @@ syn keyword hapBalance contained roundrobin source
syn keyword hapLen contained len syn keyword hapLen contained len
syn keyword hapGLog contained global syn keyword hapGLog contained global
syn keyword hapMode contained http tcp health syn keyword hapMode contained http tcp health
syn keyword hapOption contained abortonclose allbackups checkcache clitcpka dontlognull forceclose forwardfor syn keyword hapOption contained abortonclose allbackups checkcache clitcpka dontlognull forwardfor
syn keyword hapOption contained httpchk httpclose httplog keepalive logasap persist srvtcpka ssl-hello-chk syn keyword hapOption contained httpchk httpclose httplog keepalive logasap persist srvtcpka ssl-hello-chk
syn keyword hapOption contained tcplog tcpka tcpsplice syn keyword hapOption contained tcplog tcpka tcpsplice
syn keyword hapOption contained except skipwhite nextgroup=hapIPv4Mask syn keyword hapOption contained except skipwhite nextgroup=hapIPv4Mask

1
include/types/global.h
View File

@ -251,6 +251,7 @@ __decl_hathreads(extern pthread_t *threads);
#define WARN_CLITO_DEPRECATED 0x00000008 #define WARN_CLITO_DEPRECATED 0x00000008
#define WARN_SRVTO_DEPRECATED 0x00000010 #define WARN_SRVTO_DEPRECATED 0x00000010
#define WARN_CONTO_DEPRECATED 0x00000020 #define WARN_CONTO_DEPRECATED 0x00000020
#define WARN_FORCECLOSE_DEPRECATED 0x00000040
/* to be used with warned and WARN_* */ /* to be used with warned and WARN_* */
static inline int already_warned(unsigned int warning) static inline int already_warned(unsigned int warning)

6
src/cfgparse-listen.c
View File

@ -2160,6 +2160,12 @@ stats_error_parsing:
* sections). * sections).
*/ */
if (strcmp(args[1], "httpclose") == 0 || strcmp(args[1], "forceclose") == 0) { if (strcmp(args[1], "httpclose") == 0 || strcmp(args[1], "forceclose") == 0) {
if (strcmp(args[1], "forceclose") == 0) {
if (!already_warned(WARN_FORCECLOSE_DEPRECATED))
ha_warning("parsing [%s:%d]: keyword '%s' is deprecated in favor of 'httpclose', and will not be supported by future versions.\n",
file, linenum, args[1]);
err_code |= ERR_WARN;
}
if (alertif_too_many_args_idx(0, 1, file, linenum, args, &err_code)) if (alertif_too_many_args_idx(0, 1, file, linenum, args, &err_code))
goto out; goto out;
if (kwm == KWM_STD) { if (kwm == KWM_STD) {