[tomcat] branch 8.5.x updated: Prompted by CI failures, run unit tests with TLSv1.2 as a minimum

[markt]

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 5b9729b  Prompted by CI failures, run unit tests with TLSv1.2 as a 
minimum
5b9729b is described below

commit 5b9729beefdba83f6ca62a8a21cc010f58a33c4f
Author: Mark Thomas 
AuthorDate: Thu Nov 11 20:45:49 2021 +

Prompted by CI failures, run unit tests with TLSv1.2 as a minimum
---
 test/org/apache/tomcat/util/net/TesterSupport.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/tomcat/util/net/TesterSupport.java 
b/test/org/apache/tomcat/util/net/TesterSupport.java
index ae5a7d2..2f13295 100644
--- a/test/org/apache/tomcat/util/net/TesterSupport.java
+++ b/test/org/apache/tomcat/util/net/TesterSupport.java
@@ -199,9 +199,9 @@ public final class TesterSupport {
 try {
 SSLContext sc;
 if (TesterSupport.TLSV13_AVAILABLE) {
- sc = SSLContext.getInstance("TLSv1.3");
+ sc = SSLContext.getInstance(Constants.SSL_PROTO_TLSv1_3);
 } else {
-sc = SSLContext.getInstance(Constants.SSL_PROTO_TLS);
+sc = SSLContext.getInstance(Constants.SSL_PROTO_TLSv1_2);
 }
 sc.init(TesterSupport.getUser1KeyManagers(),
 TesterSupport.getTrustManagers(),

-
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: Prompted by CI failures, run unit tests with TLSv1.2 as a minimum

[markt]

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 49c6af0  Prompted by CI failures, run unit tests with TLSv1.2 as a 
minimum
49c6af0 is described below

commit 49c6af06457aa3eea2e8677acfa0a9d3686adc7a
Author: Mark Thomas 
AuthorDate: Thu Nov 11 20:45:49 2021 +

Prompted by CI failures, run unit tests with TLSv1.2 as a minimum
---
 test/org/apache/tomcat/util/net/TesterSupport.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/tomcat/util/net/TesterSupport.java 
b/test/org/apache/tomcat/util/net/TesterSupport.java
index a259f86..b4f7cc3 100644
--- a/test/org/apache/tomcat/util/net/TesterSupport.java
+++ b/test/org/apache/tomcat/util/net/TesterSupport.java
@@ -201,9 +201,9 @@ public final class TesterSupport {
 try {
 SSLContext sc;
 if (TesterSupport.TLSV13_AVAILABLE) {
- sc = SSLContext.getInstance("TLSv1.3");
+ sc = SSLContext.getInstance(Constants.SSL_PROTO_TLSv1_3);
 } else {
-sc = SSLContext.getInstance(Constants.SSL_PROTO_TLS);
+sc = SSLContext.getInstance(Constants.SSL_PROTO_TLSv1_2);
 }
 sc.init(TesterSupport.getUser1KeyManagers(),
 TesterSupport.getTrustManagers(),

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch main updated: Prompted by CI failures, run unit tests with TLSv1.2 as a minimum

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt 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 19dbd09  Prompted by CI failures, run unit tests with TLSv1.2 as a 
minimum
19dbd09 is described below

commit 19dbd09652ee8b380cdbe02a6be25f0a062f61c2
Author: Mark Thomas 
AuthorDate: Thu Nov 11 20:45:49 2021 +

Prompted by CI failures, run unit tests with TLSv1.2 as a minimum
---
 test/org/apache/tomcat/util/net/TesterSupport.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/tomcat/util/net/TesterSupport.java 
b/test/org/apache/tomcat/util/net/TesterSupport.java
index c797ea2..707ead9 100644
--- a/test/org/apache/tomcat/util/net/TesterSupport.java
+++ b/test/org/apache/tomcat/util/net/TesterSupport.java
@@ -195,9 +195,9 @@ public final class TesterSupport {
 try {
 SSLContext sc;
 if (TesterSupport.TLSV13_AVAILABLE) {
- sc = SSLContext.getInstance("TLSv1.3");
+ sc = SSLContext.getInstance(Constants.SSL_PROTO_TLSv1_3);
 } else {
-sc = SSLContext.getInstance(Constants.SSL_PROTO_TLS);
+sc = SSLContext.getInstance(Constants.SSL_PROTO_TLSv1_2);
 }
 sc.init(TesterSupport.getUser1KeyManagers(),
 TesterSupport.getTrustManagers(),

-
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: Prompted by CI failures, run unit tests with TLSv1.2 as a minimum

[markt]

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 ccfc05c  Prompted by CI failures, run unit tests with TLSv1.2 as a 
minimum
ccfc05c is described below

commit ccfc05c95cfa25bcc907ff9bfd8c6055be97f42d
Author: Mark Thomas 
AuthorDate: Thu Nov 11 20:45:49 2021 +

Prompted by CI failures, run unit tests with TLSv1.2 as a minimum
---
 test/org/apache/tomcat/util/net/TesterSupport.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/tomcat/util/net/TesterSupport.java 
b/test/org/apache/tomcat/util/net/TesterSupport.java
index b1fca54..093c430 100644
--- a/test/org/apache/tomcat/util/net/TesterSupport.java
+++ b/test/org/apache/tomcat/util/net/TesterSupport.java
@@ -202,9 +202,9 @@ public final class TesterSupport {
 try {
 SSLContext sc;
 if (TesterSupport.TLSV13_AVAILABLE) {
- sc = SSLContext.getInstance("TLSv1.3");
+ sc = SSLContext.getInstance(Constants.SSL_PROTO_TLSv1_3);
 } else {
-sc = SSLContext.getInstance(Constants.SSL_PROTO_TLS);
+sc = SSLContext.getInstance(Constants.SSL_PROTO_TLSv1_2);
 }
 sc.init(TesterSupport.getUser1KeyManagers(),
 TesterSupport.getTrustManagers(),

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat 8.5.73

[Igal Sapir]

On Thu, Nov 11, 2021 at 7:35 AM Christopher Schultz <
ch...@christopherschultz.net> wrote:

> 
>
> The proposed 8.5.73 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 8.5.73 (stable)
>

Unit tests passed on Ubuntu 20.04 with Java 17

Igal



>
> -chris
>
> -
> 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: Move GPG check to deploy-release target

[markt]

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 896cba0  Move GPG check to deploy-release target
896cba0 is described below

commit 896cba06bc10ca77a18542d5dfae27c398adce41
Author: Mark Thomas 
AuthorDate: Thu Nov 11 16:47:24 2021 +

Move GPG check to deploy-release target

This allows snapshots to continue without GPG
---
 res/maven/mvn-pub.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml
index cbc39f6..ea67316 100644
--- a/res/maven/mvn-pub.xml
+++ b/res/maven/mvn-pub.xml
@@ -396,6 +396,7 @@
   
 
   
+GPG is required, but was not found at 
${gpg.exec}
 
   
@@ -409,7 +410,6 @@
 
   
 
-GPG is required, but was not found at 
${gpg.exec}
   
 
   

-
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: Move GPG check to deploy-release target

[markt]

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 b9ecfd3  Move GPG check to deploy-release target
b9ecfd3 is described below

commit b9ecfd3bd37f4d2f4662b14513a0b2fef2c8035c
Author: Mark Thomas 
AuthorDate: Thu Nov 11 16:47:24 2021 +

Move GPG check to deploy-release target

This allows snapshots to continue without GPG
---
 res/maven/mvn-pub.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml
index 7a40756..304141e 100644
--- a/res/maven/mvn-pub.xml
+++ b/res/maven/mvn-pub.xml
@@ -502,6 +502,7 @@
   
 
   
+GPG is required, but was not found at 
${gpg.exec}
 
   
@@ -515,7 +516,6 @@
 
   
 
-GPG is required, but was not found at 
${gpg.exec}
   
 
   

-
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: Move GPG check to deploy-release target

[markt]

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 ad33907  Move GPG check to deploy-release target
ad33907 is described below

commit ad339075caa81b43f101d6e3c032774589792821
Author: Mark Thomas 
AuthorDate: Thu Nov 11 16:47:24 2021 +

Move GPG check to deploy-release target

This allows snapshots to continue without GPG
---
 res/maven/mvn-pub.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml
index da08855..0c4cf5f 100644
--- a/res/maven/mvn-pub.xml
+++ b/res/maven/mvn-pub.xml
@@ -502,6 +502,7 @@
   
 
   
+GPG is required, but was not found at 
${gpg.exec}
 
   
@@ -515,7 +516,6 @@
 
   
 
-GPG is required, but was not found at 
${gpg.exec}
   
 
   

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch main updated: Move GPG check to deploy-release target

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt 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 b59e88c  Move GPG check to deploy-release target
b59e88c is described below

commit b59e88c985c008530705a70d950cc9ef1033c495
Author: Mark Thomas 
AuthorDate: Thu Nov 11 16:47:24 2021 +

Move GPG check to deploy-release target

This allows snapshots to continue without GPG
---
 res/maven/mvn-pub.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml
index 6671de1..f74a40e 100644
--- a/res/maven/mvn-pub.xml
+++ b/res/maven/mvn-pub.xml
@@ -502,6 +502,7 @@
   
 
   
+GPG is required, but was not found at 
${gpg.exec}
 
   
@@ -515,7 +516,6 @@
 
   
 
-GPG is required, but was not found at 
${gpg.exec}
   
 
   

-
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 APR crash on shutdown.

[markt]

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 4a332ab  Fix APR crash on shutdown.
4a332ab is described below

commit 4a332ab493a18c62e5932860eef09e9cda61ccd4
Author: Mark Thomas 
AuthorDate: Thu Nov 11 12:58:52 2021 +

Fix APR crash on shutdown.

These crashes have been observed with the new BuildBot CI system. Local
testing and a 10.0.x CI run indicate this fix addresses the issue
---
 java/org/apache/tomcat/util/net/AprEndpoint.java | 19 +++
 webapps/docs/changelog.xml   | 11 +++
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java 
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index f369000..96542db 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -672,11 +672,22 @@ public class AprEndpoint extends AbstractEndpoint 
implements SNICallBack {
 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());
+
+// Need to make sure the socket doesn't get closed while the
+// handshake is in progress as that could trigger a JVM crash.
+// Like stopInternal(), use the blocking status write lock as a
+// proxy for a lock on writing to the socket.
+WriteLock wl = ((AprSocketWrapper) 
socketWrapper).getBlockingStatusWriteLock();
+wl.lock();
+try {
+if (SSLSocket.handshake(socket) != 0) {
+if (log.isDebugEnabled()) {
+log.debug(sm.getString("endpoint.err.handshake") + 
": " + SSL.getLastError());
+}
+return false;
 }
-return false;
+} finally {
+wl.unlock();
 }
 
 if (negotiableProtocols.size() > 0) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d3c11e5..b873535 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,17 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Fix a potential JVM crash when using the APR/Native connector with TLS.
+A crash could occur if the connector was stopped whilst a connection 
was
+performing a TLS handshake. (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: Align with 10.0.x/9.0.x

[markt]

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 081049d  Align with 10.0.x/9.0.x
081049d is described below

commit 081049de42cbbf7b452089ae3fedcd72852696fa
Author: Mark Thomas 
AuthorDate: Thu Nov 11 16:42:07 2021 +

Align with 10.0.x/9.0.x
---
 java/org/apache/tomcat/util/net/AprEndpoint.java   | 212 +++--
 .../apache/tomcat/util/net/LocalStrings.properties |   2 +
 2 files changed, 158 insertions(+), 56 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java 
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 3583a2d..f369000 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -72,8 +72,6 @@ import org.apache.tomcat.util.net.openssl.OpenSSLUtil;
  * Worker threads pool
  * 
  *
- * TODO: Consider using the virtual machine's thread pool.
- *
  * @author Mladen Turk
  * @author Remy Maucherat
  */
@@ -298,6 +296,7 @@ public class AprEndpoint extends AbstractEndpoint 
implements SNICallBack {
 
 // Create the pool for the server socket
 serverSockPool = Pool.create(rootPool);
+
 // Create the APR address that will be bound
 String addressStr = null;
 if (getAddress() != null) {
@@ -322,6 +321,7 @@ public class AprEndpoint extends AbstractEndpoint 
implements SNICallBack {
 Socket.optSet(serverSock, Socket.APR_IPV6_V6ONLY, 0);
 }
 }
+
 // Deal with the firewalls that tend to drop the inactive sockets
 Socket.optSet(serverSock, Socket.APR_SO_KEEPALIVE, 1);
 // Bind the server socket
@@ -329,11 +329,13 @@ public class AprEndpoint extends AbstractEndpoint 
implements SNICallBack {
 if (ret != 0) {
 throw new Exception(sm.getString("endpoint.init.bind", "" + ret, 
Error.strerror(ret)));
 }
+
 // Start listening on the server socket
 ret = Socket.listen(serverSock, getAcceptCount());
 if (ret != 0) {
 throw new Exception(sm.getString("endpoint.init.listen", "" + ret, 
Error.strerror(ret)));
 }
+
 if (OS.IS_WIN32 || OS.IS_WIN64) {
 // On Windows set the reuseaddr flag after the bind/listen
 Socket.optSet(serverSock, Socket.APR_SO_REUSEADDR, 1);
@@ -465,20 +467,13 @@ public class AprEndpoint extends AbstractEndpoint 
implements SNICallBack {
 // Start poller thread
 poller = new Poller();
 poller.init();
-Thread pollerThread = new Thread(poller, getName() + "-Poller");
-pollerThread.setPriority(threadPriority);
-pollerThread.setDaemon(true);
-pollerThread.start();
+poller.start();
 
 // Start sendfile thread
 if (getUseSendfile()) {
 sendfile = new Sendfile();
 sendfile.init();
-Thread sendfileThread =
-new Thread(sendfile, getName() + "-Sendfile");
-sendfileThread.setPriority(threadPriority);
-sendfileThread.setDaemon(true);
-sendfileThread.start();
+sendfile.start();
 }
 
 startAcceptorThreads();
@@ -497,14 +492,11 @@ public class AprEndpoint extends AbstractEndpoint 
implements SNICallBack {
 }
 if (running) {
 running = false;
+
+// Stop the Poller calling select
 poller.stop();
-for (SocketWrapperBase socketWrapper : connections.values()) 
{
-try {
-socketWrapper.close();
-} catch (IOException e) {
-// Ignore
-}
-}
+
+// Wait for the acceptor(s) to shutdown
 for (AbstractEndpoint.Acceptor acceptor : acceptors) {
 long waitLeft = 1;
 while (waitLeft > 0 &&
@@ -528,12 +520,42 @@ public class AprEndpoint extends AbstractEndpoint 
implements SNICallBack {
}
 }
 }
-// Close any sockets not in the poller performing blocking
-// read/writes. Need to do this before destroying the poller since
-// that will also destroy the root pool for these sockets.
-for (Long s : connections.keySet()) {
-Socket.shutdown(s.longValue(), Socket.APR_SHUTDOWN_READWRITE);
+
+// Wait for Poller to stop
+int waitMillis = 0;
+try {
+while (poller.pollerThread.isAlive() && waitMillis < 1) {
+waitMillis++;
+Thread.sleep(1);
+}
+} catch (InterruptedException e) {
+// Ignore
 }

[tomcat] branch 9.0.x updated: Align with 10.0.x

[markt]

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 ef9b47b  Align with 10.0.x
ef9b47b is described below

commit ef9b47bf3c7872c02f66b0f4eab9a7b467d81d6f
Author: Mark Thomas 
AuthorDate: Thu Nov 11 16:17:25 2021 +

Align with 10.0.x
---
 java/org/apache/tomcat/util/net/AprEndpoint.java | 6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java 
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 5a8442d..48c6716 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -77,8 +77,6 @@ import org.apache.tomcat.util.net.openssl.OpenSSLUtil;
  * Worker threads pool
  * 
  *
- * TODO: Consider using the virtual machine's thread pool.
- *
  * @author Mladen Turk
  * @author Remy Maucherat
  */
@@ -1534,7 +1532,7 @@ public class AprEndpoint extends 
AbstractEndpoint implements SNICallB
 // codes plus the flags it was waiting for or 
it may just
 // return an error code. We could handle the 
error here but
 // if we do, there will be no exception 
associated with the
-// error in application code. By signaling 
read/write is
+// error in application code. By signalling 
read/write is
 // possible, a read/write will be attempted, 
fail and that
 // will trigger an exception the application 
will see.
 // Check the return flags first, followed by 
what the socket
@@ -2080,7 +2078,6 @@ public class AprEndpoint extends 
AbstractEndpoint implements SNICallB
 }
 }
 }
-
 }
 
 
@@ -2840,7 +2837,6 @@ public class AprEndpoint extends 
AbstractEndpoint implements SNICallB
 }
 }
 }
-
 }
 
 }

-
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: Align with 9.0.x

[markt]

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 12f5e71  Align with 9.0.x
12f5e71 is described below

commit 12f5e710640ee4604cb9a16d286f8f9a05e3d453
Author: Mark Thomas 
AuthorDate: Thu Nov 11 16:16:26 2021 +

Align with 9.0.x
---
 java/org/apache/tomcat/util/net/AprEndpoint.java | 6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java 
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 4445a97..7b93b3d 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -77,8 +77,6 @@ import org.apache.tomcat.util.net.openssl.OpenSSLUtil;
  * Worker threads pool
  * 
  *
- * TODO: Consider using the virtual machine's thread pool.
- *
  * @author Mladen Turk
  * @author Remy Maucherat
  *
@@ -1538,7 +1536,7 @@ public class AprEndpoint extends 
AbstractEndpoint implements SNICallB
 // codes plus the flags it was waiting for or 
it may just
 // return an error code. We could handle the 
error here but
 // if we do, there will be no exception 
associated with the
-// error in application code. By signaling 
read/write is
+// error in application code. By signalling 
read/write is
 // possible, a read/write will be attempted, 
fail and that
 // will trigger an exception the application 
will see.
 // Check the return flags first, followed by 
what the socket
@@ -2084,7 +2082,6 @@ public class AprEndpoint extends 
AbstractEndpoint implements SNICallB
 }
 }
 }
-
 }
 
 
@@ -2844,7 +2841,6 @@ public class AprEndpoint extends 
AbstractEndpoint implements SNICallB
 }
 }
 }
-
 }
 
 }

-
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: Fail the build if GPG is not found in the expected location.

[schultz]

This is an automated email from the ASF dual-hosted git repository.

schultz 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 ba2fcbb  Fail the build if GPG is not found in the expected location.
ba2fcbb is described below

commit ba2fcbbb3a1f8a8e569b572eb4b0b65a438841a4
Author: Christopher Schultz 
AuthorDate: Thu Nov 11 10:40:29 2021 -0500

Fail the build if GPG is not found in the expected location.
---
 res/maven/mvn-pub.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml
index 13903e7..cbc39f6 100644
--- a/res/maven/mvn-pub.xml
+++ b/res/maven/mvn-pub.xml
@@ -409,6 +409,7 @@
 
   
 
+GPG is required, but was not found at 
${gpg.exec}
   
 
   

-
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: Fail the build if GPG is not found in the expected location.

[schultz]

This is an automated email from the ASF dual-hosted git repository.

schultz 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 bd93b02  Fail the build if GPG is not found in the expected location.
bd93b02 is described below

commit bd93b022e363f568c640848d9739bb87d8982b10
Author: Christopher Schultz 
AuthorDate: Thu Nov 11 10:40:29 2021 -0500

Fail the build if GPG is not found in the expected location.
---
 res/maven/mvn-pub.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml
index 4e02893..7a40756 100644
--- a/res/maven/mvn-pub.xml
+++ b/res/maven/mvn-pub.xml
@@ -515,6 +515,7 @@
 
   
 
+GPG is required, but was not found at 
${gpg.exec}
   
 
   

-
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: Fail the build if GPG is not found in the expected location.

[schultz]

This is an automated email from the ASF dual-hosted git repository.

schultz 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 ffc39d9  Fail the build if GPG is not found in the expected location.
ffc39d9 is described below

commit ffc39d91392e51b41e00bfc4c8fae4954ac107f7
Author: Christopher Schultz 
AuthorDate: Thu Nov 11 10:40:29 2021 -0500

Fail the build if GPG is not found in the expected location.
---
 res/maven/mvn-pub.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml
index 10b3978..da08855 100644
--- a/res/maven/mvn-pub.xml
+++ b/res/maven/mvn-pub.xml
@@ -515,6 +515,7 @@
 
   
 
+GPG is required, but was not found at 
${gpg.exec}
   
 
   

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch main updated: Fail the build if GPG is not found in the expected location.

[schultz]

This is an automated email from the ASF dual-hosted git repository.

schultz 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 aac8218  Fail the build if GPG is not found in the expected location.
aac8218 is described below

commit aac82181b5ca57bd7cb33a86f8b6c22725912a3a
Author: Christopher Schultz 
AuthorDate: Thu Nov 11 10:40:29 2021 -0500

Fail the build if GPG is not found in the expected location.
---
 res/maven/mvn-pub.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml
index 22c8ddf..6671de1 100644
--- a/res/maven/mvn-pub.xml
+++ b/res/maven/mvn-pub.xml
@@ -515,6 +515,7 @@
 
   
 
+GPG is required, but was not found at 
${gpg.exec}
   
 
   

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[VOTE] Release Apache Tomcat 8.5.73

[Christopher Schultz]

The proposed Apache Tomcat 8.5.73 release is now available for voting.

The notable changes compared to 8.5.72 are:

- Improvements to native/APR including avoiding a JVM crash if APR fails
   to properly initialize and improving error handling.

- 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-8.5.x/docs/changelog.html

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.73/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1342
The tag is:
https://github.com/apache/tomcat/tree/8.5.73/
Commit e8de8521b0f88b452ac6bd79abad3aad3bcc18b6

The proposed 8.5.73 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 8.5.73 (stable)

-chris

-
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

[Igal Sapir]

On Wed, Nov 10, 2021 at 12:55 AM Rémy Maucherat  wrote:

> 
>
> The proposed 9.0.55 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 9.0.55 (stable)
>

Unit tests passed on Ubuntu with Java 17

Igal



>
> 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

[Igal Sapir]

On Tue, Nov 9, 2021 at 2:51 PM Mark Thomas  wrote:

> 
>
> The proposed 10.0.13 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 10.0.13 (stable)
>

Unit tests passed on Ubuntu with Java 17

Igal



>
> -
> 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

[Igal Sapir]

On Mon, Nov 8, 2021 at 1:59 PM Mark Thomas  wrote:

> 
>
> The proposed 10.1.0-M7 release is:
> [ ] Broken - do not release
> [X] Alpha - go ahead and release as 10.1.0-M7 (alpha)
>

Unit tests passed on Ubuntu with Java 17

Igal



>
> -
> 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 APR crash on shutdown.

[markt]

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 07f6c6a  Fix APR crash on shutdown.
07f6c6a is described below

commit 07f6c6a85fbd5254d5df5a504081ee198445d4d7
Author: Mark Thomas 
AuthorDate: Thu Nov 11 12:58:52 2021 +

Fix APR crash on shutdown.

These crashes have been observed with the new BuildBot CI system. Local
testing and a 10.0.x CI run indicate this fix addresses the issue
---
 java/org/apache/tomcat/util/net/AprEndpoint.java | 19 +++
 webapps/docs/changelog.xml   |  5 +
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java 
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 7599670..5a8442d 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -710,11 +710,22 @@ public class AprEndpoint extends 
AbstractEndpoint implements SNICallB
 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());
