Merge branch '0.8.x'

reactor · Oct 25, 2019 · 7b7f380 · 7b7f380
2 parents f15fd62 + 062521e
commit 7b7f380
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -61,7 +61,7 @@ ext {
   assertJVersion = '3.6.1'
 
   // Libraries
-  nettyVersion = '4.1.42.Final'
+  nettyVersion = '4.1.43.Final'
   jacksonDatabindVersion = '2.5.1'
 
   // Testing
@@ -258,7 +258,7 @@ configure(rootProject) { project ->
 	testRuntime "ch.qos.logback:logback-classic:$logbackVersion"
 
 	// Needed for HTTP/2 testing
-	testRuntime "io.netty:netty-tcnative-boringssl-static:2.0.25.Final" + os_suffix
+	testRuntime "io.netty:netty-tcnative-boringssl-static:2.0.26.Final" + os_suffix
 
 	jarFileTestCompile 'org.assertj:assertj-core:3.12.2'
 	jarFileTestCompile 'junit:junit:4.12'

diff --git a/src/main/java/reactor/netty/http/client/HttpClientSecure.java b/src/main/java/reactor/netty/http/client/HttpClientSecure.java
@@ -24,7 +24,6 @@
 import io.netty.handler.codec.http2.Http2SecurityUtil;
 import io.netty.handler.ssl.ApplicationProtocolConfig;
 import io.netty.handler.ssl.ApplicationProtocolNames;
-import io.netty.handler.ssl.OpenSsl;
 import io.netty.handler.ssl.SslContext;
 import io.netty.handler.ssl.SslContextBuilder;
 import io.netty.handler.ssl.SslHandler;
@@ -77,7 +76,8 @@ protected TcpClient tcpConfiguration() {
 		SslContext sslCtx;
 		try {
 			io.netty.handler.ssl.SslProvider provider =
-					OpenSsl.isAlpnSupported() ? io.netty.handler.ssl.SslProvider.OPENSSL :
+					io.netty.handler.ssl.SslProvider.isAlpnSupported(io.netty.handler.ssl.SslProvider.OPENSSL) ?
+							io.netty.handler.ssl.SslProvider.OPENSSL :
 							io.netty.handler.ssl.SslProvider.JDK;
 			sslCtx =
 					SslContextBuilder.forClient()

diff --git a/src/main/java/reactor/netty/tcp/SslProvider.java b/src/main/java/reactor/netty/tcp/SslProvider.java
@@ -367,7 +367,7 @@ void updateDefaultConfiguration() {
 		switch (type) {
 			case H2:
 				sslContextBuilder.sslProvider(
-				                     OpenSsl.isAlpnSupported() ?
+				                     io.netty.handler.ssl.SslProvider.isAlpnSupported(io.netty.handler.ssl.SslProvider.OPENSSL) ?
 				                             io.netty.handler.ssl.SslProvider.OPENSSL :
 				                             io.netty.handler.ssl.SslProvider.JDK)
 				                 .ciphers(Http2SecurityUtil.CIPHERS, SupportedCipherSuiteFilter.INSTANCE)

diff --git a/src/test/java/reactor/netty/tcp/SslProviderTests.java b/src/test/java/reactor/netty/tcp/SslProviderTests.java
@@ -103,7 +103,8 @@ public void testProtocolH2SslConfiguration() {
 				      .bindNow();
 		assertEquals(2, protocols.size());
 		assertTrue(protocols.contains("h2"));
-		assertTrue(OpenSsl.isAlpnSupported() ? sslContext instanceof OpenSslContext :
+		assertTrue(io.netty.handler.ssl.SslProvider.isAlpnSupported(io.netty.handler.ssl.SslProvider.OPENSSL) ?
+		                                       sslContext instanceof OpenSslContext :
 		                                       sslContext instanceof JdkSslContext);
 		disposableServer.disposeNow();
 	}
@@ -116,7 +117,8 @@ public void testSslConfigurationProtocolH2_1() {
 				      .bindNow();
 		assertEquals(2, protocols.size());
 		assertTrue(protocols.contains("h2"));
-		assertTrue(OpenSsl.isAlpnSupported() ? sslContext instanceof OpenSslContext :
+		assertTrue(io.netty.handler.ssl.SslProvider.isAlpnSupported(io.netty.handler.ssl.SslProvider.OPENSSL) ?
+		                                       sslContext instanceof OpenSslContext :
 		                                       sslContext instanceof JdkSslContext);
 		disposableServer.disposeNow();
 	}
@@ -130,7 +132,8 @@ public void testSslConfigurationProtocolH2_2() {
 				      .bindNow();
 		assertEquals(2, protocols.size());
 		assertTrue(protocols.contains("h2"));
-		assertTrue(OpenSsl.isAlpnSupported() ? sslContext instanceof OpenSslContext :
+		assertTrue(io.netty.handler.ssl.SslProvider.isAlpnSupported(io.netty.handler.ssl.SslProvider.OPENSSL) ?
+		                                       sslContext instanceof OpenSslContext :
 		                                       sslContext instanceof JdkSslContext);
 		disposableServer.disposeNow();
 	}