Merge branch '3.1.x'

Closes gh-36585
pull/36604/head
Moritz Halbritter 1 year ago
commit c6c8a0f8c8

@ -96,7 +96,7 @@ class SslConnectorCustomizer implements TomcatConnectorCustomizer {
private void configureEnabledProtocols(AbstractHttp11JsseProtocol<?> protocol) { private void configureEnabledProtocols(AbstractHttp11JsseProtocol<?> protocol) {
SslOptions options = this.sslBundle.getOptions(); SslOptions options = this.sslBundle.getOptions();
if (options.getEnabledProtocols() != null) { if (options.getEnabledProtocols() != null) {
String enabledProtocols = StringUtils.arrayToCommaDelimitedString(options.getEnabledProtocols()); String enabledProtocols = StringUtils.arrayToDelimitedString(options.getEnabledProtocols(), "+");
for (SSLHostConfig sslHostConfig : protocol.findSslHostConfigs()) { for (SSLHostConfig sslHostConfig : protocol.findSslHostConfigs()) {
sslHostConfig.setProtocols(enabledProtocols); sslHostConfig.setProtocols(enabledProtocols);
} }

Loading…
Cancel
Save