+
+// Need to make sure the socket doesn't get closed while the
+// handshake is in progress as that could trigger a JVM crash.
+// Like stopInternal(), use the blocking status write lock as a
+// proxy for a lock on writing to the socket.
+WriteLock wl = ((AprSocketWrapper) 
socketWrapper).getBlockingStatusWriteLock();
+wl.lock();
+try {
+if (SSLSocket.handshake(socket) != 0) {
+if (log.isDebugEnabled()) {
+log.debug(sm.getString("endpoint.err.handshake") + 
": " + SSL.getLastError());
+}
+return false;
 }
-return false;
+} finally {
+wl.unlock();
 }
 
 if (negotiableProtocols.size() > 0) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ddee7bb..460e413 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -170,6 +170,11 @@
 open a server socket as continuing in this case will trigger a JVM 
crash.
 (markt)
   
+  
+Fix a potential JVM crash when using the APR/Native connector with TLS.
+A crash could occur if the connector was stopped whilst a connection 
was
+performing a TLS handshake. (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: Add a changelog entry for the APR crash fix

[markt]

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 7109709  Add a changelog entry for the APR crash fix
7109709 is described below

commit 710970980b85acaba5460ecc426b67f7ea02ea8f
Author: Mark Thomas 
AuthorDate: Thu Nov 11 14:44:18 2021 +

Add a changelog entry for the APR crash fix

The fix appears to have stopped the crashes during the BuildBot test
runs so add it to the change log
---
 webapps/docs/changelog.xml | 5 +
 1 file changed, 5 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a6663f5..4c29077 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -170,6 +170,11 @@
 open a server socket as continuing in this case will trigger a JVM 
crash.
 (markt)
   
+  
+Fix a potential JVM crash when using the APR/Native connector with TLS.
+A crash could occur if the connector was stopped whilst a connection 
was
+performing a TLS handshake. (markt)
+  
 
   
   

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Building Tomcat 8.5.x with Java 7

[Konstantin Kolinko]

чт, 11 нояб. 2021 г. в 16:53, Christopher Schultz
:
>
> All,
>
> It looks like fetching the NSIS installer from downloads.sourceforge.net
> is a problem with Java 7.
>
> I should be able to download the dependencies with Java 8, then switch
> to Java 7 for the actual build.
>
> Is there a way to specify a JAVA_HOME for the compilation and testing,
> but to use a different JAVA_HOME to invoke ant itself?

The following works for me with Java 7u80 and Ant 1.9.16:

1) First, Ant options
Note: the "set" command is on one line (may be wrapped by mail client)

