Adding upstream version 3.0.2.upstream/3.0.2upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 39 insertions, 30 deletions

diff --git a/doc/configuration.txt b/doc/configuration.txt
index 370717f..6b1c55d 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -3,7 +3,7 @@
                           Configuration Manual
                          ----------------------
                               version 3.0
-                              2024/06/10
+                              2024/06/14
 
 
 This document covers the configuration language as implemented in the version
@@ -5190,7 +5190,6 @@ filter                                    -          X         X         X
 fullconn                                  X          -         X         X
 guid                                      -          X         X         X
 hash-balance-factor                       X          -         X         X
-hash-key                                  X          -         X         X
 hash-type                                 X          -         X         X
 http-after-response                       X (!)      X         X         X
 http-check comment                        X          -         X         X
@@ -6954,11 +6953,18 @@ fullconn <conns>
 
 
 guid <string>
-  Specify a case-sensitive global unique ID for this proxy. This must be unique
-  across all haproxy configuration on every object types. Format is left
-  unspecified to allow the user to select its naming policy. The only
-  restriction is its length which cannot be greater than 127 characters. All
-  alphanumerical values and '.', ':', '-' and '_' characters are valid.
+  Specify a case-sensitive global unique ID for this proxy.
+
+  May be used in the following contexts: tcp, http, log
+
+  May be used in sections :   defaults | frontend | listen | backend
+                                 no    |    yes   |   yes  |   yes
+
+  <string> must be unique across all haproxy configuration on every object
+  types. Format is left unspecified to allow the user to select its naming
+  policy. The only restriction is its length which cannot be greater than
+  127 characters. All alphanumerical values and '.', ':', '-' and '_'
+  characters are valid.
 
 
 hash-balance-factor <factor>
@@ -6994,29 +7000,6 @@ hash-balance-factor <factor>
   See also : "balance" and "hash-type".
 
 
-hash-key <key>
-  Specify how "hash-type consistent" node keys are computed
-
-  Arguments :
-    <key>   <key> may be one of the following :
-
-      id         The node keys will be derived from the server's numeric
-                 identifier as set from "id" or which defaults to its position
-                 in the server list.
-
-      addr       The node keys will be derived from the server's address, when
-                 available, or else fall back on "id".
-
-      addr-port  The node keys will be derived from the server's address and
-                 port, when available, or else fall back on "id".
-
-  The "addr" and "addr-port" options may be useful in scenarios where multiple
-  HAProxy processes are balancing traffic to the same set of servers. If the
-  server order of each process is different (because, for example, DNS records
-  were resolved in different orders) then this will allow each independent
-  HAProxy processes to agree on routing decisions.
-
-
 hash-type <method> <function> <modifier>
   Specify a method to use for mapping hashes to servers
 
@@ -17174,10 +17157,36 @@ force-tlsv13
   "ssl-default-server-options". See also "ssl-min-ver" and ssl-max-ver".
 
 guid <string>
+  May be used in the following contexts: tcp, http, log
+
   Specify a case-sensitive global unique ID for this server. This must be
   unique across all haproxy configuration on every object types. See "guid"
   proxy keyword description for more information on its format.
 
+hash-key <key>
+  May be used in the following contexts: tcp, http, log
+
+  Specify how "hash-type consistent" node keys are computed
+
+  Arguments :
+    <key>   <key> may be one of the following :
+
+      id         The node keys will be derived from the server's numeric
+                 identifier as set from "id" or which defaults to its position
+                 in the server list.
+
+      addr       The node keys will be derived from the server's address, when
+                 available, or else fall back on "id".
+
+      addr-port  The node keys will be derived from the server's address and
+                 port, when available, or else fall back on "id".
+
+  The "addr" and "addr-port" options may be useful in scenarios where multiple
+  HAProxy processes are balancing traffic to the same set of servers. If the
+  server order of each process is different (because, for example, DNS records
+  were resolved in different orders) then this will allow each independent
+  HAProxy processes to agree on routing decisions.
+
 id <value>
   May be used in the following contexts: tcp, http, log