Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #39616 from wanger26

Browse Source 
* pr/39616:
  Polish "Add note regarding mixing of bundle-based and direct SSL configuration"
  Add note regarding mixing of bundle-based and direct SSL configuration

Closes gh-39616
This commit is contained in:
Scott Frederick
2024-02-20 11:58:17 -06:00
parent e6d9fcd208 eb4d6e7c15
commit c3af82ca62
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/webserver.adoc
View File

@@ -211,6 +211,8 @@ Alternatively, the SSL trust material can be configured in an <<features#feature
bundle: "example"
----
NOTE: The `server.ssl.bundle` property can not be combined with the discrete Java KeyStore or PEM property options under `server.ssl`.
See {spring-boot-module-code}/web/server/Ssl.java[`Ssl`] for details of all of the supported properties.