rem For Tomcat 8.5 / Java 7, see BUILDING.txt
rem 
https://docs.oracle.com/javase/7/docs/technotes/guides/security/SunProviders.html#SunJSSEProvider
set "ANT_OPTS=-Dhttps.protocols=TLSv1,TLSv1.1,TLSv1.2
-Dhttps.cipherSuites=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384"

2) Second, Unlimited Strength Cryptography has to be enabled.

3) Third, CA certificate that signs https://sourceforge.net/ has to be
known to Java.

The file to be updated in my case was
"C:\Program Files (x86)\Java\jdk1.7.0_80\jre\lib\security\cacerts"

The command to update that file was
"C:\Program Files (x86)\Java\jdk1.7.0_80\jre\bin\keytool.exe"
-importcert -keystore cacerts -file sourceforge-net.pem

Password: changeit

where I used Firefox to download a certificate for the CA that signed
the certificate for https://sourceforge.net/
-> certificate for "US/Let's Encrypt/R3"

I am attaching it, if it helps.

Best regards,
Konstantin Kolinko


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r50879 [1/2] - in /dev/tomcat/tomcat-8/v8.5.73: ./ bin/ bin/embed/ bin/extras/ src/

[schultz]

Author: schultz
Date: Thu Nov 11 14:47:35 2021
New Revision: 50879

