Re: [VOTE] Release Apache Tomcat 9.0.78

[jean-frederic clere]

On 7/4/23 15:28, Rémy Maucherat wrote:

[X] +1, Stable - go ahead and release as 9.0.78


Tested on fedora 38 with OpenJDK 17 (fc38 build).

I had:
+++
   [concat] Testsuites with failed tests:
   [concat] 
TEST-org.apache.tomcat.jni.TestSocketServerAnyLocalAddress.APR.txt
   [concat] 
TEST-org.apache.tomcat.jni.TestSocketServerAnyLocalAddress.NIO.txt
   [concat] 
TEST-org.apache.tomcat.jni.TestSocketServerAnyLocalAddress.NIO2.txt

+++
Due to:
+++
[jfclere@fedora NOTES]$ sysctl net.ipv6.conf.all.disable_ipv6
net.ipv6.conf.all.disable_ipv6 = 1
+++
my bad! ;-)

--
Cheers

Jean-Frederic


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

[Tim Funk]

+1

-Tim

On Tue, Jul 4, 2023 at 9:28 AM Rémy Maucherat  wrote:

> The proposed Apache Tomcat 9.0.78 release is now available for voting.
>
> The notable changes compared to 9.0.76 are:
> 
> The proposed 9.0.78 release is:
> [ ] -1, Broken - do not release
> [ X ] +1, Stable - go ahead and release as 9.0.78
>
>
>

[tomcat] branch main updated: Refactor to remove code paths that could result in lost notifications

