root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Fix API adaptation changes for Reactor Netty

This commit is contained in:
dreis2211 2018-07-08 18:28:39 +02:00 committed by Brian Clozel
parent 60457f1d9a
commit d1acf9a24d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/SslServerCustomizer.java
View File

@ -26,6 +26,7 @@ import javax.net.ssl.TrustManagerFactory;
import io.netty.handler.ssl.ClientAuth; import io.netty.handler.ssl.ClientAuth;
import io.netty.handler.ssl.SslContextBuilder; import io.netty.handler.ssl.SslContextBuilder;
import reactor.netty.http.server.HttpServer; 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.Ssl;
import org.springframework.boot.web.server.SslStoreProvider; import org.springframework.boot.web.server.SslStoreProvider;
@ -52,7 +53,8 @@ public class SslServerCustomizer implements NettyServerCustomizer {
public HttpServer apply(HttpServer server) { public HttpServer apply(HttpServer server) {
try { try {
return server return server
.secure((contextSpec) -> contextSpec.sslContext(getContextBuilder())); .secure((contextSpec) -> contextSpec.sslContext(getContextBuilder())
.defaultConfiguration(DefaultConfigurationType.NONE));
} }
catch (Exception ex) { catch (Exception ex) {
throw new IllegalStateException(ex); throw new IllegalStateException(ex);