Log:
Upload 8.5.73 for voting

Added:
dev/tomcat/tomcat-8/v8.5.73/
dev/tomcat/tomcat-8/v8.5.73/KEYS
dev/tomcat/tomcat-8/v8.5.73/README.html
dev/tomcat/tomcat-8/v8.5.73/RELEASE-NOTES
dev/tomcat/tomcat-8/v8.5.73/bin/
dev/tomcat/tomcat-8/v8.5.73/bin/README.html
dev/tomcat/tomcat-8/v8.5.73/bin/apache-tomcat-8.5.73-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.73/bin/apache-tomcat-8.5.73-deployer.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.73/bin/apache-tomcat-8.5.73-deployer.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.73/bin/apache-tomcat-8.5.73-deployer.zip   (with 
props)
dev/tomcat/tomcat-8/v8.5.73/bin/apache-tomcat-8.5.73-deployer.zip.asc
dev/tomcat/tomcat-8/v8.5.73/bin/apache-tomcat-8.5.73-deployer.zip.sha512
dev/tomcat/tomcat-8/v8.5.73/bin/apache-tomcat-8.5.73-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.73/bin/apache-tomcat-8.5.73-fulldocs.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.73/bin/apache-tomcat-8.5.73-fulldocs.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.73/bin/apache-tomcat-8.5.73-windows-x64.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.73/bin/apache-tomcat-8.5.73-windows-x64.zip.asc
dev/tomcat/tomcat-8/v8.5.73/bin/apache-tomcat-8.5.73-windows-x64.zip.sha512
dev/tomcat/tomcat-8/v8.5.73/bin/apache-tomcat-8.5.73-windows-x86.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.73/bin/apache-tomcat-8.5.73-windows-x86.zip.asc
dev/tomcat/tomcat-8/v8.5.73/bin/apache-tomcat-8.5.73-windows-x86.zip.sha512
dev/tomcat/tomcat-8/v8.5.73/bin/apache-tomcat-8.5.73.exe   (with props)
dev/tomcat/tomcat-8/v8.5.73/bin/apache-tomcat-8.5.73.exe.asc
dev/tomcat/tomcat-8/v8.5.73/bin/apache-tomcat-8.5.73.exe.sha512
dev/tomcat/tomcat-8/v8.5.73/bin/apache-tomcat-8.5.73.tar.gz   (with props)
dev/tomcat/tomcat-8/v8.5.73/bin/apache-tomcat-8.5.73.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.73/bin/apache-tomcat-8.5.73.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.73/bin/apache-tomcat-8.5.73.zip   (with props)
dev/tomcat/tomcat-8/v8.5.73/bin/apache-tomcat-8.5.73.zip.asc
dev/tomcat/tomcat-8/v8.5.73/bin/apache-tomcat-8.5.73.zip.sha512
dev/tomcat/tomcat-8/v8.5.73/bin/embed/
dev/tomcat/tomcat-8/v8.5.73/bin/embed/apache-tomcat-8.5.73-embed.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.73/bin/embed/apache-tomcat-8.5.73-embed.tar.gz.asc

