diff --git a/MAINTAINERS b/MAINTAINERS index cf8ad42cd5..d4b7980ca4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -138,7 +138,7 @@ ScientiaMobile WURFL Device Detection Maintainer: Paul Borile, Massimiliano Bellomi Files: addons/wurfl, doc/WURFL-device-detection.txt -SPOE (deprecated) +SPOE Maintainer: Christopher Faulet Files: src/flt_spoe.c, include/haproxy/spoe*.h, doc/SPOE.txt diff --git a/doc/SPOE.txt b/doc/SPOE.txt index 8d08d6f3d8..cc6d8dd3d3 100644 --- a/doc/SPOE.txt +++ b/doc/SPOE.txt @@ -7,10 +7,6 @@ Contact : cfaulet at haproxy dot com - - WARNING: The SPOE is now deprecated and will be removed in future version. - - SUMMARY -------- diff --git a/doc/configuration.txt b/doc/configuration.txt index a26bf920bc..c0667af8f8 100644 --- a/doc/configuration.txt +++ b/doc/configuration.txt @@ -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() { | } See also the "sc-set-gpt" action. -send-spoe-group (deprecated) +send-spoe-group 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 ---------- diff --git a/reg-tests/spoe/wrong_init.vtc b/reg-tests/spoe/wrong_init.vtc index 7fbbfbe643..152622c5e4 100644 --- a/reg-tests/spoe/wrong_init.vtc +++ b/reg-tests/spoe/wrong_init.vtc @@ -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}" diff --git a/src/flt_spoe.c b/src/flt_spoe.c index 2ac03d6d28..95930f13f2 100644 --- a/src/flt_spoe.c +++ b/src/flt_spoe.c @@ -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]);