mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-23 14:51:27 +02:00
Code Issues Projects Releases Wiki Activity

DOC: add deprecation notice to "block"

Browse Source 
[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]
This commit is contained in:
Jarno Huuskonen 2016-12-28 18:50:29 +02:00 committed by Willy Tarreau
parent 59af2df102
commit 8c8c3497c0
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/configuration.txt
View File

@ -1805,7 +1805,7 @@ backlog X X X -
balance X - X X balance X - X X
bind - X X - bind - X X -
bind-process X X X X bind-process X X X X
block - X X X block (deprecated) - X X X
capture cookie - X X - capture cookie - X X -
capture request header - X X - capture request header - X X -
capture response header - X X - capture response header - X X -
@ -2468,7 +2468,7 @@ bind-process [ all | odd | even | <number 1-64>[-<number 1-64>] ] ...
See also : "nbproc" in global section, and "process" in section 5.1. See also : "nbproc" in global section, and "process" in section 5.1.
block { if | unless } <condition> block { if | unless } <condition> (deprecated)
Block a layer 7 request if/unless a condition is matched Block a layer 7 request if/unless a condition is matched
May be used in sections : defaults | frontend | listen | backend May be used in sections : defaults | frontend | listen | backend
no | yes | yes | yes no | yes | yes | yes
@ -2480,6 +2480,9 @@ block { if | unless } <condition>
conditions are met or not met. There is no fixed limit to the number of conditions are met or not met. There is no fixed limit to the number of
"block" statements per instance. "block" statements per instance.
This form is deprecated, do not use it in any new configuration, use the new
"http-request deny" instead.
Example: Example:
acl invalid_src src 0.0.0.0/7 224.0.0.0/3 acl invalid_src src 0.0.0.0/7 224.0.0.0/3
acl invalid_src src_port 0:1023 acl invalid_src src_port 0:1023