Commit 72f74d0b authored by Brian Clozel's avatar Brian Clozel

Merge pull request #13728 from dreis2211:fix-netty-reactive-tests

* pr/13728:
  Fix API adaptation changes for Reactor Netty
parents 60457f1d d1acf9a2
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment