summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-11 17:06:51 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-11 17:06:51 +0000
commit5dbda37aa1630f86a27f9168f0969fbe19656e13 (patch)
treeb7a2b9a9a3e5aecff461921254b750a763c31793 /doc
parentReleasing progress-linux version 3.0.0-1~progress7.99u1. (diff)
downloadhaproxy-5dbda37aa1630f86a27f9168f0969fbe19656e13.tar.xz
haproxy-5dbda37aa1630f86a27f9168f0969fbe19656e13.zip
Merging upstream version 3.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'doc')
-rw-r--r--doc/configuration.txt3
-rw-r--r--doc/lua-api/index.rst4
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/configuration.txt b/doc/configuration.txt
index 6a02988..370717f 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -3,7 +3,7 @@
Configuration Manual
----------------------
version 3.0
- 2024/05/29
+ 2024/06/10
This document covers the configuration language as implemented in the version
@@ -16141,6 +16141,7 @@ crt-list <file>
certS.pem [curves X25519:P-256 ciphers ECDHE-ECDSA-AES256-GCM-SHA384] secure.domain.tld
default.pem.rsa *
default.pem.ecdsa *
+ foo.crt [key bar.pem ocsp foo.ocsp ocsp-update on] foo.bar.com
default-crt <cert>
This option does the same as the "crt" option, with the difference that this
diff --git a/doc/lua-api/index.rst b/doc/lua-api/index.rst
index 0d69a2f..cfef26c 100644
--- a/doc/lua-api/index.rst
+++ b/doc/lua-api/index.rst
@@ -4463,6 +4463,10 @@ CertCache class
:param string certificate.issuer: The certificate of the OCSP issuer.
:param string certificate.sctl: An SCTL file.
+ .. Note::
+ This function may be slow. As such, it may only be used during startup
+ (main or init context) or from a yield-capable runtime context.
+
.. code-block:: lua
CertCache.set{filename="certs/localhost9994.pem.rsa", crt=crt}