dev/tomcat/tomcat-8/v8.5.73/bin/embed/apache-tomcat-8.5.73-embed.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.73/bin/embed/apache-tomcat-8.5.73-embed.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.73/bin/embed/apache-tomcat-8.5.73-embed.zip.asc
dev/tomcat/tomcat-8/v8.5.73/bin/embed/apache-tomcat-8.5.73-embed.zip.sha512
dev/tomcat/tomcat-8/v8.5.73/bin/extras/
dev/tomcat/tomcat-8/v8.5.73/bin/extras/catalina-jmx-remote.jar   (with 
props)
dev/tomcat/tomcat-8/v8.5.73/bin/extras/catalina-jmx-remote.jar.asc
dev/tomcat/tomcat-8/v8.5.73/bin/extras/catalina-jmx-remote.jar.sha512
dev/tomcat/tomcat-8/v8.5.73/bin/extras/catalina-ws.jar   (with props)
dev/tomcat/tomcat-8/v8.5.73/bin/extras/catalina-ws.jar.asc
dev/tomcat/tomcat-8/v8.5.73/bin/extras/catalina-ws.jar.sha512
dev/tomcat/tomcat-8/v8.5.73/src/
dev/tomcat/tomcat-8/v8.5.73/src/apache-tomcat-8.5.73-src.tar.gz   (with 
props)
dev/tomcat/tomcat-8/v8.5.73/src/apache-tomcat-8.5.73-src.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.73/src/apache-tomcat-8.5.73-src.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.73/src/apache-tomcat-8.5.73-src.zip   (with props)
dev/tomcat/tomcat-8/v8.5.73/src/apache-tomcat-8.5.73-src.zip.asc
dev/tomcat/tomcat-8/v8.5.73/src/apache-tomcat-8.5.73-src.zip.sha512

Added: dev/tomcat/tomcat-8/v8.5.73/KEYS
==
--- dev/tomcat/tomcat-8/v8.5.73/KEYS (added)
+++ dev/tomcat/tomcat-8/v8.5.73/KEYS Thu Nov 11 14:47:35 2021
@@ -0,0 +1,785 @@
+This file contains the PGP&GPG 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).
+
+
+Type Bits/KeyIDDate   User ID
+pub  2048/F22C4FED 2001/07/02 Andy Armstrong 
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: PGPfreeware 7.0.3 for non-commercial use 
+
+mQGiBDtAWuURBADZ0KUEyUkSUiTA09e7tvEbX25STsjxrR+DNTainCls+XlkVOij
+gBv216lqge9tIsS0L6hCP4OQbFf/64qVtJssX4QXdyiZGb5wpmcj0Mz602Ew8r+N
+I0S5NvmogoYWW7BlP4r61jNxO5zrr03KaijM5r4ipJdLUxyOmM6P2jRPUwCg/5gm
+bpqiYl7pXX5FgDeB36tmD+UD/06iLqOnoiKO0vMbOk7URclhCObMNrHqxTxozMTS
+B9soYURbIeArei+plYo2n+1qB12ayybjhVu3uksXRdT9bEkyxMfslvLbIpDAG8Cz
+gNftTbKx/MVS7cQU0II8BKo2A

svn commit: r50879 [2/2] - in /dev/tomcat/tomcat-8/v8.5.73: ./ bin/ bin/embed/ bin/extras/ src/

[schultz]

Added: dev/tomcat/tomcat-8/v8.5.73/bin/extras/catalina-jmx-remote.jar.asc
==
--- dev/tomcat/tomcat-8/v8.5.73/bin/extras/catalina-jmx-remote.jar.asc (added)
+++ dev/tomcat/tomcat-8/v8.5.73/bin/extras/catalina-jmx-remote.jar.asc Thu Nov 
11 14:47:35 2021
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAmGNKtgACgkQHPApP6U8
+pFj/cg/+I5XthujhZiQbwfvhPguLPlz8bp99QOsRGSv7rfIwpae3yGXEMpJImx+U
+kpRDSrhRf1mkWzMoVtZIbKJ3OqoyXTLzjCAz9Yt/BS6Wk/4e/Vf37FxL94SqpC+/
+wHnWlP21mJcsR6+8CthSu8EYOFQety457AYVCN0t7I6GsxrgJdEU7nhFjLHLgcS1
+rIbvzKHUCX++N+KzNHLA1y+yXh5U/4WGuqZAgcVqTO0jpeM/QPwQW3zZq4pV1SKt
+CglQNur+gnmbHxpE8fuh5nFT1CzXxXi3wHhz9XpzJIz4AvCGCFY6bmrdC8cSnCSY
+MdP/ZlMJYrQl+/C6W+CcPBcgSxWHL7WKBbu0yLZ69M8RagcPkCLTmpr3JRQ1fHa5
++2A3esXSTRHrEDEGo8GgeDdJYl6ymSWUJQ4Ikn3x7k+OXi2RSvj5zPHeD0EpLpo4
+KyGfUsidIMVWpofqP6DHVI+teK5TjAuYxRJjJWfISj4dzueP6L24BjCaqLtHMAZT
+Bo3nl8hrM/jeF8QCAr1LBK5RD2XgfC8zxrcMX6MjGSXDgIwk+qnQHjV1mA+Oc6AA
+r/FxrYLwVBmaXoGC/nVF2IkfVtAzgBJyNo9W/gu+OgKbMszm/Xnaz5XsA8rHLSyg
+LwwuX3HXZtb6DrSi/z+kCPGFKnIYzG2+U5bClHLfzWqaC6WywY0=
+=CUJQ
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-8/v8.5.73/bin/extras/catalina-jmx-remote.jar.sha512
==
--- dev/tomcat/tomcat-8/v8.5.73/bin/extras/catalina-jmx-remote.jar.sha512 
(added)
+++ dev/tomcat/tomcat-8/v8.5.73/bin/extras/catalina-jmx-remote.jar.sha512 Thu 
Nov 11 14:47:35 2021
@@ -0,0 +1 @@
+ddcb61f3688578b0d23152c60788a4122c9ea3ef9cd8694fb60bfeeaaca8862298292bf1e222accb80fe9a6f32af21b90961c770eae242fa0a06e2770e0ae8d2
 *catalina-jmx-remote.jar
\ No newline at end of file

Added: dev/tomcat/tomcat-8/v8.5.73/bin/extras/catalina-ws.jar
==
Binary file - no diff available.

Propchange: dev/tomcat/tomcat-8/v8.5.73/bin/extras/catalina-ws.jar
--
svn:mime-type = application/octet-stream

