This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 7d7792d3df Fix BZ 67934. Prefer Tomcat Native 1.2.x over 2.0.x
7d7792d3df is described below
commit 7d7792d3dfe59760ba22cd60651e4f03a0a8ff4d
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Nov 3 14:07:11 2023 +0000
Fix BZ 67934. Prefer Tomcat Native 1.2.x over 2.0.x
1.2.x supports the APR/Native connector whereas 2.0.x does not.
https://bz.apache.org/bugzilla/show_bug.cgi?id=67934
---
java/org/apache/tomcat/jni/Library.java | 7 +++++--
webapps/docs/changelog.xml | 5 +++++
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/jni/Library.java
b/java/org/apache/tomcat/jni/Library.java
index aa350b17d0..218a101b59 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/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cb43155501..244cd99db7 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -173,6 +173,11 @@
<bug>67927</bug>: Reloading TLS configuration can cause the Connector
to
refuse new connections or the JVM to crash. (markt)
</fix>
+ <fix>
+ <bug>67934</bug>: If both Tomcat Native 1.2.x and 2.0.x are available,
+ prefer 1.2.x since it supports the APR/Native connector whereas 2.0.x
+ does not. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Other">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
