From: Christopher Faulet <cfaulet@haproxy.com>
Date: Tue, 24 Nov 2020 16:13:24 +0000 (+0100)
Subject: DOC: config: Move req.hdrs and req.hdrs_bin in L7 samples fetches section
X-Git-Tag: v2.1.11~47
X-Git-Url: http://git.haproxy.org/?a=commitdiff_plain;h=4309a869cb2cf5ee07b592a6ff75bbf8ef9c5810;p=haproxy-2.1.git

DOC: config: Move req.hdrs and req.hdrs_bin in L7 samples fetches section

req.hdrs and req.hdrs_bin are L7 sample fetches, not L6. They were in the wrong
section.

This patch may be backported as far as 1.8.

(cherry picked from commit 687a68e2d04900e84317d066de80891a7f848747)
Signed-off-by: William Lallemand <wlallemand@haproxy.org>
(cherry picked from commit 2616784a08c83f65b0e451bba8dcba5a844e8dac)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit 5e3d0a0c0a4b3ca32dd11c82276750e880c4ed34)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
---

diff --git a/doc/configuration.txt b/doc/configuration.txt
index 3d5bd07..ddf1a98 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -15611,25 +15611,6 @@ payload_lv(<offset1>,<length>[,<offset2>]) : binary (deprecated)
   (e.g. "stick on", "stick match"), and for "res.payload_lv" when used in the
   context of a response such as in "stick store response".
 
-req.hdrs : string
-  Returns the current request headers as string including the last empty line
-  separating headers from the request body. The last empty line can be used to
-  detect a truncated header block. This sample fetch is useful for some SPOE
-  headers analyzers and for advanced logging.
-
-req.hdrs_bin : binary
-  Returns the current request headers contained in preparsed binary form. This
-  is useful for offloading some processing with SPOE. Each string is described
-  by a length followed by the number of bytes indicated in the length. The
-  length is represented using the variable integer encoding detailed in the
-  SPOE documentation. The end of the list is marked by a couple of empty header
-  names and values (length of 0 for both).
-
-  *(<str:header-name><str:header-value>)<empty string><empty string>
-
-  int:  refer to the SPOE documentation for the encoding
-  str:  <int:length><bytes>
-
 req.len : integer
 req_len : integer (deprecated)
   Returns an integer value corresponding to the number of bytes present in the
@@ -16105,7 +16086,24 @@ hdr_val([<name>[,<occ>]]) : integer (deprecated)
   the first one. Negative values indicate positions relative to the last one,
   with -1 being the last one. A typical use is with the X-Forwarded-For header.
 
+req.hdrs : string
+  Returns the current request headers as string including the last empty line
+  separating headers from the request body. The last empty line can be used to
+  detect a truncated header block. This sample fetch is useful for some SPOE
+  headers analyzers and for advanced logging.
+
+req.hdrs_bin : binary
+  Returns the current request headers contained in preparsed binary form. This
+  is useful for offloading some processing with SPOE. Each string is described
+  by a length followed by the number of bytes indicated in the length. The
+  length is represented using the variable integer encoding detailed in the
+  SPOE documentation. The end of the list is marked by a couple of empty header
+  names and values (length of 0 for both).
+
+  *(<str:header-name><str:header-value>)<empty string><empty string>
 
+  int:  refer to the SPOE documentation for the encoding
+  str:  <int:length><bytes>
 
 http_auth(<userlist>) : boolean
   Returns a boolean indicating whether the authentication data received from