On 24/04/2020 16:15, Michael Osipov wrote: > Am 2020-04-24 um 17:00 schrieb ma...@apache.org: >> This is an automated email from the ASF dual-hosted git repository. >> >> markt pushed a commit to branch master >> in repository https://gitbox.apache.org/repos/asf/tomcat-native.git >> >> >> The following commit(s) were added to refs/heads/master by this push: >> new 14aebf3 Update Java source to latest 10.0.x >> 14aebf3 is described below >> >> commit 14aebf346532ebf02306136edb31675624478556 >> Author: Mark Thomas <ma...@apache.org> >> AuthorDate: Fri Apr 24 16:00:44 2020 +0100 >> >> Update Java source to latest 10.0.x >> --- >> java/org/apache/tomcat/jni/Library.java | 2 +- >> java/org/apache/tomcat/jni/OS.java | 7 ------- >> java/org/apache/tomcat/jni/SSL.java | 6 +++--- >> java/org/apache/tomcat/jni/SSLConf.java | 2 +- >> java/org/apache/tomcat/jni/SSLContext.java | 6 +++--- >> java/org/apache/tomcat/jni/SSLSocket.java | 6 +++--- >> 6 files changed, 11 insertions(+), 18 deletions(-) >> >> diff --git a/java/org/apache/tomcat/jni/Library.java >> b/java/org/apache/tomcat/jni/Library.java >> index 9034e23..45956e1 100644 >> --- a/java/org/apache/tomcat/jni/Library.java >> +++ b/java/org/apache/tomcat/jni/Library.java >> @@ -249,7 +249,7 @@ public final class Library { >> aprVersionString() + >> ")"); >> } >> if (!APR_HAS_THREADS) { >> - throw new UnsatisfiedLinkError("Missing threading >> support from APR"); >> + throw new UnsatisfiedLinkError("Missing >> APR_HAS_THREADS"); > > That's not right for two reasons: > > 1. This test will go away soon. After 1.2.24 I will scope threading > support for OpenSSL < 1.1.0 only. > 2. The flag itself isn't missing, it is simply not 1 (but 0). That's a > difference. Therefore, the error message is misleading. The previous > message has been taken intentionally from APR's "configure --help" output.
Then make sure the code in 10.0.x is how you want it and Tomcat Native will pick it up from there. 10.0.x is the master. Tomcat Native is just a (manually updated) copy. Mark --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