Added: dev/tomcat/tomcat-8/v8.5.73/bin/extras/catalina-ws.jar.asc
==
--- dev/tomcat/tomcat-8/v8.5.73/bin/extras/catalina-ws.jar.asc (added)
+++ dev/tomcat/tomcat-8/v8.5.73/bin/extras/catalina-ws.jar.asc Thu Nov 11 
14:47:35 2021
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAmGNKtcACgkQHPApP6U8
+pFgPfhAAqKpaHiLPene+6AHRz832ZujCbKKBbkTU6nQmaDjmhAEkPWDx2PB+4AVe
+bmu292A9W2VGemkyBL2kJYsQVpQF0N4ciNFdBxcSN2eqvVuI1eiR3lAR0oXx6leh
+GZWvyR1tRcaULcjJxNznkEYPFhKRl8wAYhFOIsJY7qmeT6u6bbp1Z4nV8Lu4hSWn
+VobYT2tEUHSl755Hbfxqx9CWgiRQW/cCtxnjyeC6R4X2ZDawdyiLJxxs7bhh88AI
+ZTgocTzb2DDfvLGIw48b00/4TXyDxteQaKWE3YXDF59SUg7B1EZsYNdJkVMt0MDw
+ktQbyQth8606ISIi3MM0glnsJACsl2yakwGlbIgEpkn83I/k5LYMaW+zM/ag2/Ij
+XtzFx48O8rBkw6r8N1ILbM6soV5EmCfzEPj3OlxyljGg8yG9wWz2nWsrCN/jjR+0
+pAt/+bzOukdQjxNTInehxPBt/shZABB3uziqwrSHHZ+CHSNspM1FZ8SCGAay+hKw
+EW21lNlRFn1H7f2R5p65YrqxhK2vrV8tCoyf7Mq9JFCT8lS6vNVtvBR3FM/tbYKI
+FPSvf4nvE5CERcVGmT4guaGa8cqW1NeC9kgHNEEqHuBnFPWPk4WYwgLGNY8mEpTI
+eL5yCa8Nx5wl3kGD7zr6JtqtUiSzpHcYMfWixTs94XJSjqBE8mw=
+=iYi4
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-8/v8.5.73/bin/extras/catalina-ws.jar.sha512
==
--- dev/tomcat/tomcat-8/v8.5.73/bin/extras/catalina-ws.jar.sha512 (added)
+++ dev/tomcat/tomcat-8/v8.5.73/bin/extras/catalina-ws.jar.sha512 Thu Nov 11 
14:47:35 2021
@@ -0,0 +1 @@
+47c18ec7d72af79977c220f59afb524d398dd604859ab96733e6ddda0449240e926d9158504cbcc89cb1dc05cf28dcca508a550a8cb4507e16f3b6de7d9326dc
 *catalina-ws.jar
\ No newline at end of file

Added: dev/tomcat/tomcat-8/v8.5.73/src/apache-tomcat-8.5.73-src.tar.gz
==
Binary file - no diff available.

Propchange: dev/tomcat/tomcat-8/v8.5.73/src/apache-tomcat-8.5.73-src.tar.gz
--
svn:mime-type = application/octet-stream

Added: dev/tomcat/tomcat-8/v8.5.73/src/apache-tomcat-8.5.73-src.tar.gz.asc
==
--- dev/tomcat/tomcat-8/v8.5.73/src/apache-tomcat-8.5.73-src.tar.gz.asc (added)
+++ dev/tomcat/tomcat-8/v8.5.73/src/apache-tomcat-8.5.73-src.tar.gz.asc Thu Nov 
11 14:47:35 2021
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAmGNK/MACgkQHPApP6U8
+pFiHAw/8D9CagHZ/6DIfyORHAbwVZM+ETEauZ7l+018D1sRskq004l54zfPssZBk
+06NmAlQ6OQzOT7ZAxHjeIMqzmsqZN1+q8c3NuAT9cohqvmDWW9PJTW/CQUXa5RPE
+1xlydU5b59omSQsvdnV9AUduFbdpd/FSxZU36YMVv0zRH5E3GLgvoiMfjiApO3UP
+i9TXy/wk803Gqwl7/yqfIo+baS96feJpozy6AmnDpBc1bKBL5I+xDaf9r9VBz0Mr
+QGPYjRlTkdEfhG/kTvUYDKV8CgdliHg0tOdJ+h5EjB2OtZibu96MYScj5//yXfwr
+H6OEUGyFr975vcO5jjzpQ7T6MLP0PmT/z82Q42WQP6uqPMiEyUXViYwEX

Re: Building Tomcat 8.5.x with Java 7

[Mark Thomas]

On 11/11/2021 13:55, Christopher Schultz wrote:

All,

On 11/11/21 08:53, Christopher Schultz wrote:
It looks like fetching the NSIS installer from 
downloads.sourceforge.net is a problem with Java 7.


*sigh*

Java 8 is also failing with handshake_failure :(


I wonder if it is time to build with Java 11 and set release version to 7?

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Building Tomcat 8.5.x with Java 7

[Christopher Schultz]

All,

On 11/11/21 08:53, Christopher Schultz wrote:
It looks like fetching the NSIS installer from downloads.sourceforge.net 
is a problem with Java 7.


*sigh*

Java 8 is also failing with handshake_failure :(

Hmm...

-chris

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Building Tomcat 8.5.x with Java 7

[Christopher Schultz]

All,

It looks like fetching the NSIS installer from downloads.sourceforge.net 
is a problem with Java 7.


I should be able to download the dependencies with Java 8, then switch 
to Java 7 for the actual build.


Is there a way to specify a JAVA_HOME for the compilation and testing, 
but to use a different JAVA_HOME to invoke ant itself?


-chris

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [tomcat] 01/01: Tag 8.5.73

[Christopher Schultz]

All,

On 11/11/21 08:31, Christopher Schultz wrote:

All,

Hmm. Something is odd. As I build the release, I'm seeing artifacts for 
8.5.72. I'm looking for whatever I missed. I might nee to re-tag.


Fixed. I missed incrementing the version.build in 
build.properties.default. I've fixed that and re-tagged.


Apologies for the noise.

Thanks,
-chris


On 11/11/21 08:17, schu...@apache.org wrote:

This is an automated email from the ASF dual-hosted git repository.

schultz pushed a commit to tag 8.5.73
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 38fb8f1051b7e5e3ea8672cd35e44cf8819e0f7a
Author: schultz 
AuthorDate: Thu Nov 11 05:17:02 2021 -0800

 Tag 8.5.73
---
  build.properties.default   | 7 ---
  webapps/docs/changelog.xml | 2 +-
  2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index d5d8f3c..b89f1ee 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -33,13 +33,14 @@ version.major=8
  version.minor=5
  version.build=72
  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-06-08T12:00:00Z
-#ant.tstamp.now=1623153600
+# 2021-11-11 13:14:36 UTC
+ant.tstamp.now=1636636476
+
  # - Source control flags -
  git.branch=8.5.x
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d3c11e5..875f42d 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



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 01/01: Tag 8.5.73

[schultz]

This is an automated email from the ASF dual-hosted git repository.

schultz pushed a commit to tag 8.5.73
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit e8de8521b0f88b452ac6bd79abad3aad3bcc18b6
Author: schultz 
AuthorDate: Thu Nov 11 05:35:09 2021 -0800

Tag 8.5.73
---
 build.properties.default   | 9 +
 webapps/docs/changelog.xml | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index d5d8f3c..8da2c9e 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -31,15 +31,16 @@
 # - Version Control Flags -
 version.major=8
 version.minor=5
-version.build=72
+version.build=73
 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-06-08T12:00:00Z
-#ant.tstamp.now=1623153600
+# 2021-11-11 13:14:36 UTC
+ant.tstamp.now=1636636476
+
 
 # - Source control flags -
 git.branch=8.5.x
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d3c11e5..875f42d 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 8.5.73 created (now e8de852)

[schultz]

This is an automated email from the ASF dual-hosted git repository.

schultz pushed a change to tag 8.5.73
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


  at e8de852  (commit)
This tag includes the following new commits:

 new e8de852  Tag 8.5.73

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

[tomcat] tag 8.5.73 deleted (was 38fb8f1)

[schultz]

This is an automated email from the ASF dual-hosted git repository.

schultz pushed a change to tag 8.5.73
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


*** WARNING: tag 8.5.73 was deleted! ***

 was 38fb8f1  Tag 8.5.73

This change permanently discards the following revisions:

 discard 38fb8f1  Tag 8.5.73

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [tomcat] 01/01: Tag 8.5.73

[Christopher Schultz]

All,

Hmm. Something is odd. As I build the release, I'm seeing artifacts for 
8.5.72. I'm looking for whatever I missed. I might nee to re-tag.


-chris

On 11/11/21 08:17, schu...@apache.org wrote:

This is an automated email from the ASF dual-hosted git repository.

schultz pushed a commit to tag 8.5.73
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 38fb8f1051b7e5e3ea8672cd35e44cf8819e0f7a
Author: schultz 
AuthorDate: Thu Nov 11 05:17:02 2021 -0800

 Tag 8.5.73
---
  build.properties.default   | 7 ---
  webapps/docs/changelog.xml | 2 +-
  2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index d5d8f3c..b89f1ee 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -33,13 +33,14 @@ version.major=8
  version.minor=5
  version.build=72
  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-06-08T12:00:00Z
-#ant.tstamp.now=1623153600
+# 2021-11-11 13:14:36 UTC
+ant.tstamp.now=1636636476
+
  
  # - Source control flags -

  git.branch=8.5.x
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d3c11e5..875f42d 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



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 01/01: Tag 8.5.73

[schultz]

This is an automated email from the ASF dual-hosted git repository.

schultz pushed a commit to tag 8.5.73
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 38fb8f1051b7e5e3ea8672cd35e44cf8819e0f7a
Author: schultz 
AuthorDate: Thu Nov 11 05:17:02 2021 -0800

Tag 8.5.73
---
 build.properties.default   | 7 ---
 webapps/docs/changelog.xml | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index d5d8f3c..b89f1ee 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -33,13 +33,14 @@ version.major=8
 version.minor=5
 version.build=72
 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-06-08T12:00:00Z
-#ant.tstamp.now=1623153600
+# 2021-11-11 13:14:36 UTC
+ant.tstamp.now=1636636476
+
 
 # - Source control flags -
 git.branch=8.5.x
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d3c11e5..875f42d 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 8.5.73 created (now 38fb8f1)

[schultz]

This is an automated email from the ASF dual-hosted git repository.

schultz pushed a change to tag 8.5.73
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


  at 38fb8f1  (commit)
This tag includes the following new commits:

 new 38fb8f1  Tag 8.5.73

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

[tomcat] branch 10.0.x updated: Attempt to fix APR crash on shutdown.

[markt]

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 834be80  Attempt to fix APR crash on shutdown.
834be80 is described below

commit 834be80289bf95a9ef21d3cac323ddaa7b231304
Author: Mark Thomas 
AuthorDate: Thu Nov 11 12:58:52 2021 +

Attempt to fix APR crash on shutdown.

These crashes have been observed with the new BuildBot CI system. Local
testing indicates this fix addresses the issue but it might just be
changing the timing.
---
 java/org/apache/tomcat/util/net/AprEndpoint.java | 19 +++
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java 
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 9dda480..4445a97 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -714,11 +714,22 @@ public class AprEndpoint extends 
AbstractEndpoint implements SNICallB
 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());
+
+// Need to make sure the socket doesn't get closed while the
+// handshake is in progress as that could trigger a JVM crash.
+// Like stopInternal(), use the blocking status write lock as a
+// proxy for a lock on writing to the socket.
+WriteLock wl = ((AprSocketWrapper) 
socketWrapper).getBlockingStatusWriteLock();
+wl.lock();
+try {
+if (SSLSocket.handshake(socket) != 0) {
+if (log.isDebugEnabled()) {
+log.debug(sm.getString("endpoint.err.handshake") + 
": " + SSL.getLastError());
+}
+return false;
 }
-return false;
+} finally {
+wl.unlock();
 }
 
 if (negotiableProtocols.size() > 0) {

-
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 NPE observed investigating current CI failuers

[markt]

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 af9d7d4  Fix NPE observed investigating current CI failuers
af9d7d4 is described below

commit af9d7d4f233e004d201404e05071996d04266836
Author: Mark Thomas 
AuthorDate: Thu Nov 11 10:11:49 2021 +

Fix NPE observed investigating current CI failuers
---
 java/org/apache/tomcat/util/net/AprEndpoint.java | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java 
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 0413434..3583a2d 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -2343,7 +2343,10 @@ public class AprEndpoint extends AbstractEndpoint 
implements SNICallBack {
 if (sslOutputBuffer != null) {
 ByteBufferUtils.cleanDirectBuffer(sslOutputBuffer);
 }
-((AprEndpoint) 
getEndpoint()).getPoller().close(getSocket().longValue());
+Poller poller = ((AprEndpoint) getEndpoint()).getPoller();
+if (poller != null) {
+poller.close(getSocket().longValue());
+}
 }
 }
 

-
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 NPE observed investigating current CI failuers

[markt]

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 6d29ec5  Fix NPE observed investigating current CI failuers
6d29ec5 is described below

commit 6d29ec5e1fe4ba92bcf0dc03a06d054338123df7
Author: Mark Thomas 
AuthorDate: Thu Nov 11 10:11:49 2021 +

Fix NPE observed investigating current CI failuers
---
 java/org/apache/tomcat/util/net/AprEndpoint.java | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java 
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 3a3aa0b..7599670 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -2339,7 +2339,10 @@ public class AprEndpoint extends 
AbstractEndpoint implements SNICallB
 if (sslOutputBuffer != null) {
 ByteBufferUtils.cleanDirectBuffer(sslOutputBuffer);
 }
-((AprEndpoint) 
getEndpoint()).getPoller().close(getSocket().longValue());
+Poller poller = ((AprEndpoint) getEndpoint()).getPoller();
+if (poller != null) {
+poller.close(getSocket().longValue());
+}
 }
 
 

-
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 NPE observed investigating current CI failuers

[markt]

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 0e44119  Fix NPE observed investigating current CI failuers
0e44119 is described below

commit 0e44119742ff742cf2c0fadf81d742ecad749bce
Author: Mark Thomas 
AuthorDate: Thu Nov 11 10:11:49 2021 +

Fix NPE observed investigating current CI failuers
---
 java/org/apache/tomcat/util/net/AprEndpoint.java | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java 
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index b3fbf22..9dda480 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -2343,7 +2343,10 @@ public class AprEndpoint extends 
AbstractEndpoint implements SNICallB
 if (sslOutputBuffer != null) {
 ByteBufferUtils.cleanDirectBuffer(sslOutputBuffer);
 }
