Merging upstream version 3.0.2.

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

2 files changed, 58 insertions, 32 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
 
diff --git a/doc/management.txt b/doc/management.txt
index d036018..58ac958 100644
--- a/doc/management.txt
+++ b/doc/management.txt
@@ -360,6 +360,11 @@ list of options is :
         the byte's value to -dM but using this option allows to disable/enable
         use of a previously set value.
 
+  -dR : disable SO_REUSEPORT socket option on listening ports. It is equivalent
+    to the "global" section's "noreuseport" keyword. This may be applied in
+    multi-threading scenarios, when load distribution issues observed among the
+    haproxy threads (could be monitored with top).
+
   -dS : disable use of the splice() system call. It is equivalent to the
     "global" section's "nosplice" keyword. This may be used when splice() is
     suspected to behave improperly or to cause performance issues, or when
@@ -381,6 +386,12 @@ list of options is :
    in checked configurations to fail. This is equivalent to global option
    "zero-warning".
 
+  -dZ : disable forwarding of data in "zero-copy" mode. It is equivalent to the
+   "global" section's "tune.disable-zero-copy-forwarding" keyword. This may be
+   helpful in case of issues with data loss or data integrity, or when using
+   strace to see the forwarded data, as it also disables any kernel tcp
+   splicing.
+
   -db : disable background mode and multi-process mode. The process remains in
     foreground. It is mainly used during development or during small tests, as
     Ctrl-C is enough to stop the process. Never use it in an init script.
@@ -419,6 +430,12 @@ list of options is :
     level name, the list of available keywords is presented. For example it can
     be convenient to pass 'help' for each field to consult the list first.
 
+  -dv : disable the use of the "evports" poller. It is equivalent to the
+    "global" section's keyword "noevports". It is mostly useful when suspecting
+    a bug related to this poller. On systems supporting event ports (SunOS
+    derived from Solaris 10 and later), the fallback will generally be the
+    "poll" poller.
+
   -m <limit> : limit allocatable memory, which is used to keep process's data,
     to <limit> megabytes. This may cause some connection refusals or some
     slowdowns depending on the amount of memory needed for normal operations.
@@ -3247,8 +3264,8 @@ show sess <id> | older <age> | susp | all
   is meant to be interpreted while checking function strm_dump_to_buffer() in
   src/stream.c to figure the exact meaning of certain fields.
 
-show stat [domain <dns|proxy>] [{<iid>|<proxy>} <type> <sid>] [typed|json] \
-          [desc] [up|no-maint]
+show stat [domain <resolvers|proxy>] [{<iid>|<proxy>} <type> <sid>] \
+          [typed|json] [desc] [up|no-maint]
   Dump statistics. The domain is used to select which statistics to print; dns
   and proxy are available for now. By default, the CSV format is used; you can
   activate the extended typed output format described in the section above if