[tomcat] branch main updated: Use segments instead of addresses
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 41e348d Use segments instead of addresses
41e348d is described below
commit 41e348d28576ec5dc4fafc01a7d565abc73fa417
Author: remm
AuthorDate: Wed Nov 10 21:29:14 2021 +0100
Use segments instead of addresses
This allows some safety checks by associating them with the scope. No
visible impact on performance.
---
.../util/net/openssl/panama/OpenSSLEngine.java | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
index 688be9f..e5f4424 100644
---
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
+++
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
@@ -110,7 +110,7 @@ public final class OpenSSLEngine extends SSLEngine
implements SSLUtil.ProtocolIn
try {
SSL_CTX_set_options(sslCtx, SSL_OP_ALL());
SSL_CTX_set_cipher_list(sslCtx, CLinker.toCString("ALL",
scope));
-var ssl = SSL_new(sslCtx);
+var ssl =
SSL_new(sslCtx).asSegment(CLinker.C_POINTER.byteSize(), scope);
SSL_set_accept_state(ssl);
try {
for (String c : getCiphers(ssl)) {
@@ -142,7 +142,7 @@ public final class OpenSSLEngine extends SSLEngine
implements SSLUtil.ProtocolIn
IMPLEMENTED_PROTOCOLS_SET = Collections.unmodifiableSet(protocols);
}
-private static String[] getCiphers(MemoryAddress ssl) {
+private static String[] getCiphers(MemorySegment ssl) {
MemoryAddress sk = SSL_get_ciphers(ssl);
int len = OPENSSL_sk_num(sk);
if (len <= 0) {
@@ -251,7 +251,7 @@ public final class OpenSSLEngine extends SSLEngine
implements SSLUtil.ProtocolIn
ResourceScope scope = ResourceScope.newSharedScope();
var allocator = SegmentAllocator.ofScope(scope);
session = new OpenSSLSession();
-var ssl = SSL_new(sslCtx);
+var ssl = SSL_new(sslCtx).asSegment(CLinker.C_POINTER.byteSize(),
scope);
this.certificateVerificationDepth = certificateVerificationDepth;
// Set ssl_info_callback
MemoryAddress openSSLCallbackInfo =
CLinker.getInstance().upcallStub(openSSLCallbackInfoHandle.bindTo(this),
@@ -267,7 +267,7 @@ public final class OpenSSLEngine extends SSLEngine
implements SSLUtil.ProtocolIn
var networkBIOPointer = allocator.allocate(CLinker.C_POINTER);
BIO_new_bio_pair(internalBIOPointer, 0, networkBIOPointer, 0);
var internalBIO = MemoryAccess.getAddress(internalBIOPointer);
-var networkBIO = MemoryAccess.getAddress(networkBIOPointer);
+var networkBIO =
MemoryAccess.getAddress(networkBIOPointer).asSegment(CLinker.C_POINTER.byteSize(),
scope);
SSL_set_bio(ssl, internalBIO, internalBIO);
state = new OpenSSLState(scope, ssl, networkBIO);
cleanable = cleaner.register(this, state);
@@ -303,7 +303,7 @@ public final class OpenSSLEngine extends SSLEngine
implements SSLUtil.ProtocolIn
* Calling this function with src.remaining == 0 is undefined.
* @throws SSLException if the OpenSSL error check fails
*/
-private int writePlaintextData(final MemoryAddress ssl, final ByteBuffer
src) throws SSLException {
+private int writePlaintextData(final MemorySegment ssl, final ByteBuffer
src) throws SSLException {
clearLastError();
final int pos = src.position();
final int limit = src.limit();
@@ -341,7 +341,7 @@ public final class OpenSSLEngine extends SSLEngine
implements SSLUtil.ProtocolIn
* Write encrypted data to the OpenSSL network BIO.
* @throws SSLException if the OpenSSL error check fails
*/
-private int writeEncryptedData(final MemoryAddress networkBIO, final
ByteBuffer src) throws SSLException {
+private int writeEncryptedData(final MemorySegment networkBIO, final
ByteBuffer src) throws SSLException {
clearLastError();
final int pos = src.position();
final int len = src.remaining();
@@ -380,7 +380,7 @@ public final class OpenSSLEngine extends SSLEngine
implements SSLUtil.ProtocolIn
* Read plain text data from the OpenSSL internal BIO
* @throws SSLException if the OpenSSL error check fails
*/
-private int readPlaintextData(final MemoryAddress ssl, final ByteBuffer
dst) throws SSLException {
+private int readPlaintextData(final MemorySegment ssl, final ByteBuffer
dst) throws SSLException {
clearLastError();
[tomcat] branch 8.5.x updated: Improve error handling
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new c20f672 Improve error handling
c20f672 is described below
commit c20f6722ca66ea190b1c699f5beba78378bf2265
Author: Mark Thomas
AuthorDate: Wed Nov 10 18:15:39 2021 +
Improve error handling
I'm not entirely convinced this code path is possible but as we are
still seeing JVM crashes in Buildbot, the check seems reasonable.
---
java/org/apache/tomcat/util/net/AprEndpoint.java| 3 +++
java/org/apache/tomcat/util/net/LocalStrings.properties | 1 +
webapps/docs/changelog.xml | 4
3 files changed, 8 insertions(+)
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index c09aaa2..0413434 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -858,6 +858,9 @@ public class AprEndpoint extends AbstractEndpoint
implements SNICallBack {
// Accept the next incoming connection from the server
// socket
socket = Socket.accept(serverSock);
+if (socket == 0) {
+throw new
IOException(sm.getString("endpoint.err.accept", getName()));
+}
if (log.isDebugEnabled()) {
long sa = Address.get(Socket.APR_REMOTE, socket);
Sockaddr addr = Address.getInfo(sa);
diff --git a/java/org/apache/tomcat/util/net/LocalStrings.properties
b/java/org/apache/tomcat/util/net/LocalStrings.properties
index ad190eb..ede 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings.properties
@@ -76,6 +76,7 @@ endpoint.debug.unlock.fail=Caught exception trying to unlock
accept on port [{0}
endpoint.debug.unlock.localFail=Unable to determine local address for [{0}]
endpoint.debug.unlock.localNone=Failed to unlock acceptor for [{0}] because
the local address was not available
endpoint.duplicateSslHostName=Multiple SSLHostConfig elements were provided
for the host name [{0}]. Host names must be unique.
+endpoint.err.accept=Failed to accept socket for end point [{0}]
endpoint.err.attach=Failed to attach SSLContext to socket - error [{0}]
endpoint.err.close=Caught exception trying to close socket
endpoint.err.handshake=Handshake failed
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5b9b203..d3c11e5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -141,6 +141,10 @@
Improve error handling if APR/Native fails to attach TLS capabilities
to
a TLS enabled client connection. (markt)
+
+Improve error handling if APR/Native fails to accept an incoming
+connection. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Improve error handling
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new a932b6f Improve error handling
a932b6f is described below
commit a932b6f13374893013d2df756621c88ba7f22f2e
Author: Mark Thomas
AuthorDate: Wed Nov 10 18:15:39 2021 +
Improve error handling
I'm not entirely convinced this code path is possible but as we are
still seeing JVM crashes in Buildbot, the check seems reasonable.
---
java/org/apache/tomcat/util/net/AprEndpoint.java| 3 +++
java/org/apache/tomcat/util/net/LocalStrings.properties | 1 +
webapps/docs/changelog.xml | 4
3 files changed, 8 insertions(+)
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 54d..b3fbf22 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -807,6 +807,9 @@ public class AprEndpoint extends
AbstractEndpoint implements SNICallB
@Override
protected Long serverSocketAccept() throws Exception {
long socket = Socket.accept(serverSock);
+if (socket == 0) {
+throw new IOException(sm.getString("endpoint.err.accept",
getName()));
+}
if (log.isDebugEnabled()) {
long sa = Address.get(Socket.APR_REMOTE, socket);
Sockaddr addr = Address.getInfo(sa);
diff --git a/java/org/apache/tomcat/util/net/LocalStrings.properties
b/java/org/apache/tomcat/util/net/LocalStrings.properties
index 5d8652c..3e306ec 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings.properties
@@ -79,6 +79,7 @@ endpoint.debug.unlock.fail=Caught exception trying to unlock
accept on port [{0}
endpoint.debug.unlock.localFail=Unable to determine local address for [{0}]
endpoint.debug.unlock.localNone=Failed to unlock acceptor for [{0}] because
the local address was not available
endpoint.duplicateSslHostName=Multiple SSLHostConfig elements were provided
for the host name [{0}]. Host names must be unique.
+endpoint.err.accept=Failed to accept socket for end point [{0}]
endpoint.err.attach=Failed to attach SSLContext to socket - error [{0}]
endpoint.err.close=Caught exception trying to close socket
endpoint.err.handshake=Handshake failed
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4b233d6..a6663f5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -111,6 +111,10 @@
Improve error handling if APR/Native fails to attach TLS capabilities
to
a TLS enabled client connection. (markt)
+
+Improve error handling if APR/Native fails to accept an incoming
+connection. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Improve error handling
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 8749df7 Improve error handling
8749df7 is described below
commit 8749df70de9a096b33faffe699e1008a9a696219
Author: Mark Thomas
AuthorDate: Wed Nov 10 18:15:39 2021 +
Improve error handling
I'm not entirely convinced this code path is possible but as we are
still seeing JVM crashes in Buildbot, the check seems reasonable.
---
java/org/apache/tomcat/util/net/AprEndpoint.java| 3 +++
java/org/apache/tomcat/util/net/LocalStrings.properties | 1 +
webapps/docs/changelog.xml | 4
3 files changed, 8 insertions(+)
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index ace5cd9..3a3aa0b 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -803,6 +803,9 @@ public class AprEndpoint extends
AbstractEndpoint implements SNICallB
@Override
protected Long serverSocketAccept() throws Exception {
long socket = Socket.accept(serverSock);
+if (socket == 0) {
+throw new IOException(sm.getString("endpoint.err.accept",
getName()));
+}
if (log.isDebugEnabled()) {
long sa = Address.get(Socket.APR_REMOTE, socket);
Sockaddr addr = Address.getInfo(sa);
diff --git a/java/org/apache/tomcat/util/net/LocalStrings.properties
b/java/org/apache/tomcat/util/net/LocalStrings.properties
index 5d8652c..3e306ec 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings.properties
@@ -79,6 +79,7 @@ endpoint.debug.unlock.fail=Caught exception trying to unlock
accept on port [{0}
endpoint.debug.unlock.localFail=Unable to determine local address for [{0}]
endpoint.debug.unlock.localNone=Failed to unlock acceptor for [{0}] because
the local address was not available
endpoint.duplicateSslHostName=Multiple SSLHostConfig elements were provided
for the host name [{0}]. Host names must be unique.
+endpoint.err.accept=Failed to accept socket for end point [{0}]
endpoint.err.attach=Failed to attach SSLContext to socket - error [{0}]
endpoint.err.close=Caught exception trying to close socket
endpoint.err.handshake=Handshake failed
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2ea791b..ddee7bb 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -111,6 +111,10 @@
Improve error handling if APR/Native fails to attach TLS capabilities
to
a TLS enabled client connection. (markt)
+
+Improve error handling if APR/Native fails to accept an incoming
+connection. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1894912 - in /tomcat/site/trunk: docs/ci.html xdocs/ci.xml
Author: markt Date: Wed Nov 10 13:21:24 2021 New Revision: 1894912 URL: http://svn.apache.org/viewvc?rev=1894912=rev Log: Update links for new CI system Modified: tomcat/site/trunk/docs/ci.html tomcat/site/trunk/xdocs/ci.xml Modified: tomcat/site/trunk/docs/ci.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1894912=1894911=1894912=diff == --- tomcat/site/trunk/docs/ci.html (original) +++ tomcat/site/trunk/docs/ci.html Wed Nov 10 13:21:24 2021 @@ -27,10 +27,10 @@ currently developed not yet released ver prepared and published by ASF Buildbot, using the latest source code. - https://ci.apache.org/projects/tomcat/tomcat-10.1.x/docs/index.html; rel="nofollow">Tomcat 10.1.x (main) - https://ci.apache.org/projects/tomcat/tomcat-10.0.x/docs/index.html; rel="nofollow">Tomcat 10.0.x - https://ci.apache.org/projects/tomcat/tomcat-9.0.x/docs/index.html; rel="nofollow">Tomcat 9.0.x - https://ci.apache.org/projects/tomcat/tomcat-8.5.x/docs/index.html; rel="nofollow">Tomcat 8.5.x + https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/index.html; rel="nofollow">Tomcat 10.1.x (main) + https://nightlies.apache.org/tomcat/tomcat-10.0.x/docs/index.html; rel="nofollow">Tomcat 10.0.x + https://nightlies.apache.org/tomcat/tomcat-9.0.x/docs/index.html; rel="nofollow">Tomcat 9.0.x + https://nightlies.apache.org/tomcat/tomcat-8.5.x/docs/index.html; rel="nofollow">Tomcat 8.5.x Maven snapshot repositories @@ -61,15 +61,15 @@ for not-yet-released versions of Apache Source path: https://github.com/apache/tomcat;>https://github.com/apache/tomcat - https://ci.apache.org/builders/tomcat-10.1.x;>Build status page for tomcat-10.1.xThis builder is triggered after each commit. It does a release build and runs tests (using multiple parallel threads). - https://ci.apache.org/builders/tomcat-10.1.x-periodic;>Build status page for tomcat-10.1.x-periodicThis builder is triggered once a day. It runs tests serially and generates a coverage report. - https://ci.apache.org/projects/tomcat/tomcat-10.1.x/; rel="nofollow">Published files: + https://ci2.apache.org/#/builders/44;>Build status page for tomcat-10.1.xThis builder is triggered after each commit. It does a release build and runs tests. + https://ci2.apache.org/#/builders/38;>Build status page for tomcat-10.1.x-periodicThis builder is triggered once a day. It runs tests and generates a coverage report. + https://nightlies.apache.org/tomcat/tomcat-10.1.x/; rel="nofollow">Published files: - https://ci.apache.org/projects/tomcat/tomcat-10.1.x/docs/index.html; rel="nofollow">Documentation - https://ci.apache.org/projects/tomcat/tomcat-10.1.x/logs/; rel="nofollow">JUnit logs + https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/index.html; rel="nofollow">Documentation + https://nightlies.apache.org/tomcat/tomcat-10.1.x/logs/; rel="nofollow">JUnit logs by build number. The recent ones are at the bottom. - https://ci.apache.org/projects/tomcat/tomcat-10.1.x/coverage/; rel="nofollow">Coverage report - https://ci.apache.org/projects/tomcat/tomcat-10.1.x/rat-output.html; rel="nofollow">RAT report + https://nightlies.apache.org/tomcat/tomcat-10.1.x/coverage/; rel="nofollow">Coverage report + https://nightlies.apache.org/tomcat/tomcat-10.1.x/rat-output.html; rel="nofollow">RAT report @@ -80,15 +80,15 @@ for not-yet-released versions of Apache Source path: https://github.com/apache/tomcat/tree/10.0.x;>https://github.com/apache/tomcat/tree/10.0.x - https://ci.apache.org/builders/tomcat-10.0.x;>Build status page for tomcat-10.0.xThis builder is triggered after each commit. It does a release build and runs tests (using multiple parallel threads). - https://ci.apache.org/builders/tomcat-10.0.x-periodic;>Build status page for tomcat-10.0.x-periodicThis builder is triggered once a day. It runs tests serially and generates a coverage report. - https://ci.apache.org/projects/tomcat/tomcat-10.0.x/; rel="nofollow">Published files: + https://ci2.apache.org/#/builders/43;>Build status page for tomcat-10.0.xThis builder is triggered after each commit. It does a release build and runs tests. + https://ci2.apache.org/#/builders/40;>Build status page for tomcat-10.0.x-periodicThis builder is triggered once a day. It runs tests and generates a coverage report. + https://nightlies.apache.org/tomcat/tomcat-10.0.x/; rel="nofollow">Published files: - https://ci.apache.org/projects/tomcat/tomcat-10.0.x/docs/index.html; rel="nofollow">Documentation - https://ci.apache.org/projects/tomcat/tomcat-10.0.x/logs/; rel="nofollow">JUnit logs + https://nightlies.apache.org/tomcat/tomcat-10.0.x/docs/index.html;
[tomcat] branch 8.5.x updated: Improve error handling
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 6410818 Improve error handling
6410818 is described below
commit 6410818af3b5207e17f8aa0701709fc259237300
Author: Mark Thomas
AuthorDate: Wed Nov 10 13:04:41 2021 +
Improve error handling
While this is in the vicinity of the current CI failures for the
TestSSLHostConfigCompat tests, I don't think it is the root cause of the
test failures. It might be the root cause of the some of the JVM
crashes.
Whether it is the root cause of failures and/or crashes or not, ignoring
the return value when it may indicate an error needs improvement.
---
java/org/apache/tomcat/util/net/AprEndpoint.java| 6 +-
java/org/apache/tomcat/util/net/LocalStrings.properties | 1 +
webapps/docs/changelog.xml | 4
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 4d157ce..c09aaa2 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -626,7 +626,11 @@ public class AprEndpoint extends AbstractEndpoint
implements SNICallBack {
// 2: SSL handshake
step = 2;
if (sslContext != 0) {
-SSLSocket.attach(sslContext, socket);
+int rv = SSLSocket.attach(sslContext, socket);
+if (rv != Status.APR_SUCCESS) {
+log.warn(sm.getString("endpoint.err.attach",
Integer.valueOf(rv)));
+return false;
+}
if (SSLSocket.handshake(socket) != 0) {
if (log.isDebugEnabled()) {
log.debug(sm.getString("endpoint.err.handshake") + ":
" + SSL.getLastError());
diff --git a/java/org/apache/tomcat/util/net/LocalStrings.properties
b/java/org/apache/tomcat/util/net/LocalStrings.properties
index 94913e8..ad190eb 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings.properties
@@ -76,6 +76,7 @@ endpoint.debug.unlock.fail=Caught exception trying to unlock
accept on port [{0}
endpoint.debug.unlock.localFail=Unable to determine local address for [{0}]
endpoint.debug.unlock.localNone=Failed to unlock acceptor for [{0}] because
the local address was not available
endpoint.duplicateSslHostName=Multiple SSLHostConfig elements were provided
for the host name [{0}]. Host names must be unique.
+endpoint.err.attach=Failed to attach SSLContext to socket - error [{0}]
endpoint.err.close=Caught exception trying to close socket
endpoint.err.handshake=Handshake failed
endpoint.err.unexpected=Unexpected error processing socket
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d972caa..5b9b203 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -137,6 +137,10 @@
open a server socket as continuing in this case will trigger a JVM
crash.
(markt)
+
+Improve error handling if APR/Native fails to attach TLS capabilities
to
+a TLS enabled client connection. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Improve error handling
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 24ca7c1 Improve error handling
24ca7c1 is described below
commit 24ca7c139d0131b53e97b4cb53bb7780daab
Author: Mark Thomas
AuthorDate: Wed Nov 10 13:04:41 2021 +
Improve error handling
While this is in the vicinity of the current CI failures for the
TestSSLHostConfigCompat tests, I don't think it is the root cause of the
test failures. It might be the root cause of the some of the JVM
crashes.
Whether it is the root cause of failures and/or crashes or not, ignoring
the return value when it may indicate an error needs improvement.
---
java/org/apache/tomcat/util/net/AprEndpoint.java| 6 +-
java/org/apache/tomcat/util/net/LocalStrings.properties | 1 +
webapps/docs/changelog.xml | 8
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 79ef971..ace5cd9 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -705,7 +705,11 @@ public class AprEndpoint extends
AbstractEndpoint implements SNICallB
// 2: SSL handshake
step = 2;
if (sslContext != 0) {
-SSLSocket.attach(sslContext, socket);
+int rv = SSLSocket.attach(sslContext, socket);
+if (rv != Status.APR_SUCCESS) {
+log.warn(sm.getString("endpoint.err.attach",
Integer.valueOf(rv)));
+return false;
+}
if (SSLSocket.handshake(socket) != 0) {
if (log.isDebugEnabled()) {
log.debug(sm.getString("endpoint.err.handshake") + ":
" + SSL.getLastError());
diff --git a/java/org/apache/tomcat/util/net/LocalStrings.properties
b/java/org/apache/tomcat/util/net/LocalStrings.properties
index f3f1619..5d8652c 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings.properties
@@ -79,6 +79,7 @@ endpoint.debug.unlock.fail=Caught exception trying to unlock
accept on port [{0}
endpoint.debug.unlock.localFail=Unable to determine local address for [{0}]
endpoint.debug.unlock.localNone=Failed to unlock acceptor for [{0}] because
the local address was not available
endpoint.duplicateSslHostName=Multiple SSLHostConfig elements were provided
for the host name [{0}]. Host names must be unique.
+endpoint.err.attach=Failed to attach SSLContext to socket - error [{0}]
endpoint.err.close=Caught exception trying to close socket
endpoint.err.handshake=Handshake failed
endpoint.err.unexpected=Unexpected error processing socket
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d7d383d..2ea791b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,14 @@
issues do not "pop up" wrt. others).
-->
+
+
+
+Improve error handling if APR/Native fails to attach TLS capabilities
to
+a TLS enabled client connection. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Improve error handling
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new a8f3ea5 Improve error handling
a8f3ea5 is described below
commit a8f3ea5bc9946c2019e5ae130d01270bf1b62e9a
Author: Mark Thomas
AuthorDate: Wed Nov 10 13:04:41 2021 +
Improve error handling
While this is in the vicinity of the current CI failures for the
TestSSLHostConfigCompat tests, I don't think it is the root cause of the
test failures. It might be the root cause of the some of the JVM
crashes.
Whether it is the root cause of failures and/or crashes or not, ignoring
the return value when it may indicate an error needs improvement.
---
java/org/apache/tomcat/util/net/AprEndpoint.java| 6 +-
java/org/apache/tomcat/util/net/LocalStrings.properties | 1 +
webapps/docs/changelog.xml | 8
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 0c4d87f..54d 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -709,7 +709,11 @@ public class AprEndpoint extends
AbstractEndpoint implements SNICallB
// 2: SSL handshake
step = 2;
if (sslContext != 0) {
-SSLSocket.attach(sslContext, socket);
+int rv = SSLSocket.attach(sslContext, socket);
+if (rv != Status.APR_SUCCESS) {
+log.warn(sm.getString("endpoint.err.attach",
Integer.valueOf(rv)));
+return false;
+}
if (SSLSocket.handshake(socket) != 0) {
if (log.isDebugEnabled()) {
log.debug(sm.getString("endpoint.err.handshake") + ":
" + SSL.getLastError());
diff --git a/java/org/apache/tomcat/util/net/LocalStrings.properties
b/java/org/apache/tomcat/util/net/LocalStrings.properties
index f3f1619..5d8652c 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings.properties
@@ -79,6 +79,7 @@ endpoint.debug.unlock.fail=Caught exception trying to unlock
accept on port [{0}
endpoint.debug.unlock.localFail=Unable to determine local address for [{0}]
endpoint.debug.unlock.localNone=Failed to unlock acceptor for [{0}] because
the local address was not available
endpoint.duplicateSslHostName=Multiple SSLHostConfig elements were provided
for the host name [{0}]. Host names must be unique.
+endpoint.err.attach=Failed to attach SSLContext to socket - error [{0}]
endpoint.err.close=Caught exception trying to close socket
endpoint.err.handshake=Handshake failed
endpoint.err.unexpected=Unexpected error processing socket
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c223b4b..4b233d6 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,14 @@
issues do not "pop up" wrt. others).
-->
+
+
+
+Improve error handling if APR/Native fails to attach TLS capabilities
to
+a TLS enabled client connection. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 9.0.55
On Wed, Nov 10, 2021 at 10:55 AM Rémy Maucherat wrote: > The proposed Apache Tomcat 9.0.55 release is now available for voting. > > The notable changes compared to 9.0.55 are: > > - Experimental OpenSSL support through the Panama API incubating in Java >17, with support for OpenSSL 1.1+ >The module is available here: >https://github.com/apache/tomcat/tree/10.1.0-M7/modules/openssl-java17 >Note: The 10.1.0-M7 tag corresponds to the 9.0.55 tag epoch. > > - Add support for custom caching strategies for web application >resources. This initial implementation allows control over whether or >not a resource is cached. > > - Improve robustness of JNDIRealm for exceptions occurring when getting >the connection. > > Along with lots of other bug fixes and improvements. > > For full details, see the changelog: > https://ci.apache.org/projects/tomcat/tomcat-9.0.x/docs/changelog.html > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.55/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1340 > The tag is: > https://github.com/apache/tomcat/tree/9.0.55 > 662cc9171c22ac790532d38a2b59990faaa7b971 > > The proposed 9.0.55 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 9.0.55 (stable) > Regards, Martin > > Rémy > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
Re: [VOTE] Release Apache Tomcat 10.0.13
On Wed, Nov 10, 2021 at 12:51 AM Mark Thomas wrote: > The proposed Apache Tomcat 10.0.13 release is now available for > voting. > > Apache Tomcat 10.x implements Jakarta EE 9 and, as such, the primary > package for all the specification APIs has changed from javax.* to > jakarta.* > > Applications that run on Tomcat 9 will not run on Tomcat 10 without > changes. Java EE applications designed for Tomcat 9 and earlier may be > placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will > automatically convert them to Jakarta EE and copy them to the webapps > directory > > The notable changes compared to 10.0.12 are: > > - Experimental OpenSSL support through the Panama API incubating in Java >17, with support for OpenSSL 1.1+ > > - Add support for custom caching strategies for web application >resources. This initial implementation allows control over whether or >not a resource is cached. > > - Improve robustness of JNDIRealm for exceptions occurring when getting >the connection. > > Along with lots of other bug fixes and improvements. > > For full details, see the changelog: > https://ci.apache.org/projects/tomcat/tomcat-10.0.x/docs/changelog.html > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.0.13/ > > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1339 > > The tag is: > https://github.com/apache/tomcat/tree/10.0.13 > 40dbce6eb012429a6ba62a9bb65fd11ee5c6c898 > > The proposed 10.0.13 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 10.0.13 (stable) > Regards, Martin > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
[tomcat] branch 10.0.x updated: Fix a typo in the changelog
This is an automated email from the ASF dual-hosted git repository. mgrigorov pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.0.x by this push: new 9c3dc57 Fix a typo in the changelog 9c3dc57 is described below commit 9c3dc5726606f0e57a2e19d4c038ae0cf4c8e682 Author: Martin Tzvetanov Grigorov AuthorDate: Wed Nov 10 14:04:42 2021 +0200 Fix a typo in the changelog (cherry picked from commit 4130b952448cd2cbf1b3d1d52bddef7048795f81) --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index d767359..c223b4b 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -155,7 +155,7 @@ Do not ignore the error condition if the APR connector is not able to -open a sever socket as continuing in this case will trigger a JVM crash. +open a server socket as continuing in this case will trigger a JVM crash. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix a typo in the changelog
This is an automated email from the ASF dual-hosted git repository. mgrigorov 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 50be73f Fix a typo in the changelog 50be73f is described below commit 50be73f4b8a33761693987bdc5efe14b6df736e8 Author: Martin Tzvetanov Grigorov AuthorDate: Wed Nov 10 14:04:42 2021 +0200 Fix a typo in the changelog (cherry picked from commit 4130b952448cd2cbf1b3d1d52bddef7048795f81) --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index a404289..d7d383d 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -155,7 +155,7 @@ Do not ignore the error condition if the APR connector is not able to -open a sever socket as continuing in this case will trigger a JVM crash. +open a server socket as continuing in this case will trigger a JVM crash. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Fix a typo in the changelog
This is an automated email from the ASF dual-hosted git repository. mgrigorov pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/8.5.x by this push: new 4130b95 Fix a typo in the changelog 4130b95 is described below commit 4130b952448cd2cbf1b3d1d52bddef7048795f81 Author: Martin Tzvetanov Grigorov AuthorDate: Wed Nov 10 14:04:42 2021 +0200 Fix a typo in the changelog --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 0e04aa4..d972caa 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -134,7 +134,7 @@ Do not ignore the error condition if the APR connector is not able to -open a sever socket as continuing in this case will trigger a JVM crash. +open a server socket as continuing in this case will trigger a JVM crash. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 10.1.0-M7
On Mon, Nov 8, 2021 at 11:59 PM Mark Thomas wrote: > The proposed Apache Tomcat 10.1.0-M7 release is now available for > voting. > > Applications that run on Tomcat 9 and earlier will not run on Tomcat 10 > without changes. Java EE applications designed for Tomcat 9 and earlier > may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat > will automatically convert them to Jakarta EE and copy them to the > webapps directory. > > The notable changes compared to 10.1.0-M6 are: > > > - Servlet API updates for Servlet 6 including refactoring >HttpServlet.doHead(), support for generic attributes on Cookies, more >consistent URI handling including an option to reject 'suspicious' >URIs > > - EL API updates for EL 5.0 including changes to ELResolver.getType() > > - Experimental OpenSSL support through the Panama API incubating in Java >17, with support for OpenSSL 1.1+ > > > For full details, see the changelog: > https://ci.apache.org/projects/tomcat/tomcat-10.1.x/docs/changelog.html > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.0-M7/ > > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1338 > > The tag is: > https://github.com/apache/tomcat/tree/10.1.0-M7 > 0f3f1e439a040068b741d7766722e4420ad6 > > > The proposed 10.1.0-M7 release is: > [ ] Broken - do not release > [X] Alpha - go ahead and release as 10.1.0-M7 (alpha) > Regards, Martin > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
[Bug 65677] InvalidMarkException in Http11InputBuffer.fill when socket read throws AsynchronousCloseException
https://bz.apache.org/bugzilla/show_bug.cgi?id=65677 --- Comment #1 from Andreas Grub --- The runtime where this was observed is (it's a dockerized Spring Boot 2.5.6 application): java -version Picked up JAVA_TOOL_OPTIONS: -XX:MinRAMPercentage=75 -XX:MaxRAMPercentage=75 -XX:-OmitStackTraceInFastThrow -XX:+ExitOnOutOfMemoryError openjdk version "11.0.13" 2021-10-19 LTS OpenJDK Runtime Environment 21.10-(Zulu-11.52+13-linux_x64)-Microsoft-Azure-restricted (build 11.0.13+8-LTS) OpenJDK 64-Bit Server VM 21.10-(Zulu-11.52+13-linux_x64)-Microsoft-Azure-restricted (build 11.0.13+8-LTS, mixed mode) -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 65677] New: InvalidMarkException in Http11InputBuffer.fill when socket read throws AsynchronousCloseException
https://bz.apache.org/bugzilla/show_bug.cgi?id=65677
Bug ID: 65677
Summary: InvalidMarkException in Http11InputBuffer.fill when
socket read throws AsynchronousCloseException
Product: Tomcat 9
Version: 9.0.54
Hardware: PC
OS: Linux
Status: NEW
Severity: normal
Priority: P2
Component: Connectors
Assignee: dev@tomcat.apache.org
Reporter: andreas.g...@qaware.de
Target Milestone: -
When reading a CoyoteInputStream during a chunked Http/1.1
POST request, I've encountered a java.nio.InvalidMarkException
under certain conditions. Here's the stacktrace I observe:
java.nio.InvalidMarkException: null
at java.nio.Buffer.reset(Unknown Source)
at java.nio.ByteBuffer.reset(Unknown Source)
at java.nio.ByteBuffer.reset(Unknown Source)
at o.a.coyote.http11.Http11InputBuffer.fill(Http11InputBuffer.java:813)
at
o.a.coyote.http11.Http11InputBuffer.access$400(Http11InputBuffer.java:42)
at
o.a.c.h.Http11InputBuffer$SocketInputBuffer.doRead(Http11InputBuffer.java:1172)
at
o.a.c.h.filters.ChunkedInputFilter.readBytes(ChunkedInputFilter.java:310)
at
o.a.c.h.filters.ChunkedInputFilter.parseChunkHeader(ChunkedInputFilter.java:338)
at
o.a.c.h.filters.ChunkedInputFilter.doRead(ChunkedInputFilter.java:164)
at
o.a.coyote.http11.Http11InputBuffer.doRead(Http11InputBuffer.java:249)
at org.apache.coyote.Request.doRead(Request.java:640)
at
o.a.catalina.connector.InputBuffer.realReadBytes(InputBuffer.java:317)
at
o.a.catalina.connector.InputBuffer.checkByteBufferEof(InputBuffer.java:600)
at o.a.catalina.connector.InputBuffer.read(InputBuffer.java:340)
at o.a.c.connector.CoyoteInputStream.read(CoyoteInputStream.java:132)
I currently assume that the thread reading the CoyoteInputStream is
interrupted because it's running within a Resilience4j TimeLimiter
and the POST request takes too long. This should be ok though and
I'd expect an InterruptedException or IOException in that case
from the read call, but instead I get an InvalidMarkException.
This InvalidMarkException is thrown in the "finally"
block of this part in Http11InputBuffer.fill:
byteBuffer.mark();
try {
if (byteBuffer.position() < byteBuffer.limit()) {
byteBuffer.position(byteBuffer.limit());
}
byteBuffer.limit(byteBuffer.capacity());
SocketWrapperBase socketWrapper = this.wrapper;
if (socketWrapper != null) {
nRead = socketWrapper.read(block, byteBuffer);
} else {
throw new CloseNowException(sm.getString("iib.eof.error"));
}
} finally {
// Ensure that the buffer limit and position are returned to a
// consistent "ready for read" state if an error occurs during in
// the above code block.
byteBuffer.limit(byteBuffer.position()).reset();
}
I've instrumented that part with more debug logs as follows (in
particular, for upcoming Tomcat versions, it might be good to add at
least the catch block to enhance debugging of such issues in the future):
byteBuffer.mark();
if (log.isDebugEnabled()) {
log.debug("Set mark at position " + byteBuffer.position());
}
try {
if (byteBuffer.position() < byteBuffer.limit()) {
if (log.isDebugEnabled()) {
log.debug("Setting position to limit " + byteBuffer.limit());
}
byteBuffer.position(byteBuffer.limit());
}
byteBuffer.limit(byteBuffer.capacity());
if (log.isDebugEnabled()) {
log.debug("Position before read " + byteBuffer.position());
}
SocketWrapperBase socketWrapper = this.wrapper;
if (socketWrapper != null) {
nRead = socketWrapper.read(block, byteBuffer);
} else {
throw new CloseNowException(sm.getString("iib.eof.error"));
}
} catch (Throwable e) {
if (log.isDebugEnabled()) {
log.debug("Encountered exception in read during fill, position=" +
byteBuffer.position(), e);
}
throw e;
} finally {
// Ensure that the buffer limit and position are returned to a
// consistent "ready for read" state if an error occurs during in
// the above code block.
if (log.isDebugEnabled()) {
log.debug("Calling limit on byteBuffer with position " +
byteBuffer.position());
}
byteBuffer.limit(byteBuffer.position()).reset();
}
When that exception occurs, I see the following logs (before
that, the POST request was already running for about 30 seconds
until the TimeLimiter kicked in and interrupted the thread):
10:03:18.899Before fill(): parsingHeader: [false], parsingRequestLine:
[false], parsingRequestLinePhase: [0], parsingRequestLineStart: [0],
byteBuffer.position(): [3313], byteBuffer.limit(): [3313], end: [2019]
10:03:18.899Set mark at position 2019
10:03:18.899Position before read 2019
10:03:18.942Calling limit on byteBuffer with position 3306
10:03:18.942
Re: [VOTE] Release Apache Tomcat 10.0.13
On 10/11/2021 08:54, Rémy Maucherat wrote: On Tue, Nov 9, 2021 at 11:51 PM Mark Thomas wrote: For full details, see the changelog: https://ci.apache.org/projects/tomcat/tomcat-10.0.x/docs/changelog.html With CI not running, this is not up to date. Good catch. The new version is here: https://nightlies.apache.org/tomcat/tomcat-10.0.x/docs/changelog.html You've reminded me I meant to get the CI links on the website updated. I'll do that now. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE] Release Apache Tomcat 9.0.55
The proposed Apache Tomcat 9.0.55 release is now available for voting. The notable changes compared to 9.0.55 are: - Experimental OpenSSL support through the Panama API incubating in Java 17, with support for OpenSSL 1.1+ The module is available here: https://github.com/apache/tomcat/tree/10.1.0-M7/modules/openssl-java17 Note: The 10.1.0-M7 tag corresponds to the 9.0.55 tag epoch. - Add support for custom caching strategies for web application resources. This initial implementation allows control over whether or not a resource is cached. - Improve robustness of JNDIRealm for exceptions occurring when getting the connection. Along with lots of other bug fixes and improvements. For full details, see the changelog: https://ci.apache.org/projects/tomcat/tomcat-9.0.x/docs/changelog.html It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.55/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1340 The tag is: https://github.com/apache/tomcat/tree/9.0.55 662cc9171c22ac790532d38a2b59990faaa7b971 The proposed 9.0.55 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 9.0.55 (stable) Rémy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 10.0.13
On Tue, Nov 9, 2021 at 11:51 PM Mark Thomas wrote: > > The proposed Apache Tomcat 10.0.13 release is now available for > voting. > > Apache Tomcat 10.x implements Jakarta EE 9 and, as such, the primary > package for all the specification APIs has changed from javax.* to jakarta.* > > Applications that run on Tomcat 9 will not run on Tomcat 10 without > changes. Java EE applications designed for Tomcat 9 and earlier may be > placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will > automatically convert them to Jakarta EE and copy them to the webapps > directory > > The notable changes compared to 10.0.12 are: > > - Experimental OpenSSL support through the Panama API incubating in Java >17, with support for OpenSSL 1.1+ The module is available here: https://github.com/apache/tomcat/tree/10.1.0-M7/modules/openssl-java17 Note: The 10.1.0-M7 tag corresponds to the 9.0.55 tag epoch. > - Add support for custom caching strategies for web application >resources. This initial implementation allows control over whether or >not a resource is cached. > > - Improve robustness of JNDIRealm for exceptions occurring when getting >the connection. > > Along with lots of other bug fixes and improvements. > > For full details, see the changelog: > https://ci.apache.org/projects/tomcat/tomcat-10.0.x/docs/changelog.html With CI not running, this is not up to date. > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.0.13/ > > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1339 > > The tag is: > https://github.com/apache/tomcat/tree/10.0.13 > 40dbce6eb012429a6ba62a9bb65fd11ee5c6c898 > > The proposed 10.0.13 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 10.0.13 (stable) Rémy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Increment version for next dev cycle
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.0.x by this push: new c814990 Increment version for next dev cycle c814990 is described below commit c81499053eaa4522f369d6cea093a250cd53f322 Author: Mark Thomas AuthorDate: Wed Nov 10 08:34:50 2021 + Increment version for next dev cycle --- build.properties.default | 2 +- res/maven/mvn.properties.default | 2 +- webapps/docs/changelog.xml | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.properties.default b/build.properties.default index d353e2f..9bd26b1 100644 --- a/build.properties.default +++ b/build.properties.default @@ -31,7 +31,7 @@ # - Version Control Flags - version.major=10 version.minor=0 -version.build=13 +version.build=14 version.patch=0 version.suffix=-dev diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default index 9c65820..9217ab2 100644 --- a/res/maven/mvn.properties.default +++ b/res/maven/mvn.properties.default @@ -39,7 +39,7 @@ maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d maven.asf.release.repo.repositoryId=apache.releases.https # Release version info -maven.asf.release.deploy.version=10.0.13 +maven.asf.release.deploy.version=10.0.14 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 02fe82a..d767359 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -104,7 +104,9 @@ They eventually become mixed with the numbered issues (i.e., numbered issues do not "pop up" wrt. others). --> - + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r50865 - in /dev/tomcat/tomcat-9/v9.0.55: ./ bin/ bin/embed/ src/
Author: remm Date: Wed Nov 10 08:33:25 2021 New Revision: 50865 Log: Upload 9.0.55 for voting Added: dev/tomcat/tomcat-9/v9.0.55/ dev/tomcat/tomcat-9/v9.0.55/KEYS dev/tomcat/tomcat-9/v9.0.55/README.html dev/tomcat/tomcat-9/v9.0.55/RELEASE-NOTES dev/tomcat/tomcat-9/v9.0.55/bin/ dev/tomcat/tomcat-9/v9.0.55/bin/README.html dev/tomcat/tomcat-9/v9.0.55/bin/apache-tomcat-9.0.55-deployer.tar.gz (with props) dev/tomcat/tomcat-9/v9.0.55/bin/apache-tomcat-9.0.55-deployer.tar.gz.asc (with props) dev/tomcat/tomcat-9/v9.0.55/bin/apache-tomcat-9.0.55-deployer.tar.gz.sha512 dev/tomcat/tomcat-9/v9.0.55/bin/apache-tomcat-9.0.55-deployer.zip (with props) dev/tomcat/tomcat-9/v9.0.55/bin/apache-tomcat-9.0.55-deployer.zip.asc (with props) dev/tomcat/tomcat-9/v9.0.55/bin/apache-tomcat-9.0.55-deployer.zip.sha512 dev/tomcat/tomcat-9/v9.0.55/bin/apache-tomcat-9.0.55-fulldocs.tar.gz (with props) dev/tomcat/tomcat-9/v9.0.55/bin/apache-tomcat-9.0.55-fulldocs.tar.gz.asc (with props) dev/tomcat/tomcat-9/v9.0.55/bin/apache-tomcat-9.0.55-fulldocs.tar.gz.sha512 dev/tomcat/tomcat-9/v9.0.55/bin/apache-tomcat-9.0.55-windows-x64.zip (with props) dev/tomcat/tomcat-9/v9.0.55/bin/apache-tomcat-9.0.55-windows-x64.zip.asc (with props) dev/tomcat/tomcat-9/v9.0.55/bin/apache-tomcat-9.0.55-windows-x64.zip.sha512 dev/tomcat/tomcat-9/v9.0.55/bin/apache-tomcat-9.0.55-windows-x86.zip (with props) dev/tomcat/tomcat-9/v9.0.55/bin/apache-tomcat-9.0.55-windows-x86.zip.asc (with props) dev/tomcat/tomcat-9/v9.0.55/bin/apache-tomcat-9.0.55-windows-x86.zip.sha512 dev/tomcat/tomcat-9/v9.0.55/bin/apache-tomcat-9.0.55.exe (with props) dev/tomcat/tomcat-9/v9.0.55/bin/apache-tomcat-9.0.55.exe.asc (with props) dev/tomcat/tomcat-9/v9.0.55/bin/apache-tomcat-9.0.55.exe.sha512 dev/tomcat/tomcat-9/v9.0.55/bin/apache-tomcat-9.0.55.tar.gz (with props) dev/tomcat/tomcat-9/v9.0.55/bin/apache-tomcat-9.0.55.tar.gz.asc (with props) dev/tomcat/tomcat-9/v9.0.55/bin/apache-tomcat-9.0.55.tar.gz.sha512 dev/tomcat/tomcat-9/v9.0.55/bin/apache-tomcat-9.0.55.zip (with props) dev/tomcat/tomcat-9/v9.0.55/bin/apache-tomcat-9.0.55.zip.asc (with props) dev/tomcat/tomcat-9/v9.0.55/bin/apache-tomcat-9.0.55.zip.sha512 dev/tomcat/tomcat-9/v9.0.55/bin/embed/ dev/tomcat/tomcat-9/v9.0.55/bin/embed/apache-tomcat-9.0.55-embed.tar.gz (with props) dev/tomcat/tomcat-9/v9.0.55/bin/embed/apache-tomcat-9.0.55-embed.tar.gz.asc (with props) dev/tomcat/tomcat-9/v9.0.55/bin/embed/apache-tomcat-9.0.55-embed.tar.gz.sha512 dev/tomcat/tomcat-9/v9.0.55/bin/embed/apache-tomcat-9.0.55-embed.zip (with props) dev/tomcat/tomcat-9/v9.0.55/bin/embed/apache-tomcat-9.0.55-embed.zip.asc (with props) dev/tomcat/tomcat-9/v9.0.55/bin/embed/apache-tomcat-9.0.55-embed.zip.sha512 dev/tomcat/tomcat-9/v9.0.55/src/ dev/tomcat/tomcat-9/v9.0.55/src/apache-tomcat-9.0.55-src.tar.gz (with props) dev/tomcat/tomcat-9/v9.0.55/src/apache-tomcat-9.0.55-src.tar.gz.asc (with props) dev/tomcat/tomcat-9/v9.0.55/src/apache-tomcat-9.0.55-src.tar.gz.sha512 dev/tomcat/tomcat-9/v9.0.55/src/apache-tomcat-9.0.55-src.zip (with props) dev/tomcat/tomcat-9/v9.0.55/src/apache-tomcat-9.0.55-src.zip.asc (with props) dev/tomcat/tomcat-9/v9.0.55/src/apache-tomcat-9.0.55-src.zip.sha512 Added: dev/tomcat/tomcat-9/v9.0.55/KEYS == --- dev/tomcat/tomcat-9/v9.0.55/KEYS (added) +++ dev/tomcat/tomcat-9/v9.0.55/KEYS Wed Nov 10 08:33:25 2021 @@ -0,0 +1,237 @@ +This file contains the PGP keys of various Apache developers. +Please don't use them for email unless you have to. Their main +purpose is code signing. + +Apache users: pgp < KEYS +Apache developers: +(pgpk -ll && pgpk -xa ) >> this file. + or +(gpg --fingerprint --list-sigs + && gpg --armor --export ) >> this file. + +Apache developers: please ensure that your key is also available via the +PGP keyservers (such as pgpkeys.mit.edu). + + +pub 1024D/33C60243 2004-09-12 + Key fingerprint = DCFD 35E0 BF8C A734 4752 DE8B 6FB2 1E89 33C6 0243 +uid Mark E D Thomas +uid Mark E D Thomas +uid Mark E D Thomas +sub 2048g/0BECE548 2004-09-12 + +pub 4096R/2F6059E7 2009-09-18 + Key fingerprint = A9C5 DF4D 22E9 9998 D987 5A51 10C0 1C5A 2F60 59E7 +uid Mark E D Thomas +sub 4096R/5E763BEC 2009-09-18 + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1.4.9 (MingW32) + +mQGiBEFEjegRBADocGttfROvtLGrTOW3xRqZHmFWybmEaI6jmnRdN/1gGXmb3wQL +rHsS3fLFIIOYLPph0Kov9q4qNq36LekShIvjMBDFoj2/wRxaUtFq81asaRZg8Mcw +4kVeIoe8OIOuWmvYhU8SH2jJNUnVVrpTPAa6QWquTmseNi6UJMjLxuL7DwCg//9u +k2yj0vk6e4WSO6Fe5+EkQDED/AjQsy0kj9TpNHkKSSUR2evRlWPYA0YtxBSbsgON +tT0cYipAp5IcYt6Zq5QzHiZreyQXLAjItDS2oGCIXfNbTYJ3kxxJTCU/3wlefVdq
[tomcat] branch 9.0.x updated: Next build is 9.0.56
This is an automated email from the ASF dual-hosted git repository. remm 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 6b0ba31 Next build is 9.0.56 6b0ba31 is described below commit 6b0ba31b73d1cacbf4ddcf30088557a8ddb1e152 Author: remm AuthorDate: Wed Nov 10 09:19:31 2021 +0100 Next build is 9.0.56 --- build.properties.default | 2 +- res/maven/mvn.properties.default | 2 +- webapps/docs/changelog.xml | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.properties.default b/build.properties.default index 45e2f1d..70c235c 100644 --- a/build.properties.default +++ b/build.properties.default @@ -31,7 +31,7 @@ # - Version Control Flags - version.major=9 version.minor=0 -version.build=55 +version.build=56 version.patch=0 version.suffix=-dev diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default index bbf8ce0..a657436 100644 --- a/res/maven/mvn.properties.default +++ b/res/maven/mvn.properties.default @@ -39,7 +39,7 @@ maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d maven.asf.release.repo.repositoryId=apache.releases.https # Release version info -maven.asf.release.deploy.version=9.0.55 +maven.asf.release.deploy.version=9.0.56 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index b363352..a404289 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -104,7 +104,9 @@ They eventually become mixed with the numbered issues (i.e., numbered issues do not "pop up" wrt. others). --> - + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/01: Tag 9.0.55
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to tag 9.0.55 in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 662cc9171c22ac790532d38a2b59990faaa7b971 Author: remm AuthorDate: Wed Nov 10 09:15:16 2021 +0100 Tag 9.0.55 --- build.properties.default | 6 +++--- webapps/docs/changelog.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.properties.default b/build.properties.default index 45e2f1d..0a77a11 100644 --- a/build.properties.default +++ b/build.properties.default @@ -33,13 +33,13 @@ version.major=9 version.minor=0 version.build=55 version.patch=0 -version.suffix=-dev +version.suffix= # - Reproducible builds - # Uncomment and set to current time for reproducible builds # Note: The value is in seconds (unlike milliseconds used by System.currentTimeMillis()). -#2021-09-28T12:09:00Z -#ant.tstamp.now=1632819600 +#2021-11-10T08:13:36Z +#ant.tstamp.now=1636532016 # - Source control flags - git.branch=9.0.x diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index b363352..e95c826 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -104,7 +104,7 @@ They eventually become mixed with the numbered issues (i.e., numbered issues do not "pop up" wrt. others). --> - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] tag 9.0.55 created (now 662cc91)
This is an automated email from the ASF dual-hosted git repository. remm pushed a change to tag 9.0.55 in repository https://gitbox.apache.org/repos/asf/tomcat.git. at 662cc91 (commit) This tag includes the following new commits: new 662cc91 Tag 9.0.55 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