-((AprEndpoint) 
getEndpoint()).getPoller().close(getSocket().longValue());
+Poller poller = ((AprEndpoint) getEndpoint()).getPoller();
+if (poller != null) {
+poller.close(getSocket().longValue());
+}
 }
 
 

-
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 Javadoc TODO

[markt]

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 84e6aaa  Fix a Javadoc TODO
84e6aaa is described below

commit 84e6aaaf42d991ec41596079662d448f3d174ec1
Author: Mark Thomas 
AuthorDate: Thu Nov 11 09:39:54 2021 +

Fix a Javadoc TODO

This needed doing but the primary purpose was to trigger a CI build
(hence why I only fixed one TODO - I may need to trigger additional
builds).
---
 java/javax/servlet/ServletContext.java | 15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/java/javax/servlet/ServletContext.java 
b/java/javax/servlet/ServletContext.java
index 301eb1f..8858b8a 100644
--- a/java/javax/servlet/ServletContext.java
+++ b/java/javax/servlet/ServletContext.java
@@ -758,10 +758,15 @@ public interface ServletContext {
 Class filterClass);
 
 /**
- * TODO SERVLET3 - Add comments
- * @param  TODO
- * @param c   TODO
- * @return TODO
+ * Create a Filter instance using the given class. The instance is just
+ * created. No initialisation occurs.
+ *
+ * @param  The type for the given class
+ * @param c   The the class for which an instance should be created
+ *
+ * @return The created Filter instance.
+ *
+ * @throws ServletException If the Filter instance cannot be created
  * @throws UnsupportedOperationExceptionIf called from a
  *{@link 
ServletContextListener#contextInitialized(ServletContextEvent)}
  *method of a {@link ServletContextListener} that was not defined in a
@@ -769,7 +774,7 @@ public interface ServletContext {
  *{@link javax.servlet.annotation.WebListener}. For example, a
  *{@link ServletContextListener} defined in a TLD would not be able to
  *use this method.
- * @throws ServletException TODO
+ *
  * @since Servlet 3.0
  */
 public  T createFilter(Class c) throws 
ServletException;

-
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 Javadoc TODO

[markt]

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 cffa5f4  Fix a Javadoc TODO
cffa5f4 is described below

commit cffa5f44618b28cb8cc48c470f2660baca51ae25
Author: Mark Thomas 
AuthorDate: Thu Nov 11 09:39:54 2021 +

Fix a Javadoc TODO

This needed doing but the primary purpose was to trigger a CI build
(hence why I only fixed one TODO - I may need to trigger additional
builds).
---
 java/javax/servlet/ServletContext.java | 15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/java/javax/servlet/ServletContext.java 
b/java/javax/servlet/ServletContext.java
index a9b8c54..43b39e2 100644
--- a/java/javax/servlet/ServletContext.java
+++ b/java/javax/servlet/ServletContext.java
@@ -768,10 +768,15 @@ public interface ServletContext {
 Class filterClass);
 
 /**
- * TODO SERVLET3 - Add comments
- * @param  TODO
- * @param c   TODO
- * @return TODO
+ * Create a Filter instance using the given class. The instance is just
+ * created. No initialisation occurs.
+ *
+ * @param  The type for the given class
+ * @param c   The the class for which an instance should be created
+ *
+ * @return The created Filter instance.
+ *
+ * @throws ServletException If the Filter instance cannot be created
  * @throws UnsupportedOperationExceptionIf called from a
  *{@link 
ServletContextListener#contextInitialized(ServletContextEvent)}
  *method of a {@link ServletContextListener} that was not defined in a
@@ -779,7 +784,7 @@ public interface ServletContext {
  *{@link javax.servlet.annotation.WebListener}. For example, a
  *{@link ServletContextListener} defined in a TLD would not be able to
  *use this method.
- * @throws ServletException TODO
+ *
  * @since Servlet 3.0
  */
 public  T createFilter(Class c) throws 
ServletException;

-
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 Javadoc TODO

[markt]

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 f3ea67f  Fix a Javadoc TODO
f3ea67f is described below

commit f3ea67f50f8a262b5ea3408b30265175cc006944
Author: Mark Thomas 
AuthorDate: Thu Nov 11 09:39:54 2021 +

Fix a Javadoc TODO

This needed doing but the primary purpose was to trigger a CI build
(hence why I only fixed one TODO - I may need to trigger additional
builds).
---
 java/jakarta/servlet/ServletContext.java | 15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/java/jakarta/servlet/ServletContext.java 
b/java/jakarta/servlet/ServletContext.java
index cd6385d..ce18fa6 100644
--- a/java/jakarta/servlet/ServletContext.java
+++ b/java/jakarta/servlet/ServletContext.java
@@ -768,10 +768,15 @@ public interface ServletContext {
 Class filterClass);
 
 /**
- * TODO SERVLET3 - Add comments
- * @param  TODO
- * @param c   TODO
- * @return TODO
+ * Create a Filter instance using the given class. The instance is just
+ * created. No initialisation occurs.
+ *
+ * @param  The type for the given class
+ * @param c   The the class for which an instance should be created
+ *
+ * @return The created Filter instance.
+ *
+ * @throws ServletException If the Filter instance cannot be created
  * @throws UnsupportedOperationExceptionIf called from a
  *{@link 
ServletContextListener#contextInitialized(ServletContextEvent)}
  *method of a {@link ServletContextListener} that was not defined in a
@@ -779,7 +784,7 @@ public interface ServletContext {
  *{@link jakarta.servlet.annotation.WebListener}. For example, a
  *{@link ServletContextListener} defined in a TLD would not be able to
  *use this method.
- * @throws ServletException TODO
+ *
  * @since Servlet 3.0
  */
 public  T createFilter(Class c) throws 
ServletException;

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch main updated: Fix a Javadoc TODO

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt 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 8941732  Fix a Javadoc TODO
8941732 is described below

commit 894173209a539eb2b70e7bfb305483c6fb5d5919
Author: Mark Thomas 
AuthorDate: Thu Nov 11 09:39:54 2021 +

Fix a Javadoc TODO

This needed doing but the primary purpose was to trigger a CI build
(hence why I only fixed one TODO - I may need to trigger additional
builds).
---
 java/jakarta/servlet/ServletContext.java | 15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/java/jakarta/servlet/ServletContext.java 
b/java/jakarta/servlet/ServletContext.java
index fca6fca..6a61c2d 100644
--- a/java/jakarta/servlet/ServletContext.java
+++ b/java/jakarta/servlet/ServletContext.java
@@ -703,10 +703,15 @@ public interface ServletContext {
 Class filterClass);
 
 /**
- * TODO SERVLET3 - Add comments
- * @param  TODO
- * @param c   TODO
- * @return TODO
+ * Create a Filter instance using the given class. The instance is just
+ * created. No initialisation occurs.
+ *
+ * @param  The type for the given class
+ * @param c   The the class for which an instance should be created
+ *
+ * @return The created Filter instance.
+ *
+ * @throws ServletException If the Filter instance cannot be created
  * @throws UnsupportedOperationExceptionIf called from a
  *{@link 
ServletContextListener#contextInitialized(ServletContextEvent)}
  *method of a {@link ServletContextListener} that was not defined in a
@@ -714,7 +719,7 @@ public interface ServletContext {
  *{@link jakarta.servlet.annotation.WebListener}. For example, a
  *{@link ServletContextListener} defined in a TLD would not be able to
  *use this method.
- * @throws ServletException TODO
+ *
  * @since Servlet 3.0
  */
 public  T createFilter(Class c) throws 
ServletException;

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org