Merge current v2.5 into master

2021-08-30 14:51:57 +02:00
parent 817ac8f256 eb6c5fc34d
commit f81ceaef8a
64 changed files with 949 additions and 208 deletions
--- a/docs/content/reference/dynamic-configuration/file.yaml
+++ b/docs/content/reference/dynamic-configuration/file.yaml
@@ -471,6 +471,9 @@ tls:
        clientAuthType: foobar
      sniStrict: true
      preferServerCipherSuites: true
+      alpnProtocols:
+        - foobar
+        - foobar
    Options1:
      minVersion: foobar
      maxVersion: foobar
@@ -487,6 +490,9 @@ tls:
        clientAuthType: foobar
      sniStrict: true
      preferServerCipherSuites: true
+      alpnProtocols:
+        - foobar
+        - foobar
  stores:
    Store0:
      defaultCertificate: