From: Willy Tarreau <w@1wt.eu>
Date: Wed, 19 Apr 2023 07:10:47 +0000 (+0200)
Subject: DOC: add missing documentation for "no-alpn" on bind lines
X-Git-Tag: v2.8-dev8~95
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74d7cc0891ce9d06f4955a60b3e95f1465db1607;p=thirdparty%2Fhaproxy.git

DOC: add missing documentation for "no-alpn" on bind lines

This is the doc for the no-alpn keyword that was mistakenly left out of
commit 158c18e85 ("MINOR: config: add "no-alpn" support for bind lines").
---

diff --git a/doc/configuration.txt b/doc/configuration.txt
index 5ea498d0a9..d1313b168f 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -14618,6 +14618,8 @@ alpn <protocols>
 
   QUIC supports only h3 and hq-interop as ALPN. h3 is for HTTP/3 and hq-interop
   is used for http/0.9 and QUIC interop runner (see https://interop.seemann.io).
+  Each "alpn" statement will replace a previous one. In order to remove them,
+  use "no-alpn".
 
 backlog <backlog>
   Sets the socket's backlog to this value. If unspecified or 0, the frontend's
@@ -15007,6 +15009,12 @@ nice <nice>
   it may make sense to use a positive value for an SMTP socket and a negative
   one for an RDP socket.
 
+no-alpn
+  Disables ALPN processing (technically speaking this sets the ALPN string to
+  an empty string that will not be advertised). It permits to cancel a previous
+  occurrence of an "alpn" setting and to disable application protocol
+  negotiation. See also "alpn".
+
 no-ca-names
   This setting is only available when support for OpenSSL was built in. It
   prevents from send CA names in server hello message when ca-file is used.