MAJOR: spoe: Let the SPOE back into the game

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.

diff --git a/MAINTAINERS b/MAINTAINERS
index cf8ad42cd58337d084d9621c6d6dfdf73b2999e2..d4b7980ca44137b336d202ac6032a316dd423629 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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
 

diff --git a/doc/SPOE.txt b/doc/SPOE.txt
index 8d08d6f3d83802d48eece3a3535b099add990207..cc6d8dd3d3fadcc3538bb537b4e7262e19c5915b 100644 (file)
--- 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 a26bf920bcce2a3cd203125def28fbaa9a2fa2e4..c0667af8f806e2b31c181b784ea0710fa8271107 100644 (file)
--- 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(<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
 ----------
 

diff --git a/reg-tests/spoe/wrong_init.vtc b/reg-tests/spoe/wrong_init.vtc
index 7fbbfbe64327e3da8233499b53c131d0273d33ee..152622c5e46756d10544ec96b66c95aa5952a558 100644 (file)
--- 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 2ac03d6d28074c23a95c04b6a03ac585b5bbc4df..95930f13f2fa1af9476ae856a999ba70ae5b0787 100644 (file)
--- 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]);