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

MAJOR: spoe: Let the SPOE back into the game

Browse Source 
This reverts commits 885e40494c5de6aee841222496d84dc718401fa0 and
dff98071888ae06dcec0a6c3a9222e76e893305d.

We decided to spend some time to refactor and rationnalize the SPOE for the
3.1. Thus there is no reason to still consider it as deprecated for the
3.0. Compatibility between the both versions will be maintained.

See #2502 for more info.
This commit is contained in:
Christopher Faulet 2024-05-21 18:22:43 +02:00
parent 746e6f8597
commit eb89a7da33
5 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MAINTAINERS
View File

@ -138,7 +138,7 @@ ScientiaMobile WURFL Device Detection
Maintainer: Paul Borile, Massimiliano Bellomi <wurfl-haproxy-support@scientiamobile.com>
Files: addons/wurfl, doc/WURFL-device-detection.txt
SPOE (deprecated)
SPOE
Maintainer: Christopher Faulet <cfaulet@haproxy.com>
Files: src/flt_spoe.c, include/haproxy/spoe*.h, doc/SPOE.txt

4
doc/SPOE.txt
View File

@ -7,10 +7,6 @@
Contact : cfaulet at haproxy dot com
WARNING: The SPOE is now deprecated and will be removed in future version.
SUMMARY
--------

7
doc/configuration.txt
View File

@ -14194,7 +14194,7 @@ sc-inc-gpc0 X X X X X X X
sc-inc-gpc1 X X X X X X X
sc-set-gpt X X X X X X X
sc-set-gpt0 X X X X X X X
send-spoe-group (deprecated) - - X X X X -
send-spoe-group - - X X X X -
set-bandwidth-limit - - X X X X -
set-bc-mark - - X - X - -
set-bc-tos - - X - X - -
@ -15055,7 +15055,7 @@ sc-set-gpt0(<sc-id>) { <int> | <expr> }
See also the "sc-set-gpt" action.
send-spoe-group <engine-name> <group-name> (deprecated)
send-spoe-group <engine-name> <group-name>
Usable in: TCP RqCon| RqSes| RqCnt| RsCnt| HTTP Req| Res| Aft
- | - | X | X | X | X | -
@ -27047,9 +27047,6 @@ the Stream Processing Offload Protocol (SPOP).
For all information about the SPOE configuration and the SPOP specification, see
"doc/SPOE.txt".
WARNING: The SPOE filter is now deprecated. Use 'expose-deprecated-directives'
to silent warnings if you must use it.
9.4. Cache
----------

5
reg-tests/spoe/wrong_init.vtc
View File

@ -12,11 +12,6 @@ varnishtest "SPOE bug: missing configuration file"
feature ignore_unknown_macro
haproxy h1 -conf-BAD {} {
global
.if version_atleast(3.0-dev6)
expose-deprecated-directives
.endif
defaults
timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
timeout client "${HAPROXY_TEST_TIMEOUT-5s}"

5
src/flt_spoe.c
View File

@ -4100,11 +4100,6 @@ parse_spoe_flt(char **args, int *cur_arg, struct proxy *px,
curpxopts = 0;
curpxopts2 = 0;
if (!deprecated_directives_allowed)
ha_warning("Proxy %s: SPOE filter is deprecated and will be removed in future version. "
"Use 'expose-deprecated-directives' in global section to silent this warning\n", px->id);
conf = calloc(1, sizeof(*conf));
if (conf == NULL) {
memprintf(err, "%s: out of memory", args[*cur_arg]);