You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/04/24 15:00:58 UTC
[tomcat-native] branch master updated: Update Java source to latest
10.0.x
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");
}
}
return initialize();
diff --git a/java/org/apache/tomcat/jni/OS.java b/java/org/apache/tomcat/jni/OS.java
index 6796f23..c93a07b 100644
--- a/java/org/apache/tomcat/jni/OS.java
+++ b/java/org/apache/tomcat/jni/OS.java
@@ -46,13 +46,6 @@ public class OS {
private static native boolean is(int type);
public static final boolean IS_UNIX = is(UNIX);
- /**
- * @deprecated Hard-coded to false since there has not been a supported
- * Netware platform for many years.
- * This will be removed in Tomcat 10 onwards
- */
- @Deprecated
- public static final boolean IS_NETWARE = false;
public static final boolean IS_WIN32 = is(WIN32);
public static final boolean IS_WIN64 = is(WIN64);
public static final boolean IS_LINUX = is(LINUX);
diff --git a/java/org/apache/tomcat/jni/SSL.java b/java/org/apache/tomcat/jni/SSL.java
index 6c3f2b4..06b6090 100644
--- a/java/org/apache/tomcat/jni/SSL.java
+++ b/java/org/apache/tomcat/jni/SSL.java
@@ -140,7 +140,7 @@ public final class SSL {
/* Set on servers to choose the cipher according to the server's
* preferences */
public static final int SSL_OP_CIPHER_SERVER_PREFERENCE = 0x00400000;
- /* If set, a server will allow a client to issue a SSLv3.0 version number
+ /* If set, a server will allow a client to issue an SSLv3.0 version number
* as latest version supported in the premaster secret, even when TLSv1.0
* (version 3.1) was announced in the client hello. Normally this is
* forbidden to prevent version rollback attacks. */
@@ -647,7 +647,7 @@ public final class SSL {
* Authentication. Notice that this directive can be used both in per-server
* and per-directory context. In per-server context it applies to the client
* authentication process used in the standard SSL handshake when a connection
- * is established. In per-directory context it forces a SSL renegotiation with
+ * is established. In per-directory context it forces an SSL renegotiation with
* the reconfigured client verification level after the HTTP request was read
* but before the HTTP response is sent.
* <br>
@@ -704,7 +704,7 @@ public final class SSL {
* is permitted to negotiate in the SSL handshake phase. Notice that this
* directive can be used both in per-server and per-directory context.
* In per-server context it applies to the standard SSL handshake when a
- * connection is established. In per-directory context it forces a SSL
+ * connection is established. In per-directory context it forces an SSL
* renegotiation with the reconfigured Cipher Suite after the HTTP request
* was read but before the HTTP response is sent.
* @param ssl the SSL instance (SSL *)
diff --git a/java/org/apache/tomcat/jni/SSLConf.java b/java/org/apache/tomcat/jni/SSLConf.java
index 272c0a1..ede4565 100644
--- a/java/org/apache/tomcat/jni/SSLConf.java
+++ b/java/org/apache/tomcat/jni/SSLConf.java
@@ -73,7 +73,7 @@ public final class SSLConf {
public static native int check(long cctx, String name, String value) throws Exception;
/**
- * Assign an SSL context to a SSL_CONF context.
+ * Assign an SSL context to an SSL_CONF context.
* All following calls to {@link #apply(long, String, String)} will be
* applied to this SSL context.
*
diff --git a/java/org/apache/tomcat/jni/SSLContext.java b/java/org/apache/tomcat/jni/SSLContext.java
index 45fcc48..e0759b3 100644
--- a/java/org/apache/tomcat/jni/SSLContext.java
+++ b/java/org/apache/tomcat/jni/SSLContext.java
@@ -126,7 +126,7 @@ public final class SSLContext {
* <b>mode</b>. SSL objects created from <b>ctx</b> inherit the
* <b>mode</b> valid at the time and may be 0 or 1.
* <br>
- * Normally when a SSL connection is finished, the parties must send out
+ * Normally when an SSL connection is finished, the parties must send out
* "close notify" alert messages using L<SSL_shutdown(3)|SSL_shutdown(3)>
* for a clean shutdown.
* <br>
@@ -150,7 +150,7 @@ public final class SSLContext {
* is permitted to negotiate in the SSL handshake phase. Notice that this
* directive can be used both in per-server and per-directory context.
* In per-server context it applies to the standard SSL handshake when a
- * connection is established. In per-directory context it forces a SSL
+ * connection is established. In per-directory context it forces an SSL
* renegotiation with the reconfigured Cipher Suite after the HTTP request
* was read but before the HTTP response is sent.
* @param ctx Server or Client context to use.
@@ -368,7 +368,7 @@ public final class SSLContext {
* Authentication. Notice that this directive can be used both in per-server
* and per-directory context. In per-server context it applies to the client
* authentication process used in the standard SSL handshake when a connection
- * is established. In per-directory context it forces a SSL renegotiation with
+ * is established. In per-directory context it forces an SSL renegotiation with
* the reconfigured client verification level after the HTTP request was read
* but before the HTTP response is sent.
* <br>
diff --git a/java/org/apache/tomcat/jni/SSLSocket.java b/java/org/apache/tomcat/jni/SSLSocket.java
index c8108a0..2cc42f7 100644
--- a/java/org/apache/tomcat/jni/SSLSocket.java
+++ b/java/org/apache/tomcat/jni/SSLSocket.java
@@ -24,7 +24,7 @@ package org.apache.tomcat.jni;
public class SSLSocket {
/**
- * Attach APR socket on a SSL connection.
+ * Attach APR socket on an SSL connection.
* @param ctx SSLContext to use.
* @param sock APR Socket that already did physical connect or accept.
* @return APR_STATUS code.
@@ -34,14 +34,14 @@ public class SSLSocket {
throws Exception;
/**
- * Do a SSL handshake.
+ * Do an SSL handshake.
* @param thesocket The socket to use
* @return the handshake status
*/
public static native int handshake(long thesocket);
/**
- * Do a SSL renegotiation.
+ * Do an SSL renegotiation.
* SSL supports per-directory re-configuration of SSL parameters.
* This is implemented by performing an SSL renegotiation of the
* re-configured parameters after the request is read, but before the
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: [tomcat-native] branch master updated: Update Java source to
latest 10.0.x
Posted by Mark Thomas <ma...@apache.org>.
On 24/04/2020 16:15, Michael Osipov wrote:
> Am 2020-04-24 um 17:00 schrieb markt@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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: [tomcat-native] branch master updated: Update Java source to
latest 10.0.x
Posted by Michael Osipov <mi...@apache.org>.
Am 2020-04-24 um 17:00 schrieb markt@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.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org