Skip to content

Commit f5cf95d

Browse files
committed
Merge branch '3.3.x'
Closes gh-43552
2 parents 79d9780 + 229137d commit f5cf95d

File tree

1 file changed

+9
-1
lines changed
  • spring-boot-project/spring-boot-docs/src/docs/antora/modules/how-to/pages

1 file changed

+9
-1
lines changed

spring-boot-project/spring-boot-docs/src/docs/antora/modules/how-to/pages/webserver.adoc

+9-1
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,15 @@ server:
208208
bundle: "example"
209209
----
210210

211-
NOTE: The `server.ssl.bundle` property can not be combined with the discrete Java KeyStore or PEM property options under `server.ssl`.
211+
[NOTE]
212+
====
213+
The `server.ssl.bundle` property can not be combined with the discrete Java KeyStore or PEM property options under `server.ssl`.
214+
215+
The configprop:server.ssl.ciphers[], configprop:server.ssl.enabled-protocols[], configprop:server.ssl.protocol[] properties are also ignored when using a bundle.
216+
These properties should instead be defined using `spring.ssl.bundle.<type>.<name>.options` properties.
217+
====
218+
219+
212220

213221
[[howto.webserver.configure-ssl.sni]]
214222
=== Configure Server Name Indication

0 commit comments

Comments
 (0)