[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 c8de9159af Refactor to remove code paths that could result in lost 
notifications
c8de9159af is described below

commit c8de9159af9c358a976fa6180e147e19c04c7d1f
Author: Mark Thomas 
AuthorDate: Thu Jul 6 13:25:14 2023 +0100

Refactor to remove code paths that could result in lost notifications

The scenario is considered unlikely but if, in the original code, the
Poller notified the [read|write]Lock after the read/write registration
but before execution entered the synchronized block, that notification
would be lost. This could lead to a timeout rather than the expected
read/write.

Flagged by Coverity for issues with spurious wake-ups. That wasn't an
issue but this was.
---
 java/org/apache/tomcat/util/net/NioEndpoint.java | 77 
 webapps/docs/changelog.xml   |  9 +++
 2 files changed, 47 insertions(+), 39 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java 
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index bb3cb69458..4c639cf7b0 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -1268,26 +1268,25 @@ public class NioEndpoint extends 
AbstractNetworkChannelEndpoint 0) {
-startNanos = System.nanoTime();
-readLock.wait(timeout);
-} else {
-readLock.wait();
-}
-} catch (InterruptedException e) {
-// Continue
+synchronized (readLock) {
+n = getSocket().read(buffer);
+if (n == -1) {
+throw new EOFException();
+} else if (n == 0) {
+// Ensure a spurious wake-up doesn't trigger a 
duplicate registration
+if (!readBlocking) {
+readBlocking = true;
+registerReadInterest();
+}
+try {
+if (timeout > 0) {
+startNanos = System.nanoTime();
+readLock.wait(timeout);
+} else {
+readLock.wait();
 }
+} catch (InterruptedException e) {
+// Continue
 }
 }
 }
@@ -1379,33 +1378,33 @@ public class NioEndpoint extends 
AbstractNetworkChannelEndpoint 0)) {
+synchronized (writeLock) {
+n = getSocket().write(buffer);
 // n == 0 could be an incomplete write but it could 
also
 // indicate that a previous incomplete write of the
 // outbound buffer (for TLS) has now completed. Only
 // block if there is still data to write.
-writeBlocking = true;
-registerWriteInterest();
-synchronized (writeLock) {
-if (writeBlocking) {
-try {
-if (timeout > 0) {
-startNanos = System.nanoTime();
-writeLock.wait(timeout);
-} else {
-writeLock.wait();
-}
-} catch (InterruptedException e) {
-// Continue
+if (n == 0 && (buffer.hasRemaining() || 
getSocket().getOutboundRemaining() > 0)) {
+// Ensure a spurious wake-up doesn't trigger a 
duplicate registration
+if (!writeBlocking) {
+writeBlocking = true;
+registerWriteInterest();
+}
+try {
+if (timeout > 0) {
+startNanos = System.nanoTime();
+writeLock.wait(timeout);
+} else {
+writeLock.wait();
 }
-writeBlocking = false;
+   

[tomcat] branch 10.1.x updated: Refactor to remove code paths that could result in lost notifications

[markt]

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

markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/10.1.x by this push:
 new b4d81f0599 Refactor to remove code paths that could result in lost 
notifications
b4d81f0599 is described below

commit b4d81f05996a4d1a0333e2776f8c0cf1b0204c6b
Author: Mark Thomas 
AuthorDate: Thu Jul 6 13:25:14 2023 +0100

Refactor to remove code paths that could result in lost notifications

The scenario is considered unlikely but if, in the original code, the
Poller notified the [read|write]Lock after the read/write registration
but before execution entered the synchronized block, that notification
would be lost. This could lead to a timeout rather than the expected
read/write.

Flagged by Coverity Scan for issues with spurious wake-ups. That wasn't
an issue but this was.
---
 java/org/apache/tomcat/util/net/NioEndpoint.java | 77 
 webapps/docs/changelog.xml   |  5 ++
 2 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java 
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 5f9beb80c8..e817945272 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -1267,26 +1267,25 @@ public class NioEndpoint extends 
AbstractJsseEndpoint
 throw new SocketTimeoutException();
 }
 }
-n = getSocket().read(buffer);
-if (n == -1) {
-throw new EOFException();
-} else if (n == 0) {
-if (!readBlocking) {
-readBlocking = true;
-registerReadInterest();
-}
-synchronized (readLock) {
-if (readBlocking) {
-try {
-if (timeout > 0) {
-startNanos = System.nanoTime();
-readLock.wait(timeout);
-} else {
-readLock.wait();
-}
-} catch (InterruptedException e) {
-// Continue
+synchronized (readLock) {
+n = getSocket().read(buffer);
+if (n == -1) {
+throw new EOFException();
+} else if (n == 0) {
+// Ensure a spurious wake-up doesn't trigger a 
duplicate registration
+if (!readBlocking) {
+readBlocking = true;
+registerReadInterest();
+}
+try {
+if (timeout > 0) {
+startNanos = System.nanoTime();
+readLock.wait(timeout);
+} else {
+readLock.wait();
 }
+} catch (InterruptedException e) {
+// Continue
 }
 }
 }
@@ -1378,33 +1377,33 @@ public class NioEndpoint extends 
AbstractJsseEndpoint
 throw previousIOException;
 }
 }
-n = getSocket().write(buffer);
-if (n == 0 && (buffer.hasRemaining() || 
getSocket().getOutboundRemaining() > 0)) {
+synchronized (writeLock) {
+n = getSocket().write(buffer);
 // n == 0 could be an incomplete write but it could 
also
 // indicate that a previous incomplete write of the
 // outbound buffer (for TLS) has now completed. Only
 // block if there is still data to write.
-writeBlocking = true;
-registerWriteInterest();
-synchronized (writeLock) {
-if (writeBlocking) {
-try {
-if (timeout > 0) {
-startNanos = System.nanoTime();
-writeLock.wait(timeout);
-} else {
-writeLock.wait();
-}
-

[tomcat] branch 9.0.x updated: Refactor to remove code paths that could result in lost notifications

[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 879d81be35 Refactor to remove code paths that could result in lost 
notifications
879d81be35 is described below

commit 879d81be35fdbe3e27fbf726a049a1827c827ab8
Author: Mark Thomas 
AuthorDate: Thu Jul 6 13:25:14 2023 +0100

Refactor to remove code paths that could result in lost notifications

The scenario is considered unlikely but if, in the original code, the
Poller notified the [read|write]Lock after the read/write registration
but before execution entered the synchronized block, that notification
would be lost. This could lead to a timeout rather than the expected
read/write.

Flagged by Coverity for issues with spurious wake-ups. That wasn't an
issue but this was.
---
 java/org/apache/tomcat/util/net/NioEndpoint.java | 77 
 webapps/docs/changelog.xml   |  9 +++
 2 files changed, 47 insertions(+), 39 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java 
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 915a057297..e7491ea3f9 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -1317,26 +1317,25 @@ public class NioEndpoint extends 
AbstractJsseEndpoint
 throw new SocketTimeoutException();
 }
 }
-n = getSocket().read(buffer);
-if (n == -1) {
-throw new EOFException();
-} else if (n == 0) {
-if (!readBlocking) {
-readBlocking = true;
-registerReadInterest();
-}
-synchronized (readLock) {
-if (readBlocking) {
-try {
-if (timeout > 0) {
-startNanos = System.nanoTime();
-readLock.wait(timeout);
-} else {
-readLock.wait();
-}
-} catch (InterruptedException e) {
-// Continue
+synchronized (readLock) {
+n = getSocket().read(buffer);
+if (n == -1) {
+throw new EOFException();
+} else if (n == 0) {
+// Ensure a spurious wake-up doesn't trigger a 
duplicate registration
+if (!readBlocking) {
+readBlocking = true;
+registerReadInterest();
+}
+try {
+if (timeout > 0) {
+startNanos = System.nanoTime();
+readLock.wait(timeout);
+} else {
+readLock.wait();
 }
+} catch (InterruptedException e) {
+// Continue
 }
 }
 }
@@ -1428,33 +1427,33 @@ public class NioEndpoint extends 
AbstractJsseEndpoint
 throw previousIOException;
 }
 }
-n = getSocket().write(buffer);
-if (n == 0 && (buffer.hasRemaining() || 
getSocket().getOutboundRemaining() > 0)) {
+synchronized (writeLock) {
+n = getSocket().write(buffer);
 // n == 0 could be an incomplete write but it could 
also
 // indicate that a previous incomplete write of the
 // outbound buffer (for TLS) has now completed. Only
 // block if there is still data to write.
-writeBlocking = true;
-registerWriteInterest();
-synchronized (writeLock) {
-if (writeBlocking) {
-try {
-if (timeout > 0) {
-startNanos = System.nanoTime();
-writeLock.wait(timeout);
-} else {
-writeLock.wait();
-}
-  

[tomcat] branch 8.5.x updated: Refactor to remove code paths that could result in lost notifications

[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 a04db5ecbd Refactor to remove code paths that could result in lost 
notifications
a04db5ecbd is described below

commit a04db5ecbdfc2e2ac8c5c07a59771782558ec2c9
Author: Mark Thomas 
AuthorDate: Thu Jul 6 13:25:14 2023 +0100

Refactor to remove code paths that could result in lost notifications

The scenario is considered unlikely but if, in the original code, the
Poller notified the [read|write]Lock after the read/write registration
but before execution entered the synchronized block, that notification
would be lost. This could lead to a timeout rather than the expected
read/write.

Flagged by Coverity Scan for issues with spurious wake-ups. That wasn't
an issue but this was.
---
 java/org/apache/tomcat/util/net/NioEndpoint.java | 77 
 webapps/docs/changelog.xml   |  5 ++
 2 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java 
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index f5696b1284..fcf8c80ea8 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -1217,26 +1217,25 @@ public class NioEndpoint extends 
AbstractJsseEndpoint
 throw new SocketTimeoutException();
 }
 }
-n = getSocket().read(buffer);
-if (n == -1) {
-throw new EOFException();
-} else if (n == 0) {
-if (!readBlocking) {
-readBlocking = true;
-registerReadInterest();
-}
-synchronized (readLock) {
-if (readBlocking) {
-try {
-if (timeout > 0) {
-startNanos = System.nanoTime();
-readLock.wait(timeout);
-} else {
-readLock.wait();
-}
-} catch (InterruptedException e) {
-// Continue
+synchronized (readLock) {
+n = getSocket().read(buffer);
+if (n == -1) {
+throw new EOFException();
+} else if (n == 0) {
+// Ensure a spurious wake-up doesn't trigger a 
duplicate registration
+if (!readBlocking) {
+readBlocking = true;
+registerReadInterest();
+}
+try {
+if (timeout > 0) {
+startNanos = System.nanoTime();
+readLock.wait(timeout);
+} else {
+readLock.wait();
 }
+} catch (InterruptedException e) {
+// Continue
 }
 }
 }
@@ -1328,33 +1327,33 @@ public class NioEndpoint extends 
AbstractJsseEndpoint
 throw previousIOException;
 }
 }
-n = getSocket().write(buffer);
-if (n == 0 && (buffer.hasRemaining() || 
getSocket().getOutboundRemaining() > 0)) {
+synchronized (writeLock) {
+n = getSocket().write(buffer);
 // n == 0 could be an incomplete write but it could 
also
 // indicate that a previous incomplete write of the
 // outbound buffer (for TLS) has now completed. Only
 // block if there is still data to write.
-writeBlocking = true;
-registerWriteInterest();
-synchronized (writeLock) {
-if (writeBlocking) {
-try {
-if (timeout > 0) {
-startNanos = System.nanoTime();
-writeLock.wait(timeout);
-} else {
-writeLock.wait();
-}
-  

[tomcat] branch main updated: Handle spurious wake-ups while waiting for an allocation

[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 6a3821d8e5 Handle spurious wake-ups while waiting for an allocation
6a3821d8e5 is described below

commit 6a3821d8e5ff1e92da81d73929fb525deaa8ce7f
Author: Mark Thomas 
AuthorDate: Thu Jul 6 14:05:48 2023 +0100

Handle spurious wake-ups while waiting for an allocation
---
 .../coyote/http2/WindowAllocationManager.java  | 34 +-
 webapps/docs/changelog.xml |  4 +++
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/coyote/http2/WindowAllocationManager.java 
b/java/org/apache/coyote/http2/WindowAllocationManager.java
index 94558b15b1..e784c4083c 100644
--- a/java/org/apache/coyote/http2/WindowAllocationManager.java
+++ b/java/org/apache/coyote/http2/WindowAllocationManager.java
@@ -16,6 +16,8 @@
  */
 package org.apache.coyote.http2;
 
+import java.util.concurrent.TimeUnit;
+
 import org.apache.coyote.ActionCode;
 import org.apache.coyote.Response;
 import org.apache.juli.logging.Log;
@@ -133,7 +135,7 @@ class WindowAllocationManager {
 }
 
 
-private void waitFor(int waitTarget, long timeout) throws 
InterruptedException {
+private void waitFor(int waitTarget, final long timeout) throws 
InterruptedException {
 synchronized (stream) {
 if (waitingFor != NONE) {
 throw new 
IllegalStateException(sm.getString("windowAllocationManager.waitFor.ise",
@@ -141,12 +143,30 @@ class WindowAllocationManager {
 }
 
 waitingFor = waitTarget;
-
-if (timeout < 0) {
-stream.wait();
-} else {
-stream.wait(timeout);
-}
+long startNanos = -1;
+
+// Loop to handle spurious wake-ups
+do {
+if (timeout < 0) {
+stream.wait();
+} else {
+long timeoutRemaining;
+if (startNanos == -1) {
+startNanos = System.nanoTime();
+timeoutRemaining = timeout;
+} else {
+long elapsedMillis = 
TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startNanos);
+if (elapsedMillis == 0) {
+elapsedMillis = 1;
+}
+timeoutRemaining = timeout - elapsedMillis;
+if (timeoutRemaining <= 0) {
+return;
+}
+}
+stream.wait(timeoutRemaining);
+}
+} while (waitingFor != NONE);
 }
 }
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index bebcbd0c40..c677e4228e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -124,6 +124,10 @@
 code paths that could allow a notification from the Poller to be missed
 resuting in a timeout rather than the expected read or write. (markt)
   
+  
+Refactor waiting for an HTTP/2 stream or connection window update to
+handle spurious wake-ups during the wait. (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: Handle spurious wake-ups while waiting for an allocation

[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 e5cb2c9e4d Handle spurious wake-ups while waiting for an allocation
e5cb2c9e4d is described below

commit e5cb2c9e4d6690d09445f344ae1515a95f7b9eb1
Author: Mark Thomas 
AuthorDate: Thu Jul 6 14:05:48 2023 +0100

Handle spurious wake-ups while waiting for an allocation
---
 .../coyote/http2/WindowAllocationManager.java  | 34 +-
 webapps/docs/changelog.xml |  4 +++
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/coyote/http2/WindowAllocationManager.java 
b/java/org/apache/coyote/http2/WindowAllocationManager.java
index 94558b15b1..e784c4083c 100644
--- a/java/org/apache/coyote/http2/WindowAllocationManager.java
+++ b/java/org/apache/coyote/http2/WindowAllocationManager.java
@@ -16,6 +16,8 @@
  */
 package org.apache.coyote.http2;
 
+import java.util.concurrent.TimeUnit;
+
 import org.apache.coyote.ActionCode;
 import org.apache.coyote.Response;
 import org.apache.juli.logging.Log;
@@ -133,7 +135,7 @@ class WindowAllocationManager {
 }
 
 
-private void waitFor(int waitTarget, long timeout) throws 
InterruptedException {
+private void waitFor(int waitTarget, final long timeout) throws 
InterruptedException {
 synchronized (stream) {
 if (waitingFor != NONE) {
 throw new 
IllegalStateException(sm.getString("windowAllocationManager.waitFor.ise",
@@ -141,12 +143,30 @@ class WindowAllocationManager {
 }
 
 waitingFor = waitTarget;
-
-if (timeout < 0) {
-stream.wait();
-} else {
-stream.wait(timeout);
-}
+long startNanos = -1;
+
+// Loop to handle spurious wake-ups
+do {
+if (timeout < 0) {
+stream.wait();
+} else {
+long timeoutRemaining;
+if (startNanos == -1) {
+startNanos = System.nanoTime();
+timeoutRemaining = timeout;
+} else {
+long elapsedMillis = 
TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startNanos);
+if (elapsedMillis == 0) {
+elapsedMillis = 1;
+}
+timeoutRemaining = timeout - elapsedMillis;
+if (timeoutRemaining <= 0) {
+return;
+}
+}
+stream.wait(timeoutRemaining);
+}
+} while (waitingFor != NONE);
 }
 }
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cbc85b9147..562e76c4be 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -124,6 +124,10 @@
 code paths that could allow a notification from the Poller to be missed
 resuting in a timeout rather than the expected read or write. (markt)
   
+  
+Refactor waiting for an HTTP/2 stream or connection window update to
+handle spurious wake-ups during the wait. (markt)
+  
 
   
 


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

[tomcat] branch 10.1.x updated: Handle spurious wake-ups while waiting for an allocation

[markt]

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

markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/10.1.x by this push:
 new e0f23beb08 Handle spurious wake-ups while waiting for an allocation
e0f23beb08 is described below

commit e0f23beb08bdb6d56ea34adfaebba26af43bc3a1
Author: Mark Thomas 
AuthorDate: Thu Jul 6 14:05:48 2023 +0100

Handle spurious wake-ups while waiting for an allocation
---
 .../coyote/http2/WindowAllocationManager.java  | 34 +-
 webapps/docs/changelog.xml |  4 +++
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/coyote/http2/WindowAllocationManager.java 
b/java/org/apache/coyote/http2/WindowAllocationManager.java
index 94558b15b1..e784c4083c 100644
--- a/java/org/apache/coyote/http2/WindowAllocationManager.java
+++ b/java/org/apache/coyote/http2/WindowAllocationManager.java
@@ -16,6 +16,8 @@
  */
 package org.apache.coyote.http2;
 
+import java.util.concurrent.TimeUnit;
+
 import org.apache.coyote.ActionCode;
 import org.apache.coyote.Response;
 import org.apache.juli.logging.Log;
@@ -133,7 +135,7 @@ class WindowAllocationManager {
 }
 
 
-private void waitFor(int waitTarget, long timeout) throws 
InterruptedException {
+private void waitFor(int waitTarget, final long timeout) throws 
InterruptedException {
 synchronized (stream) {
 if (waitingFor != NONE) {
 throw new 
IllegalStateException(sm.getString("windowAllocationManager.waitFor.ise",
@@ -141,12 +143,30 @@ class WindowAllocationManager {
 }
 
 waitingFor = waitTarget;
-
-if (timeout < 0) {
-stream.wait();
-} else {
-stream.wait(timeout);
-}
+long startNanos = -1;
+
+// Loop to handle spurious wake-ups
+do {
+if (timeout < 0) {
+stream.wait();
+} else {
+long timeoutRemaining;
+if (startNanos == -1) {
+startNanos = System.nanoTime();
+timeoutRemaining = timeout;
+} else {
+long elapsedMillis = 
TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startNanos);
+if (elapsedMillis == 0) {
+elapsedMillis = 1;
+}
+timeoutRemaining = timeout - elapsedMillis;
+if (timeoutRemaining <= 0) {
+return;
+}
+}
+stream.wait(timeoutRemaining);
+}
+} while (waitingFor != NONE);
 }
 }
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a25727b227..49da890896 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -159,6 +159,10 @@
 code paths that could allow a notification from the Poller to be missed
 resuting in a timeout rather than the expected read or write. (markt)
   
+  
+Refactor waiting for an HTTP/2 stream or connection window update to
+handle spurious wake-ups during the wait. (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: Handle spurious wake-ups while waiting for an allocation

[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 0bccdc2e87 Handle spurious wake-ups while waiting for an allocation
0bccdc2e87 is described below

commit 0bccdc2e87aa1f7c904d6eb72f8b8112243df5c8
Author: Mark Thomas 
AuthorDate: Thu Jul 6 14:05:48 2023 +0100

Handle spurious wake-ups while waiting for an allocation
---
 .../coyote/http2/WindowAllocationManager.java  | 34 +-
 webapps/docs/changelog.xml |  4 +++
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/coyote/http2/WindowAllocationManager.java 
b/java/org/apache/coyote/http2/WindowAllocationManager.java
index 94558b15b1..e784c4083c 100644
--- a/java/org/apache/coyote/http2/WindowAllocationManager.java
+++ b/java/org/apache/coyote/http2/WindowAllocationManager.java
@@ -16,6 +16,8 @@
  */
 package org.apache.coyote.http2;
 
+import java.util.concurrent.TimeUnit;
+
 import org.apache.coyote.ActionCode;
 import org.apache.coyote.Response;
 import org.apache.juli.logging.Log;
@@ -133,7 +135,7 @@ class WindowAllocationManager {
 }
 
 
-private void waitFor(int waitTarget, long timeout) throws 
InterruptedException {
+private void waitFor(int waitTarget, final long timeout) throws 
InterruptedException {
 synchronized (stream) {
 if (waitingFor != NONE) {
 throw new 
IllegalStateException(sm.getString("windowAllocationManager.waitFor.ise",
@@ -141,12 +143,30 @@ class WindowAllocationManager {
 }
 
 waitingFor = waitTarget;
-
-if (timeout < 0) {
-stream.wait();
-} else {
-stream.wait(timeout);
-}
+long startNanos = -1;
+
+// Loop to handle spurious wake-ups
+do {
+if (timeout < 0) {
+stream.wait();
+} else {
+long timeoutRemaining;
+if (startNanos == -1) {
+startNanos = System.nanoTime();
+timeoutRemaining = timeout;
+} else {
+long elapsedMillis = 
TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startNanos);
+if (elapsedMillis == 0) {
+elapsedMillis = 1;
+}
+timeoutRemaining = timeout - elapsedMillis;
+if (timeoutRemaining <= 0) {
+return;
+}
+}
+stream.wait(timeoutRemaining);
+}
+} while (waitingFor != NONE);
 }
 }
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5f67af67cd..55415291e6 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -149,6 +149,10 @@
 code paths that could allow a notification from the Poller to be missed
 resuting in a timeout rather than the expected read or write. (markt)
   
+  
+Refactor waiting for an HTTP/2 stream or connection window update to
+handle spurious wake-ups during the wait. (markt)
+  
 
   
   


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

Buildbot success in on tomcat-11.0.x

[buildbot]

Build status: Build succeeded!
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/112/builds/476
Blamelist: Mark Thomas 
Build Text: build successful
Status Detected: restored build
Build Source Stamp: [branch main] c8de9159af9c358a976fa6180e147e19c04c7d1f


Steps:

  worker_preparation: 0

  git: 0

  shell: 0

  shell_1: 0

  shell_2: 0

  shell_3: 0

  shell_4: 0

  shell_5: 0

  compile: 1

  shell_6: 0

  shell_7: 0

  shell_8: 0

  shell_9: 0

  Rsync docs to nightlies.apache.org: 0

  shell_10: 0

  Rsync RAT to nightlies.apache.org: 0

  compile_1: 1

  shell_11: 0

  Rsync Logs to nightlies.apache.org: 0


-- ASF Buildbot


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

[tomcat] tag 10.1.11 created (now ef302041bf)

[schultz]

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

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


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

 new ef302041bf Tag 10.1.11

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] 01/01: Tag 10.1.11

[schultz]

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

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

commit ef302041bff196e8b045ebc27599a45ef51374b8
Author: schultz 
AuthorDate: Thu Jul 6 07:14:11 2023 -0700

Tag 10.1.11
---
 build.properties.release |  52 +++
 res/install-win/Uninstall.exe.sig| Bin 0 -> 10251 bytes
 res/install-win/tomcat-installer.exe.sig | Bin 0 -> 10251 bytes
 res/maven/mvn.properties.release |  27 
 webapps/docs/changelog.xml   |   2 +-
 5 files changed, 80 insertions(+), 1 deletion(-)

diff --git a/build.properties.release b/build.properties.release
new file mode 100644
index 00..ee68ddefc6
--- /dev/null
+++ b/build.properties.release
@@ -0,0 +1,52 @@
+# -
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -
+
+# This file was auto-generated by the pre-release Ant target.
+
+# Any unwanted settings may be over-ridden in a build.properties file located
+# in the same directory as this file.
+
+# Set the version-dev to "" (empty string) as this is not a development 
release.
+version.dev=
+
+# Ensure consistent timestamps for reproducible builds.
+ant.tstamp.now.iso=2023-07-06T13:45:39Z
+
+# Enable insertion of detached signatures into the Windows installer.
+do.codesigning=true
+
+# Re-use the same GPG executable.
+gpg.exec=C:/Program Files (x86)/gnupg/bin/gpg.exe
+
+# Reproducible builds require the use of the build tools defined below. The
+# vendors (where appropriate) and versions must match exactly for a 
reproducible
+# build since this data is embedded in various files, particularly JAR file
+# manifests, as part of the build process.
+#
+# Apache Ant:  Apache Ant(TM) version 1.10.12 compiled on October 13 2021
+#
+# Java Name:   OpenJDK 64-Bit Server VM
+# Java Vendor: Eclipse Adoptium
+# Java Version:11.0.19+7
+
+# The following is provided for information only. Builds will be repeatable
+# whether or not the build environment in consistent with this information.
+#
+# OS:  amd64 Windows 10 10.0
+# File encoding:   Cp1252
+#
+# Release Manager: schultz
diff --git a/res/install-win/Uninstall.exe.sig 
b/res/install-win/Uninstall.exe.sig
new file mode 100644
index 00..d28e0320be
Binary files /dev/null and b/res/install-win/Uninstall.exe.sig differ
diff --git a/res/install-win/tomcat-installer.exe.sig 
b/res/install-win/tomcat-installer.exe.sig
new file mode 100644
index 00..101dec03bf
Binary files /dev/null and b/res/install-win/tomcat-installer.exe.sig differ
diff --git a/res/maven/mvn.properties.release b/res/maven/mvn.properties.release
new file mode 100644
index 00..61c9c12e8c
--- /dev/null
+++ b/res/maven/mvn.properties.release
@@ -0,0 +1,27 @@
+# -
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -
+
+# This file was auto-generated by the pre-release Ant target.
+
+# Remove "-dev" from the version since this is not a development release.
+maven.asf.release.deploy.version=10.1.11
+
+# Re-use the same GPG executable.
+gpg.exec=C:/Program Files (x86)/gnupg/bin/gpg.exe
+
+# Set the user name to 

svn commit: r62852 - in /dev/tomcat/tomcat-10/v10.1.11: ./ bin/ bin/embed/ src/

[schultz]

Author: schultz
Date: Thu Jul  6 14:16:55 2023
New Revision: 62852

Log:
Upload v10.1.11 for voting

Added:
dev/tomcat/tomcat-10/v10.1.11/
dev/tomcat/tomcat-10/v10.1.11/KEYS
dev/tomcat/tomcat-10/v10.1.11/README.html
dev/tomcat/tomcat-10/v10.1.11/RELEASE-NOTES
dev/tomcat/tomcat-10/v10.1.11/bin/
dev/tomcat/tomcat-10/v10.1.11/bin/README.html
dev/tomcat/tomcat-10/v10.1.11/bin/apache-tomcat-10.1.11-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-10/v10.1.11/bin/apache-tomcat-10.1.11-deployer.tar.gz.asc

dev/tomcat/tomcat-10/v10.1.11/bin/apache-tomcat-10.1.11-deployer.tar.gz.sha512
dev/tomcat/tomcat-10/v10.1.11/bin/apache-tomcat-10.1.11-deployer.zip   
(with props)
dev/tomcat/tomcat-10/v10.1.11/bin/apache-tomcat-10.1.11-deployer.zip.asc
dev/tomcat/tomcat-10/v10.1.11/bin/apache-tomcat-10.1.11-deployer.zip.sha512
dev/tomcat/tomcat-10/v10.1.11/bin/apache-tomcat-10.1.11-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-10/v10.1.11/bin/apache-tomcat-10.1.11-fulldocs.tar.gz.asc

dev/tomcat/tomcat-10/v10.1.11/bin/apache-tomcat-10.1.11-fulldocs.tar.gz.sha512
dev/tomcat/tomcat-10/v10.1.11/bin/apache-tomcat-10.1.11-windows-x64.zip   
(with props)
dev/tomcat/tomcat-10/v10.1.11/bin/apache-tomcat-10.1.11-windows-x64.zip.asc

dev/tomcat/tomcat-10/v10.1.11/bin/apache-tomcat-10.1.11-windows-x64.zip.sha512
dev/tomcat/tomcat-10/v10.1.11/bin/apache-tomcat-10.1.11-windows-x86.zip   
(with props)
dev/tomcat/tomcat-10/v10.1.11/bin/apache-tomcat-10.1.11-windows-x86.zip.asc

dev/tomcat/tomcat-10/v10.1.11/bin/apache-tomcat-10.1.11-windows-x86.zip.sha512
dev/tomcat/tomcat-10/v10.1.11/bin/apache-tomcat-10.1.11.exe   (with props)
dev/tomcat/tomcat-10/v10.1.11/bin/apache-tomcat-10.1.11.exe.asc
dev/tomcat/tomcat-10/v10.1.11/bin/apache-tomcat-10.1.11.exe.sha512
dev/tomcat/tomcat-10/v10.1.11/bin/apache-tomcat-10.1.11.tar.gz   (with 
props)
dev/tomcat/tomcat-10/v10.1.11/bin/apache-tomcat-10.1.11.tar.gz.asc
dev/tomcat/tomcat-10/v10.1.11/bin/apache-tomcat-10.1.11.tar.gz.sha512
dev/tomcat/tomcat-10/v10.1.11/bin/apache-tomcat-10.1.11.zip   (with props)
dev/tomcat/tomcat-10/v10.1.11/bin/apache-tomcat-10.1.11.zip.asc
dev/tomcat/tomcat-10/v10.1.11/bin/apache-tomcat-10.1.11.zip.sha512
dev/tomcat/tomcat-10/v10.1.11/bin/embed/
dev/tomcat/tomcat-10/v10.1.11/bin/embed/apache-tomcat-10.1.11-embed.tar.gz  
 (with props)

dev/tomcat/tomcat-10/v10.1.11/bin/embed/apache-tomcat-10.1.11-embed.tar.gz.asc

dev/tomcat/tomcat-10/v10.1.11/bin/embed/apache-tomcat-10.1.11-embed.tar.gz.sha512
dev/tomcat/tomcat-10/v10.1.11/bin/embed/apache-tomcat-10.1.11-embed.zip   
(with props)
dev/tomcat/tomcat-10/v10.1.11/bin/embed/apache-tomcat-10.1.11-embed.zip.asc

dev/tomcat/tomcat-10/v10.1.11/bin/embed/apache-tomcat-10.1.11-embed.zip.sha512
dev/tomcat/tomcat-10/v10.1.11/src/
dev/tomcat/tomcat-10/v10.1.11/src/apache-tomcat-10.1.11-src.tar.gz   (with 
props)
dev/tomcat/tomcat-10/v10.1.11/src/apache-tomcat-10.1.11-src.tar.gz.asc
dev/tomcat/tomcat-10/v10.1.11/src/apache-tomcat-10.1.11-src.tar.gz.sha512
dev/tomcat/tomcat-10/v10.1.11/src/apache-tomcat-10.1.11-src.zip   (with 
props)
dev/tomcat/tomcat-10/v10.1.11/src/apache-tomcat-10.1.11-src.zip.asc
dev/tomcat/tomcat-10/v10.1.11/src/apache-tomcat-10.1.11-src.zip.sha512

Added: dev/tomcat/tomcat-10/v10.1.11/KEYS
==
--- dev/tomcat/tomcat-10/v10.1.11/KEYS (added)
+++ dev/tomcat/tomcat-10/v10.1.11/KEYS Thu Jul  6 14:16:55 2023
@@ -0,0 +1,562 @@
+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).
+
+
+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-
+Comment: GPGTools - http://gpgtools.org
+
+mQINBEq0DukBEAD4jovHOPJDxoD+JnO1Go2kiwpgRULasGlrVKuSUdP6wzcaqWmX
+pqtOJKKwW2MQFQLmg7nQ9RjJwy3QCbKNDJQA/bwbQT1F7WzTCz2S6vxC4zxKck4t
+6RZBq2dJsYKF0CEh6ZfY4dmKvhq+3istSoFRdHYoOPGWZpuRDqfZPdGm/m335/6K
+GH59oysn1NE7a2a+kZzjBSEgv23+l4Z1Rg7+fpz1JcdHSdC2Z+ZRxML25eVatRVz
+4yvDOZItqDURP24zWOodxgboldV6Y88C3v/7KRR+1vklzkuA2FqF8Q4r/2f0su7M
+UVviQcy29y/RlLSDTTYoVlCZ1ni14qFU7Hpw43KJtgXmcUwq31T1+SlXdYjNJ1aF
+kUi8BjCHDcSgE/IReKUanjHzm4XSymKDTeqqzidi4k6PDD4jyHb8k8vxi6qT6Udn
+lcfo5NBkkUT1TauhEy8ktHhbl9k60BvvMBP9l6cURiJg1WS77egI4P/82oPbzzFi
+GFqXyJKULVgxtdQ3JikCpodp3f1fh6PlYZwkW4xCJLJucJ5MiQp07HAkMVW5w+k8
+Xvuk4i5quh3N+2kzKHOOiQCDmN0sz0Xj

Re: [VOTE] Release Apache Tomcat 9.0.78

[Rémy Maucherat]

On Tue, Jul 4, 2023 at 3:28 PM Rémy Maucherat  wrote:
>
> The proposed Apache Tomcat 9.0.78 release is now available for voting.
>
> The notable changes compared to 9.0.76 are:
>
> - Add ContextNamingInfoListener, a listener which creates context naming
>information environment entries
>
> - Add PropertiesRoleMappingListener, a listener which populates the
>context's role mapping from a properties file.
>
> Along with lots of other bug fixes and improvements.
>
> For full details, see the changelog:
> https://nightlies.apache.org/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.78/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1444
> The tag is:
> https://github.com/apache/tomcat/tree/9.0.78
> caf0baff34789335ae23a56337db252c2a578456
>
> The proposed 9.0.78 release is:
> [ ] -1, Broken - do not release
> [X] +1, Stable - go ahead and release as 9.0.78

Rémy

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

[VOTE] Release Apache Tomcat 10.1.11

[Christopher Schultz]

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

The notable changes compared to 10.1.10 are:

- Add ContextNamingInfoListener, a listener which creates context naming
   information environment entries

- Add PropertiesRoleMappingListener, a listener which populates the
   context's role mapping from a properties file.

For full details, see the change log:
https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/changelog.html

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.


It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.11/

The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1445

The tag is:
https://github.com/apache/tomcat/tree/10.1.11
ef302041bff196e8b045ebc27599a45ef51374b8

The proposed 10.1.11 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 10.1.11

-
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: Add release date for 8.5.90.

[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 579b39629c Add release date for 8.5.90.
579b39629c is described below

commit 579b39629c8ae1513ba237994f3c06e313c9d2d4
Author: schultz 
AuthorDate: Thu Jul 6 07:43:10 2023 -0700

Add release date for 8.5.90.
---
 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 55415291e6..0b0ebf39d6 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -207,7 +207,7 @@
 
   
 
-
+
   
 
   


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

[tomcat] tag 8.5.91 created (now d5dc384e75)

[schultz]

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

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


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

 new d5dc384e75 Tag 8.5.91

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] 01/01: Tag 8.5.91

[schultz]

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

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

commit d5dc384e752d54fcb531c0e86b2ee1ee73b1404e
Author: schultz 
AuthorDate: Thu Jul 6 07:59:05 2023 -0700

Tag 8.5.91
---
 build.properties.release |  52 +++
 res/install-win/Uninstall.exe.sig| Bin 0 -> 10251 bytes
 res/install-win/tomcat-installer.exe.sig | Bin 0 -> 10251 bytes
 res/maven/mvn.properties.release |  27 
 webapps/docs/changelog.xml   |   2 +-
 5 files changed, 80 insertions(+), 1 deletion(-)

diff --git a/build.properties.release b/build.properties.release
new file mode 100644
index 00..6a77be5b1b
--- /dev/null
+++ b/build.properties.release
@@ -0,0 +1,52 @@
+# -
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -
+
+# This file was auto-generated by the pre-release Ant target.
+
+# Any unwanted settings may be over-ridden in a build.properties file located
+# in the same directory as this file.
+
+# Set the version-dev to "" (empty string) as this is not a development 
release.
+version.dev=
+
+# Ensure consistent timestamps for reproducible builds.
+ant.tstamp.now.iso=2023-07-06T14:43:48Z
+
+# Enable insertion of detached signatures into the Windows installer.
+do.codesigning=true
+
+# Re-use the same GPG executable.
+gpg.exec=C:/Program Files (x86)/gnupg/bin/gpg.exe
+
+# Reproducible builds require the use of the build tools defined below. The
+# vendors (where appropriate) and versions must match exactly for a 
reproducible
+# build since this data is embedded in various files, particularly JAR file
+# manifests, as part of the build process.
+#
+# Apache Ant:  Apache Ant(TM) version 1.10.12 compiled on October 13 2021
+#
+# Java Name:   OpenJDK 64-Bit Server VM
+# Java Vendor: Eclipse Adoptium
+# Java Version:11.0.19+7
+
+# The following is provided for information only. Builds will be repeatable
+# whether or not the build environment in consistent with this information.
+#
+# OS:  amd64 Windows 10 10.0
+# File encoding:   Cp1252
+#
+# Release Manager: schultz
diff --git a/res/install-win/Uninstall.exe.sig 
b/res/install-win/Uninstall.exe.sig
new file mode 100644
index 00..ee87ef7ade
Binary files /dev/null and b/res/install-win/Uninstall.exe.sig differ
diff --git a/res/install-win/tomcat-installer.exe.sig 
b/res/install-win/tomcat-installer.exe.sig
new file mode 100644
index 00..25f2fad62f
Binary files /dev/null and b/res/install-win/tomcat-installer.exe.sig differ
diff --git a/res/maven/mvn.properties.release b/res/maven/mvn.properties.release
new file mode 100644
index 00..0d53d80269
--- /dev/null
+++ b/res/maven/mvn.properties.release
@@ -0,0 +1,27 @@
+# -
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -
+
+# This file was auto-generated by the pre-release Ant target.
+
+# Remove "-dev" from the version since this is not a development release.
+maven.asf.release.deploy.version=8.5.91
+
+# Re-use the same GPG executable.
+gpg.exec=C:/Program Files (x86)/gnupg/bin/gpg.exe
+
+# Set the user name to use

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

[schultz]

Added: dev/tomcat/tomcat-8/v8.5.91/bin/extras/catalina-ws.jar.asc
==
--- dev/tomcat/tomcat-8/v8.5.91/bin/extras/catalina-ws.jar.asc (added)
+++ dev/tomcat/tomcat-8/v8.5.91/bin/extras/catalina-ws.jar.asc Thu Jul  6 
15:01:14 2023
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAmSm1EEACgkQHPApP6U8
+pFgHNg/9Fz4I4FsMkaHaZ3LHdXtv7R7vQJwydGbPLLMiASEqp1K3aB3Iu6aWwmFA
+iIYnW8iHwUzDnpJ7VWJezHoKKL/Etg37WRY0e36oqkG/TRv33jb1tZpiZfxo6mxq
+yQZT2DIJjRjPAgYgVOH+rSN+I89cot8gyU8+Yliz0ptdDE0Bgs5ovC2e77YBkeLM
+BFJ249G4+TxG7aWjmsu80VRt2qDYGKbj1tmLUa8G8o1i6r+yTpavTK0Kv4X93ODK
+EejxFYnD/jedoVFqwgBqmo5aPgWjldryxBqkdqwStZ5rB8BE/GD8HfHEd0N14NTO
+uotVgFlVio63L/2AYtSFcRC4BY3pS3jif8Qz6TLRmoac5+t+A2l0mP4ZSSkBCFou
+g04kanTqjy9Y3z6fIkPKeGWQ4SgV4X02okiv5UgeAUwvJ9Ipv29CtF5KMi/9Fasa
+8Cbyh/4JVnh1iddxvJQ90lCtyZJ4A535FIlc/tksRbPM9Jp11/Sb1+f1w1seCwaU
+gNSXCgsz0qO0EdhU+sy+h0vclL38bHh6JkQ3KiaxI7B7wB6UjL+Ykx63PfanPc9T
+KXfFz19TzEFsaawg2ARdv9aGxyrzhlDY+G0colL1jQS2ALurX8EyYsY7UAsNXNTl
+4O/ID9hz999SzlNKcQLXaXFQHttanWH1dM/S36lXQ0rh/QC0cK4=
+=hchr
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-8/v8.5.91/bin/extras/catalina-ws.jar.sha512
==
--- dev/tomcat/tomcat-8/v8.5.91/bin/extras/catalina-ws.jar.sha512 (added)
+++ dev/tomcat/tomcat-8/v8.5.91/bin/extras/catalina-ws.jar.sha512 Thu Jul  6 
15:01:14 2023
@@ -0,0 +1 @@
+4aded7b220a49b270e9d2a3875551185d1cf273cbea600aea1438b5f9856fd21a6da5c66a1f3002fbd880b13d1215cb38d5d5de9a2465a29cffaddb5a6c8f618
 *catalina-ws.jar
\ No newline at end of file

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

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

Added: dev/tomcat/tomcat-8/v8.5.91/src/apache-tomcat-8.5.91-src.tar.gz.asc
==
--- dev/tomcat/tomcat-8/v8.5.91/src/apache-tomcat-8.5.91-src.tar.gz.asc (added)
+++ dev/tomcat/tomcat-8/v8.5.91/src/apache-tomcat-8.5.91-src.tar.gz.asc Thu Jul 
 6 15:01:14 2023
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAmSm1hcACgkQHPApP6U8
+pFhMdBAAxiC5JVX9drbQzsUFKoGh88QuWjMkZzulW2AQUvV31TUYrDqyx0IhS/GE
+2ASB1L41Q9FURKnfujLXV9Fzzy+by+WFaZYkCHOCE+Jl5N8qNeW5zIBDLIdZY3Ot
+Kd5Fll/SaiDGuscYMpyjOYxssJHkLysD/MAG8Bbn4KF2UQCe0IXnA2k1wBoO5kDE
++9NhSgPi4tsX5ffNNaSiMq39Hevq4AzTyqp256PEk9j7Crvae7hkVSFqVah07Nmy
+Ranu5It7f0N3v5PtYwsFCK0dtHQk/e4Zo2mmdtE21V4I2gzdbgDeVzP3fC6L1QzL
+cVMoj0HHhdcrPyrUWl2rSGd9UrETF+c6x5WCXTbbl40EWuKoea+FYaCHMXXJab0k
+4YaHn+i399kUzAQgZecX9AlZw5ZPgoaL0XEHI76FfYaOr7/RG1LqVc+3vDRV8o6z
+0dxv93z9G2dGu9DOUHbkpZKis+NgRjmbd1x4ETtEhB9vq2MWcj43HPVuanAgDpF4
+dpChHNiru6H2Q9mBDf6X+d6siuX2j+c/2lEpLVKFyz6Cju/Q5oN6f3KEj1no0+8Z
+rrkHVWPd6oCdpJ0EB8slJ0+xsdS1EAlYUSFx73iERhvy2uK633hui1h280+hGafQ
+lyZkM2gznfwC96Pk0n1v9HlTin4gcaCodd/wvGhjofMg+rWZLFI=
+=gaQU
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-8/v8.5.91/src/apache-tomcat-8.5.91-src.tar.gz.sha512
==
--- dev/tomcat/tomcat-8/v8.5.91/src/apache-tomcat-8.5.91-src.tar.gz.sha512 
(added)
+++ dev/tomcat/tomcat-8/v8.5.91/src/apache-tomcat-8.5.91-src.tar.gz.sha512 Thu 
Jul  6 15:01:14 2023
@@ -0,0 +1 @@
+f3a69630e3cd144c74ea3edce68f8e39bc67e734bf02822caf7c6e59a2e4db404a5c0bdf40a22614b6dd85bac3dc5821e6b74c56a1147655f602cdf39fb651f5
 *apache-tomcat-8.5.91-src.tar.gz
\ No newline at end of file

Added: dev/tomcat/tomcat-8/v8.5.91/src/apache-tomcat-8.5.91-src.zip
==
Binary file - no diff available.

Propchange: dev/tomcat/tomcat-8/v8.5.91/src/apache-tomcat-8.5.91-src.zip
--
svn:mime-type = application/octet-stream

Added: dev/tomcat/tomcat-8/v8.5.91/src/apache-tomcat-8.5.91-src.zip.asc
==
--- dev/tomcat/tomcat-8/v8.5.91/src/apache-tomcat-8.5.91-src.zip.asc (added)
+++ dev/tomcat/tomcat-8/v8.5.91/src/apache-tomcat-8.5.91-src.zip.asc Thu Jul  6 
15:01:14 2023
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAmSm1cAACgkQHPApP6U8
+pFhqeA//dmuFbrmz7Ltfj3VLSJGfsHN2uZCI15RrVfFi92gbkxDsflbAemLWZAN/
+dkxgSwMmbgA++7Ndo1vilBK+DKzKOwWt8Oy/S7kgN/r6WrbgwZJKuDpiPRRxoBqo
+oFseYV3GwxXpg90E+HaPTjulAylZyBS/WV+p++ZFnslwoGSG2Ztf0w2ink6saQUP
+gO43+WsB5XaWC0CSinZvf5zUibnlCXiCX5zh0rtSaeZVNlDN/EbXAi8MKmnf1r3P
+qlTQOPhOdK6yOG9HzbllYxe91JElf1/+w/SFlFfy8TWm9DwUOZUwUC1l5HssRONp
+2y0COBc6dhevYOZ909ww9gnzisczICn1EKsHa6lN

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

[schultz]

Author: schultz
Date: Thu Jul  6 15:01:14 2023
New Revision: 62853

Log:
Upload v8.5.91 for voting.

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

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

Added: dev/tomcat/tomcat-8/v8.5.91/KEYS
==
--- dev/tomcat/tomcat-8/v8.5.91/KEYS (added)
+++ dev/tomcat/tomcat-8/v8.5.91/KEYS Thu Jul  6 15:01:14 2023
@@ -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/MVS7cQU0II8BKo2Akr+1FZah+sD4ovK8SfkMXUQUbTeefTntsAQKyyU
+9M9tA/9on9tBiHFl0qVJht6N4GiJ2G689v7rS2giLgKjetjiCduxBXEgvUSuyQID
+nF9ATrpXjITwsRlGKFmpZiFm5oCeCXihIVH0u6q066xNW2AXkLVoJ1l1Rs2Z0lsb
+0cq3xEAcwAmYLKQvCtgDV8CYgWKVmPi+49rSuQn7Lo9l02OUbLQgQ

[Bug 66680] New: [StandardSession] Misleading warning "Cannot serialize Principal object for session"

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=66680

Bug ID: 66680
   Summary: [StandardSession] Misleading warning "Cannot serialize
Principal object for session"
   Product: Tomcat 10
   Version: 10.1.0
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: tsvetyorda...@gmail.com
  Target Milestone: --

We have recently started using session persistence capability with
persistAuthentication="true".
When a user is logged-out of the system and redirected to the login page, they
are given a session whose principle object is null.

If in that period the tomcat server is restarted, the doWriteObject from
org.apache.catalina.session.StandardSession is called where on line 1489 it
tries to check if the sessionPrincipal is serializable, but does not check if
it is null before that -
(https://github.com/apache/tomcat/blob/10.1.x/java/org/apache/catalina/session/StandardSession.java#L1489
).

If the principal is null (like in the above-described scenario) - then the
manager logs a warning message saying it cannot serialize the principal for the
session. 
This is somewhat misleading as there is simply no principal to serialize.

My suggestion here would be to either add a null-check before logging the
warning message, or add a configuration option where this particular case (one
of a null principal) can be toggled, perhaps something like
'warnNullPrincipalSerialize'.

Without such an ability we would get a lot of these warning messages in our
production and we would not know which ones came from a session that is simply
unauthenticated (i.e. principal is null), and which ones came from an actual
issue with serializing the principal of an authenticated user.

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

[tomcat] branch 8.5.x updated: Increment version numbers for next development cycle.

[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 27a7f9526d Increment version numbers for next development cycle.
27a7f9526d is described below

commit 27a7f9526dd1db078e87449c3cc41ece5f7b142e
Author: Christopher Schultz 
AuthorDate: Thu Jul 6 11:27:57 2023 -0400

Increment version numbers for next development cycle.
---
 build.properties.default | 2 +-
 res/maven/mvn.properties.default | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 672be22f80..f93f07d746 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -31,7 +31,7 @@
 # - Version Control Flags -
 version.major=8
 version.minor=5
-version.build=91
+version.build=92
 version.patch=0
 version.suffix=
 version.dev=-dev
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 2240b02ca0..6ab2be5f56 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=8.5.91
+maven.asf.release.deploy.version=8.5.92
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib


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

[tomcat] branch 10.1.x updated: Increment version numbers for next development cycle.

[schultz]

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

schultz pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/10.1.x by this push:
 new b20c57a591 Increment version numbers for next development cycle.
b20c57a591 is described below

commit b20c57a5917e73e9a4680559d0f129857d18b440
Author: Christopher Schultz 
AuthorDate: Thu Jul 6 11:28:52 2023 -0400

Increment version numbers for next development cycle.
---
 build.properties.default | 2 +-
 res/maven/mvn.properties.default | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index e03fb7a009..f4edd41bf3 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -31,7 +31,7 @@
 # - Version Control Flags -
 version.major=10
 version.minor=1
-version.build=11
+version.build=12
 version.patch=0
 version.suffix=
 version.dev=-dev
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index e409c52740..9f239f0360 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.1.11
+maven.asf.release.deploy.version=10.1.12
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib


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

[Christopher Schultz]

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

The notable changes compared to 8.5.90 are:

- Add ContextNamingInfoListener, a listener which creates context naming
  information environment entries.

- Add PropertiesRoleMappingListener, a listener which populates the
  context's role mapping from a properties file.

Along with lots of other bug fixes and improvements.

For full details, see the changelog:
https://nightlies.apache.org/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.91/

The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1446

The tag is:
https://github.com/apache/tomcat/tree/8.5.91/
d5dc384e752d54fcb531c0e86b2ee1ee73b1404e

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

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

svn commit: r1910827 - in /tomcat/site/trunk: docs/migration-11.0.html xdocs/migration-11.0.xml

[markt]

Author: markt
Date: Thu Jul  6 20:36:15 2023
New Revision: 1910827

URL: http://svn.apache.org/viewvc?rev=1910827&view=rev
Log:
Test new diff tool

Modified:
tomcat/site/trunk/docs/migration-11.0.html
tomcat/site/trunk/xdocs/migration-11.0.xml

Modified: tomcat/site/trunk/docs/migration-11.0.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-11.0.html?rev=1910827&r1=1910826&r2=1910827&view=diff
==
--- tomcat/site/trunk/docs/migration-11.0.html (original)
+++ tomcat/site/trunk/docs/migration-11.0.html Thu Jul  6 20:36:15 2023
@@ -120,13 +120,13 @@ versions of Apache Tomcat.
 
 Note: If there are no differences you will see an error page.
 
-https://gitbox.apache.org/repos/asf"; method="get" 
target="_blank">
+https://gitbox.apache.org/filediff"; method="get" 
target="_blank">
 
-
-
+
 
 Configuration file:
-
+
+All configuration files
 catalina.policy
 catalina.properties
 context.xml
@@ -137,7 +137,7 @@ versions of Apache Tomcat.
 
 
 Old version:
-
+
 11.0.0-M1
 11.0.0-M3
 11.0.0-M4
@@ -145,7 +145,7 @@ versions of Apache Tomcat.
 11.0.0-M6
 11.0.0-M7
 , new version:
-
+
 11.0.0-M1
 11.0.0-M3
 11.0.0-M4

Modified: tomcat/site/trunk/xdocs/migration-11.0.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-11.0.xml?rev=1910827&r1=1910826&r2=1910827&view=diff
==
--- tomcat/site/trunk/xdocs/migration-11.0.xml (original)
+++ tomcat/site/trunk/xdocs/migration-11.0.xml Thu Jul  6 20:36:15 2023
@@ -135,15 +135,15 @@ versions of Apache Tomcat.
 
 Note: If there are no differences you will see an error page.
 
-https://gitbox.apache.org/repos/asf";
+https://gitbox.apache.org/filediff";
   method="get"
   target="_blank">
 
-
-
+
 
 Configuration file:
-
+
+All configuration files
 catalina.policy
 catalina.properties
 context.xml
@@ -154,7 +154,7 @@ versions of Apache Tomcat.
 
 
 Old version:
-
+
 11.0.0-M1
 11.0.0-M3
 11.0.0-M4
@@ -162,7 +162,7 @@ versions of Apache Tomcat.
 11.0.0-M6
 11.0.0-M7
 , new version:
-
+
 11.0.0-M1
 11.0.0-M3
 11.0.0-M4



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

svn commit: r1910829 - in /tomcat/site/trunk: docs/migration-10.1.html docs/migration-7.html docs/migration-85.html docs/migration-9.html xdocs/migration-10.1.xml xdocs/migration-7.xml xdocs/migration

[markt]

Author: markt
Date: Thu Jul  6 20:43:10 2023
New Revision: 1910829

URL: http://svn.apache.org/viewvc?rev=1910829&view=rev
Log:
Update diff feature to use new GitBox service

Modified:
tomcat/site/trunk/docs/migration-10.1.html
tomcat/site/trunk/docs/migration-7.html
tomcat/site/trunk/docs/migration-85.html
tomcat/site/trunk/docs/migration-9.html
tomcat/site/trunk/xdocs/migration-10.1.xml
tomcat/site/trunk/xdocs/migration-7.xml
tomcat/site/trunk/xdocs/migration-85.xml
tomcat/site/trunk/xdocs/migration-9.xml

Modified: tomcat/site/trunk/docs/migration-10.1.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-10.1.html?rev=1910829&r1=1910828&r2=1910829&view=diff
==
--- tomcat/site/trunk/docs/migration-10.1.html (original)
+++ tomcat/site/trunk/docs/migration-10.1.html Thu Jul  6 20:43:10 2023
@@ -145,13 +145,12 @@ versions of Apache Tomcat.
 
 Note: If there are no differences you will see an error page.
 
-https://gitbox.apache.org/repos/asf"; method="get" 
target="_blank">
+https://gitbox.apache.org/filediff"; method="get" 
target="_blank">
 
-
-
+
 
 Configuration file:
-
+
 catalina.policy
 catalina.properties
 context.xml
@@ -162,7 +161,7 @@ versions of Apache Tomcat.
 
 
 Old version:
-
+
 10.1.0-M1
 10.1.0-M2
 10.1.0-M4
@@ -188,7 +187,7 @@ versions of Apache Tomcat.
 10.1.9
 10.1.10
 , new version:
-
+
 10.1.0-M1
 10.1.0-M2
 10.1.0-M4

Modified: tomcat/site/trunk/docs/migration-7.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-7.html?rev=1910829&r1=1910828&r2=1910829&view=diff
==
--- tomcat/site/trunk/docs/migration-7.html (original)
+++ tomcat/site/trunk/docs/migration-7.html Thu Jul  6 20:43:10 2023
@@ -521,13 +521,12 @@ versions of Apache Tomcat.
 
 Note: If there are no differences you will see an error page.
 
-https://gitbox.apache.org/repos/asf"; method="get" 
target="_blank">
+https://gitbox.apache.org/filediff"; method="get" 
target="_blank">
 
-
-
+
 
 Configuration file:
-
+
 catalina.policy
 catalina.properties
 context.xml
@@ -538,7 +537,7 @@ versions of Apache Tomcat.
 
 
 Old version:
-
+
 7.0.0
 7.0.2
 7.0.4
@@ -617,7 +616,7 @@ versions of Apache Tomcat.
 7.0.108
 7.0.109
 , new version:
-
+
 7.0.0
 7.0.2
 7.0.4

Modified: tomcat/site/trunk/docs/migration-85.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-85.html?rev=1910829&r1=1910828&r2=1910829&view=diff
==
--- tomcat/site/trunk/docs/migration-85.html (original)
+++ tomcat/site/trunk/docs/migration-85.html Thu Jul  6 20:43:10 2023
@@ -299,13 +299,12 @@ versions of Apache Tomcat.
 
 Note: If there are no differences you will see an error page.
 
-https://gitbox.apache.org/repos/asf"; method="get" 
target="_blank">
+https://gitbox.apache.org/filediff"; method="get" 
target="_blank">
 
-
-
+
 
 Configuration file:
-
+
 catalina.policy
 catalina.properties
 context.xml
@@ -316,7 +315,7 @@ versions of Apache Tomcat.
 
 
 Old version:
-
+
 8.5.0
 8.5.2
 8.5.3
@@ -392,7 +391,7 @@ versions of Apache Tomcat.
 8.5.89
 8.5.90
 , new version:
-
+
 8.5.0
 8.5.2
 8.5.3

Modified: tomcat/site/trunk/docs/migration-9.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-9.html?rev=1910829&r1=1910828&r2=1910829&view=diff
==
--- tomcat/site/trunk/docs/migration-9.html (original)
+++ tomcat/site/trunk/docs/migration-9.html Thu Jul  6 20:43:10 2023
@@ -366,13 +366,12 @@ versions of Apache Tomcat.
 
 Note: If there are no differences you will see an error page.
 
-https://gitbox.apache.org/repos/asf"; method="get" 
target="_blank">
+https://gitbox.apache.org/filediff"; method="get" 
target="_blank">
 
-
-
+
 
 Configuration file:
-
+
 catalina.policy
 catalina.properties
 context.xml
@@ -383,7 +382,7 @@ versions of Apache Tomcat.
 
 
 Old version:
-
+
 9.0.0-M1
 9.0.0-M3
 9.0.0-M4
@@ -462,7 +461,7 @@ versions of Apache Tomcat.
 9.0.74
 9.0.75
 , new version:
-
+
 9.0.0-M1
 9.0.0-M3
 9.0.0-M4

Modified: tomcat/site/trunk/xdocs/migration-10.1.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-10.1.xml?rev=1910829&r1=1910828&r2=1910829&view=diff
==
--- tomcat/site/trunk/xdocs/migration-10.1.xml (origin

svn commit: r1910830 - in /tomcat/site/trunk: docs/migration-10.1.html docs/migration-7.html docs/migration-85.html docs/migration-9.html xdocs/migration-10.1.xml xdocs/migration-7.xml xdocs/migration

[markt]

Author: markt
Date: Thu Jul  6 20:45:17 2023
New Revision: 1910830

URL: http://svn.apache.org/viewvc?rev=1910830&view=rev
Log:
Add all files option

Modified:
tomcat/site/trunk/docs/migration-10.1.html
tomcat/site/trunk/docs/migration-7.html
tomcat/site/trunk/docs/migration-85.html
tomcat/site/trunk/docs/migration-9.html
tomcat/site/trunk/xdocs/migration-10.1.xml
tomcat/site/trunk/xdocs/migration-7.xml
tomcat/site/trunk/xdocs/migration-85.xml
tomcat/site/trunk/xdocs/migration-9.xml

Modified: tomcat/site/trunk/docs/migration-10.1.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-10.1.html?rev=1910830&r1=1910829&r2=1910830&view=diff
==
--- tomcat/site/trunk/docs/migration-10.1.html (original)
+++ tomcat/site/trunk/docs/migration-10.1.html Thu Jul  6 20:45:17 2023
@@ -151,6 +151,7 @@ versions of Apache Tomcat.
 
 Configuration file:
 
+All configuration files
 catalina.policy
 catalina.properties
 context.xml

Modified: tomcat/site/trunk/docs/migration-7.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-7.html?rev=1910830&r1=1910829&r2=1910830&view=diff
==
--- tomcat/site/trunk/docs/migration-7.html (original)
+++ tomcat/site/trunk/docs/migration-7.html Thu Jul  6 20:45:17 2023
@@ -527,6 +527,7 @@ versions of Apache Tomcat.
 
 Configuration file:
 
+All configuration files
 catalina.policy
 catalina.properties
 context.xml

Modified: tomcat/site/trunk/docs/migration-85.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-85.html?rev=1910830&r1=1910829&r2=1910830&view=diff
==
--- tomcat/site/trunk/docs/migration-85.html (original)
+++ tomcat/site/trunk/docs/migration-85.html Thu Jul  6 20:45:17 2023
@@ -305,6 +305,7 @@ versions of Apache Tomcat.
 
 Configuration file:
 
+All configuration files
 catalina.policy
 catalina.properties
 context.xml

Modified: tomcat/site/trunk/docs/migration-9.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-9.html?rev=1910830&r1=1910829&r2=1910830&view=diff
==
--- tomcat/site/trunk/docs/migration-9.html (original)
+++ tomcat/site/trunk/docs/migration-9.html Thu Jul  6 20:45:17 2023
@@ -372,6 +372,7 @@ versions of Apache Tomcat.
 
 Configuration file:
 
+All configuration files
 catalina.policy
 catalina.properties
 context.xml

Modified: tomcat/site/trunk/xdocs/migration-10.1.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-10.1.xml?rev=1910830&r1=1910829&r2=1910830&view=diff
==
--- tomcat/site/trunk/xdocs/migration-10.1.xml (original)
+++ tomcat/site/trunk/xdocs/migration-10.1.xml Thu Jul  6 20:45:17 2023
@@ -168,6 +168,7 @@ versions of Apache Tomcat.
 
 Configuration file:
 
+All configuration files
 catalina.policy
 catalina.properties
 context.xml

Modified: tomcat/site/trunk/xdocs/migration-7.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-7.xml?rev=1910830&r1=1910829&r2=1910830&view=diff
==
--- tomcat/site/trunk/xdocs/migration-7.xml (original)
+++ tomcat/site/trunk/xdocs/migration-7.xml Thu Jul  6 20:45:17 2023
@@ -545,6 +545,7 @@ versions of Apache Tomcat.
 
 Configuration file:
 
+All configuration files
 catalina.policy
 catalina.properties
 context.xml

Modified: tomcat/site/trunk/xdocs/migration-85.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-85.xml?rev=1910830&r1=1910829&r2=1910830&view=diff
==
--- tomcat/site/trunk/xdocs/migration-85.xml (original)
+++ tomcat/site/trunk/xdocs/migration-85.xml Thu Jul  6 20:45:17 2023
@@ -322,6 +322,7 @@ versions of Apache Tomcat.
 
 Configuration file:
 
+All configuration files
 catalina.policy
 catalina.properties
 context.xml

Modified: tomcat/site/trunk/xdocs/migration-9.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-9.xml?rev=1910830&r1=1910829&r2=1910830&view=diff
==
--- tomcat/site/trunk/xdocs/migration-9.xml (original)
+++ tomcat/site/trunk/xdocs/migration-9.xml Thu Jul  6 20:45:17 2023
@@ -389,6 +389,7 @@ versions of Apache Tomcat.
 
 Configuration file:
 
+All configuration files
 catalina.policy
 catalina.properties
 context.xml



-
To unsubscribe

svn commit: r1910832 - in /tomcat/site/trunk: docs/migration-10.html xdocs/migration-10.xml

[markt]

Author: markt
Date: Thu Jul  6 20:46:59 2023
New Revision: 1910832

URL: http://svn.apache.org/viewvc?rev=1910832&view=rev
Log:
Update config diff for 10.0.x

Modified:
tomcat/site/trunk/docs/migration-10.html
tomcat/site/trunk/xdocs/migration-10.xml

Modified: tomcat/site/trunk/docs/migration-10.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-10.html?rev=1910832&r1=1910831&r2=1910832&view=diff
==
--- tomcat/site/trunk/docs/migration-10.html (original)
+++ tomcat/site/trunk/docs/migration-10.html Thu Jul  6 20:46:59 2023
@@ -189,13 +189,13 @@ versions of Apache Tomcat.
 
 Note: If there are no differences you will see an error page.
 
-https://gitbox.apache.org/repos/asf"; method="get" 
target="_blank">
+https://gitbox.apache.org/filediff"; method="get" 
target="_blank">
 
-
-
+
 
 Configuration file:
-
+
+All configuration files
 catalina.policy
 catalina.properties
 context.xml
@@ -206,7 +206,7 @@ versions of Apache Tomcat.
 
 
 Old version:
-
+
 10.0.0-M1
 10.0.0-M3
 10.0.0-M4
@@ -238,7 +238,7 @@ versions of Apache Tomcat.
 10.0.26
 10.0.27
 , new version:
-
+
 10.0.0-M1
 10.0.0-M3
 10.0.0-M4

Modified: tomcat/site/trunk/xdocs/migration-10.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-10.xml?rev=1910832&r1=1910831&r2=1910832&view=diff
==
--- tomcat/site/trunk/xdocs/migration-10.xml (original)
+++ tomcat/site/trunk/xdocs/migration-10.xml Thu Jul  6 20:46:59 2023
@@ -204,15 +204,15 @@ versions of Apache Tomcat.
 
 Note: If there are no differences you will see an error page.
 
-https://gitbox.apache.org/repos/asf";
+https://gitbox.apache.org/filediff";
   method="get"
   target="_blank">
 
-
-
+
 
 Configuration file:
-
+
+All configuration files
 catalina.policy
 catalina.properties
 context.xml
@@ -223,7 +223,7 @@ versions of Apache Tomcat.
 
 
 Old version:
-
+
 10.0.0-M1
 10.0.0-M3
 10.0.0-M4
@@ -255,7 +255,7 @@ versions of Apache Tomcat.
 10.0.26
 10.0.27
 , new version:
-
+
 10.0.0-M1
 10.0.0-M3
 10.0.0-M4



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

svn commit: r1910834 - in /tomcat/site/trunk: docs/migration-10.html xdocs/migration-10.xml

[markt]

Author: markt
Date: Thu Jul  6 20:47:39 2023
New Revision: 1910834

URL: http://svn.apache.org/viewvc?rev=1910834&view=rev
Log:
Fix typo

Modified:
tomcat/site/trunk/docs/migration-10.html
tomcat/site/trunk/xdocs/migration-10.xml

Modified: tomcat/site/trunk/docs/migration-10.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-10.html?rev=1910834&r1=1910833&r2=1910834&view=diff
==
--- tomcat/site/trunk/docs/migration-10.html (original)
+++ tomcat/site/trunk/docs/migration-10.html Thu Jul  6 20:47:39 2023
@@ -191,7 +191,7 @@ versions of Apache Tomcat.
 
 https://gitbox.apache.org/filediff"; method="get" 
target="_blank">
 
-
+
 
 Configuration file:
 

Modified: tomcat/site/trunk/xdocs/migration-10.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-10.xml?rev=1910834&r1=1910833&r2=1910834&view=diff
==
--- tomcat/site/trunk/xdocs/migration-10.xml (original)
+++ tomcat/site/trunk/xdocs/migration-10.xml Thu Jul  6 20:47:39 2023
@@ -208,7 +208,7 @@ versions of Apache Tomcat.
   method="get"
   target="_blank">
 
-
+
 
 Configuration file:
 



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

[Mark Thomas]

On 06/07/2023 15:41, Christopher Schultz wrote:


The proposed 10.1.11 release is:
[ ] Broken - do not release
[X] Stable - go ahead and release as 10.1.11


The build is repeatable cross-platform (I rebuilt on Linux).

The unit tests pass on Linux, Windows and MacOS (M1 & Intel).

Mark

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

[Mark Thomas]

On 06/07/2023 16:31, Christopher Schultz wrote:


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


The build is reproducible cross-platform (I built on Linux).

Tests pass on Linux, MacOS (M1 & Intel) and Windows.

Mark

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