From 8c8c3497c0fbaf9c168eecbac5ebe89f7232f937 Mon Sep 17 00:00:00 2001 From: Jarno Huuskonen Date: Wed, 28 Dec 2016 18:50:29 +0200 Subject: [PATCH] DOC: add deprecation notice to "block" [wt: this one is in fact emulated using http-request deny. This patch can thus be backported to 1.7, 1.6 and 1.5 so that users of older versions do not add this keyword in their configs] --- doc/configuration.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/configuration.txt b/doc/configuration.txt index 2cbf90dcf..739fad9d6 100644 --- a/doc/configuration.txt +++ b/doc/configuration.txt @@ -1805,7 +1805,7 @@ backlog X X X - balance X - X X bind - X X - bind-process X X X X -block - X X X +block (deprecated) - X X X capture cookie - X X - capture request header - X X - capture response header - X X - @@ -2468,7 +2468,7 @@ bind-process [ all | odd | even | [-] ] ... See also : "nbproc" in global section, and "process" in section 5.1. -block { if | unless } +block { if | unless } (deprecated) Block a layer 7 request if/unless a condition is matched May be used in sections : defaults | frontend | listen | backend no | yes | yes | yes @@ -2480,6 +2480,9 @@ block { if | unless } conditions are met or not met. There is no fixed limit to the number of "block" statements per instance. + This form is deprecated, do not use it in any new configuration, use the new + "http-request deny" instead. + Example: acl invalid_src src 0.0.0.0/7 224.0.0.0/3 acl invalid_src src_port 0:1023