This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 1.3.x
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
commit de94af36799ff0ca611330c2bc5a3194e06eab7a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Feb 5 14:08:23 2024 +0000
Align with 9.0.x
---
java/org/apache/tomcat/jni/Library.java | 7 +++++--
java/org/apache/tomcat/jni/SSL.java | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/tomcat/jni/Library.java
b/java/org/apache/tomcat/jni/Library.java
index aa350b17d..218a101b5 100644
--- a/java/org/apache/tomcat/jni/Library.java
+++ b/java/org/apache/tomcat/jni/Library.java
@@ -20,8 +20,11 @@ import java.io.File;
public final class Library {
- /* Default library names */
- private static final String [] NAMES = {"tcnative-2", "libtcnative-2",
"tcnative-1", "libtcnative-1"};
+ /*
+ * Default library names - use 1.x in preference to 2.x if both are
available as only 1.x supports the APR/Native
+ * connector.
+ */
+ private static final String [] NAMES = {"tcnative-1", "libtcnative-1",
"tcnative-2", "libtcnative-2"};
/* 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 ac0ca9da5..91a8bc66f 100644
--- a/java/org/apache/tomcat/jni/SSL.java
+++ b/java/org/apache/tomcat/jni/SSL.java
@@ -254,7 +254,7 @@ public final class SSL {
public static final int SSL_SELECTOR_FAILURE_NO_ADVERTISE = 0;
public static final int SSL_SELECTOR_FAILURE_CHOOSE_MY_LAST_PROTOCOL = 1;
- /* Return OpenSSL version number (run time version) */
+ /* Return OpenSSL version number (compile time version, if version <
1.1.0) */
public static native int version();
/* Return OpenSSL version string (run time version) */
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
