From b873b459e7080a85a2d47dea085d4ac5892ba44a Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Wed, 29 Jan 2025 09:57:10 +0000 Subject: [PATCH] Better documentation for SSLHostConfig.truststoreProvider default --- webapps/docs/changelog.xml | 5 +++++ webapps/docs/config/http.xml | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 84fbc23e0136..64474429b563 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -239,6 +239,11 @@ mapperDirectoryRedirectEnabled to true. (markt) + + Documentation. Better document the default for the + truststoreProvider attribute of a + SSLHostConfig element. (markt) + diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml index e4a3cb1fc073..6222b2af32bc 100644 --- a/webapps/docs/config/http.xml +++ b/webapps/docs/config/http.xml @@ -1589,10 +1589,11 @@

The name of the truststore provider to be used for the server certificate. The default is the value of the javax.net.ssl.trustStoreProvider system property. If - that property is null, the value of keystoreProvider is used - as the default. If neither this attribute, the default system property nor - keystoreProvider is set, the list of registered providers is - traversed in preference order and the first provider that supports the + that property is null and a single certificate has been configured for + this TLS virtual host then default will be the the value of + keystoreProvider of the single certificate. If none of these + identify a default, the list of registered providers is traversed in + preference order and the first provider that supports the truststoreType is used.