This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
The following commit(s) were added to refs/heads/main by this push:
new aad70924c Sync with 11.0.x
aad70924c is described below
commit aad70924cf85620d451990ea42da5730dacedbbe
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Sat Feb 3 11:17:42 2024 +0000
Sync with 11.0.x
---
java/org/apache/tomcat/jni/Library.java | 2 +-
java/org/apache/tomcat/jni/SSL.java | 7 ++-----
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/tomcat/jni/Library.java
b/java/org/apache/tomcat/jni/Library.java
index 2fa3b07ec..c0256eacf 100644
--- a/java/org/apache/tomcat/jni/Library.java
+++ b/java/org/apache/tomcat/jni/Library.java
@@ -20,7 +20,7 @@ import java.io.File;
public final class Library {
- /* Default library names */
+ /* Default library names - use 2.x in preference to 1.x if both are
available */
private static final String [] NAMES = {"tcnative-2", "libtcnative-2",
"tcnative-1", "libtcnative-1"};
/* System property used to define CATALINA_HOME */
private static final String CATALINA_HOME_PROP = "catalina.home";
diff --git a/java/org/apache/tomcat/jni/SSL.java
b/java/org/apache/tomcat/jni/SSL.java
index 64da0ca9c..cc3791878 100644
--- a/java/org/apache/tomcat/jni/SSL.java
+++ b/java/org/apache/tomcat/jni/SSL.java
@@ -70,11 +70,8 @@ public final class SSL {
public static final int SSL_PROTOCOL_TLSV1_1 = (1<<3);
public static final int SSL_PROTOCOL_TLSV1_2 = (1<<4);
public static final int SSL_PROTOCOL_TLSV1_3 = (1<<5);
- public static final int SSL_PROTOCOL_ALL;
-
- static {
- SSL_PROTOCOL_ALL =
(SSL_PROTOCOL_TLSV1|SSL_PROTOCOL_TLSV1_1|SSL_PROTOCOL_TLSV1_2|SSL_PROTOCOL_TLSV1_3);
- }
+ public static final int SSL_PROTOCOL_ALL =
+ (SSL_PROTOCOL_TLSV1 | SSL_PROTOCOL_TLSV1_1 | SSL_PROTOCOL_TLSV1_2
| SSL_PROTOCOL_TLSV1_3);
/*
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
