From d1acf9a24d2a3d1cdf5c7433501ca192efc68ee8 Mon Sep 17 00:00:00 2001 From: dreis2211 Date: Sun, 8 Jul 2018 18:28:39 +0200 Subject: [PATCH] Fix API adaptation changes for Reactor Netty --- .../boot/web/embedded/netty/SslServerCustomizer.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/SslServerCustomizer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/SslServerCustomizer.java index 0c421402c4..032547626b 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/SslServerCustomizer.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/SslServerCustomizer.java @@ -26,6 +26,7 @@ import javax.net.ssl.TrustManagerFactory; import io.netty.handler.ssl.ClientAuth; import io.netty.handler.ssl.SslContextBuilder; import reactor.netty.http.server.HttpServer; +import reactor.netty.tcp.SslProvider.DefaultConfigurationType; import org.springframework.boot.web.server.Ssl; import org.springframework.boot.web.server.SslStoreProvider; @@ -52,7 +53,8 @@ public class SslServerCustomizer implements NettyServerCustomizer { public HttpServer apply(HttpServer server) { try { return server - .secure((contextSpec) -> contextSpec.sslContext(getContextBuilder())); + .secure((contextSpec) -> contextSpec.sslContext(getContextBuilder()) + .defaultConfiguration(DefaultConfigurationType.NONE)); } catch (Exception ex) { throw new IllegalStateException(ex);