Browse Source

Fix API adaptation changes for Reactor Netty

pull/13728/merge
dreis2211 8 years ago committed by Brian Clozel
parent
commit
d1acf9a24d
  1. 4
      spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/SslServerCustomizer.java

4
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; @@ -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 { @@ -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);

Loading…
Cancel
Save