Merge #2887 into 1.1.11

reactor · Aug 30, 2023 · 40c3ff9 · 40c3ff9
2 parents 3648f27 + 4abc308
commit 40c3ff9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -258,6 +258,7 @@ subprojects {
 		if (project.hasProperty("forceTransport")) {
 			systemProperty("forceTransport", forceTransport)
 		}
+		systemProperty("nettyVersionMicro", VersionNumber.parse(nettyVersion.toString()).micro)
 		scanForTestClasses = false
 		include '**/*Tests.*'
 		include '**/*Test.*'

diff --git a/reactor-netty-http/src/test/java/reactor/netty/tcp/SslProviderTests.java b/reactor-netty-http/src/test/java/reactor/netty/tcp/SslProviderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2022 VMware, Inc. or its affiliates, All Rights Reserved.
+ * Copyright (c) 2018-2023 VMware, Inc. or its affiliates, All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -394,7 +394,15 @@ void testDefaultClientProviderIsOpenSsl() {
 
 		final OpenSslSessionContext sessionContext = clientContext.sessionContext();
 		assertThat(sessionContext.getSessionTimeout()).isEqualTo(300);
-		assertThat(sessionContext.isSessionCacheEnabled()).isFalse();
+		String nettyVersionMicro = System.getProperty("nettyVersionMicro");
+		// https://github.com/netty/netty/pull/13562
+		// This change enables client side session cache when using native SSL by default
+		if (nettyVersionMicro != null && !nettyVersionMicro.isEmpty() && Integer.parseInt(nettyVersionMicro) >= 98) {
+			assertThat(sessionContext.isSessionCacheEnabled()).isTrue();
+		}
+		else {
+			assertThat(sessionContext.isSessionCacheEnabled()).isFalse();
+		}
 	}
 
 	@Test