(tomcat) branch main updated: Handle response committed when processing read error

2024-04-09 Thread remm
This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
 new 2fa6bbc81f Handle response committed when processing read error
2fa6bbc81f is described below

commit 2fa6bbc81fd090b0563a506db62c94aabbfd29d0
Author: remm 
AuthorDate: Tue Apr 9 09:58:22 2024 +0200

Handle response committed when processing read error

BZ68862
---
 java/org/apache/catalina/connector/InputBuffer.java | 16 ++--
 webapps/docs/changelog.xml  |  4 
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/connector/InputBuffer.java 
b/java/org/apache/catalina/connector/InputBuffer.java
index 3957ec93c2..db85a3415a 100644
--- a/java/org/apache/catalina/connector/InputBuffer.java
+++ b/java/org/apache/catalina/connector/InputBuffer.java
@@ -316,9 +316,21 @@ public class InputBuffer extends Reader implements 
ByteChunk.ByteInputChannel, A
 Response response = request.getResponse();
 request.setAttribute(RequestDispatcher.ERROR_EXCEPTION, e);
 if (e instanceof SocketTimeoutException) {
-response.sendError(HttpServletResponse.SC_REQUEST_TIMEOUT);
+try {
+response.sendError(HttpServletResponse.SC_REQUEST_TIMEOUT);
+} catch(IllegalStateException ex) {
+// Response already committed
+response.setStatus(HttpServletResponse.SC_REQUEST_TIMEOUT);
+response.setError();
+}
 } else {
-response.sendError(HttpServletResponse.SC_BAD_REQUEST);
+try {
+response.sendError(HttpServletResponse.SC_BAD_REQUEST);
+} catch(IllegalStateException ex) {
+// Response already committed
+response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+response.setError();
+}
 }
 }
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c3708d8d0d..52b61cd0d1 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -147,6 +147,10 @@
 file via the Servlet API and the file is larger than
 Integer.MAX_VALUE. (markt)
   
+  
+68862: Handle possible response commit when processing read
+errors. (remm)
+  
 
   
   


-
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 response committed when processing read error

2024-04-09 Thread remm
This is an automated email from the ASF dual-hosted git repository.

remm 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 e7f902bb73 Handle response committed when processing read error
e7f902bb73 is described below

commit e7f902bb73c15a75e153c4a25036eabe788d3bb6
Author: remm 
AuthorDate: Tue Apr 9 09:58:22 2024 +0200

Handle response committed when processing read error

BZ68862
---
 java/org/apache/catalina/connector/InputBuffer.java | 16 ++--
 webapps/docs/changelog.xml  |  4 
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/connector/InputBuffer.java 
b/java/org/apache/catalina/connector/InputBuffer.java
index 03c9586630..e22ef9694c 100644
--- a/java/org/apache/catalina/connector/InputBuffer.java
+++ b/java/org/apache/catalina/connector/InputBuffer.java
@@ -332,9 +332,21 @@ public class InputBuffer extends Reader implements 
ByteChunk.ByteInputChannel, A
 Response response = request.getResponse();
 request.setAttribute(RequestDispatcher.ERROR_EXCEPTION, e);
 if (e instanceof SocketTimeoutException) {
-response.sendError(HttpServletResponse.SC_REQUEST_TIMEOUT);
+try {
+response.sendError(HttpServletResponse.SC_REQUEST_TIMEOUT);
+} catch(IllegalStateException ex) {
+// Response already committed
+response.setStatus(HttpServletResponse.SC_REQUEST_TIMEOUT);
+response.setError();
+}
 } else {
-response.sendError(HttpServletResponse.SC_BAD_REQUEST);
+try {
+response.sendError(HttpServletResponse.SC_BAD_REQUEST);
+} catch(IllegalStateException ex) {
+// Response already committed
+response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+response.setError();
+}
 }
 }
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5c21e3bb99..f15e82d6ef 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -122,6 +122,10 @@
 file via the Servlet API and the file is larger than
 Integer.MAX_VALUE. (markt)
   
+  
+68862: Handle possible response commit when processing read
+errors. (remm)
+  
 
   
   


-
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 response committed when processing read error

2024-04-09 Thread remm
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 0970fbaa12 Handle response committed when processing read error
0970fbaa12 is described below

commit 0970fbaa12a45b31117b94e2781f8b7fa5c37f07
Author: remm 
AuthorDate: Tue Apr 9 09:58:22 2024 +0200

Handle response committed when processing read error

BZ68862
---
 java/org/apache/catalina/connector/InputBuffer.java | 16 ++--
 webapps/docs/changelog.xml  |  4 
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/connector/InputBuffer.java 
b/java/org/apache/catalina/connector/InputBuffer.java
index b9f67768a9..162c6fd314 100644
--- a/java/org/apache/catalina/connector/InputBuffer.java
+++ b/java/org/apache/catalina/connector/InputBuffer.java
@@ -332,9 +332,21 @@ public class InputBuffer extends Reader implements 
ByteChunk.ByteInputChannel, A
 Response response = request.getResponse();
 request.setAttribute(RequestDispatcher.ERROR_EXCEPTION, e);
 if (e instanceof SocketTimeoutException) {
-response.sendError(HttpServletResponse.SC_REQUEST_TIMEOUT);
+try {
+response.sendError(HttpServletResponse.SC_REQUEST_TIMEOUT);
+} catch(IllegalStateException ex) {
+// Response already committed
+response.setStatus(HttpServletResponse.SC_REQUEST_TIMEOUT);
+response.setError();
+}
 } else {
-response.sendError(HttpServletResponse.SC_BAD_REQUEST);
+try {
+response.sendError(HttpServletResponse.SC_BAD_REQUEST);
+} catch(IllegalStateException ex) {
+// Response already committed
+response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+response.setError();
+}
 }
 }
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 358930589e..9f6d7f51b5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -139,6 +139,10 @@
 file via the Servlet API and the file is larger than
 Integer.MAX_VALUE. (markt)
   
+  
+68862: Handle possible response commit when processing read
+errors. (remm)
+  
 
   
   


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



[Bug 68862] InputBuffer#handleReadException breaks FailedRequestFilter

2024-04-09 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=68862

Remy Maucherat  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEW |RESOLVED

--- Comment #2 from Remy Maucherat  ---
Ok, it is better to fallback when there's a NPE due to commit. The fix will be
in 11.0.0-M19, 10.1.21 and 9.0.88.

-- 
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 10.1.x updated: Add release date

2024-04-09 Thread remm
This is an automated email from the ASF dual-hosted git repository.

remm 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 129b79c1a0 Add release date
129b79c1a0 is described below

commit 129b79c1a0dd1ac60f8d9625643220adafb61d8f
Author: remm 
AuthorDate: Tue Apr 9 10:04:48 2024 +0200

Add release date
---
 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 f15e82d6ef..269ca46299 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -159,7 +159,7 @@
 
   
 
-
+
   
 
   


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



[Bug 68862] InputBuffer#handleReadException breaks FailedRequestFilter

2024-04-09 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=68862

--- Comment #3 from Christoph Empl  ---
I don't think that this commit
(https://github.com/apache/tomcat/commit/e7f902bb73c15a75e153c4a25036eabe788d3bb6)
 fixes the error to the full extent.
In my use case, the IllegalStateException is thrown when FailedRequestFilter
calls Response#sendError.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 68862] InputBuffer#handleReadException breaks FailedRequestFilter

2024-04-09 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=68862

Christoph Empl  changed:

   What|Removed |Added

 Resolution|FIXED   |---
 Status|RESOLVED|REOPENED

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 68862] InputBuffer#handleReadException breaks FailedRequestFilter

2024-04-09 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=68862

--- Comment #4 from Remy Maucherat  ---
What is FailedRequestFilter ?

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



Buildbot success in on tomcat-11.0.x

2024-04-09 Thread buildbot
Build status: Build succeeded!
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/112/builds/1016
Blamelist: remm 
Build Text: build successful
Status Detected: restored build
Build Source Stamp: [branch main] 2fa6bbc81fd090b0563a506db62c94aabbfd29d0


Steps:

  worker_preparation: 0

  git: 0

  shell: 0

  shell_1: 0

  shell_2: 0

  shell_3: 0

  shell_4: 0

  shell_5: 0

  shell_6: 0

  compile: 1

  shell_7: 0

  shell_8: 0

  shell_9: 0

  shell_10: 0

  Rsync docs to nightlies.apache.org: 0

  shell_11: 0

  Rsync RAT to nightlies.apache.org: 0

  compile_1: 1

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



[Bug 68862] InputBuffer#handleReadException breaks FailedRequestFilter

2024-04-09 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=68862

--- Comment #5 from Christoph Empl  ---
org.apache.catalina.filters.FailedRequestFilter

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



Re: Does Tomcat 8.5.90 and newer versions no longer support Java 1.7?

2024-04-09 Thread Rémy Maucherat
On Tue, Apr 9, 2024 at 1:36 PM 胡桥  wrote:
>
> My testing environment:
> Tomcat version: 8.5.90
> Operating System: CentOS6.5
> JDK: 1.7.0_80
>
>
> I compiled JSVC using commons daemon-1.3.4-native src, and then started the 
> Tomcat service through JSVC.
>
>
> Error:
> Cannot find daemon loader org/apache/common/daemon/support/DaemonLoader
> Service exit with a return value of 1
>
>
> But I copied commons daemon.jar from 8.5.88 to replace commons daemon.jar 
> from 8.5.90, and then started successfully!
>
>
> In the end, I found out that the commons daemon.jar in 8.5.90 was actually 
> compiled using Java 8!
>
>
> But when I looked through the version instructions of Tomcat, I found that 
> 8.5. x is compatible with Java 7. And the META-INF/MANIFEST of commons 
> daemon.jar MF also explains how to compile using Java 1.7:
> X-Compile Target JDK: 1.7
>
>
> So, is 8.5.90 really compatible with JDK1.7? Or there is an issue with the 
> compilation of commons daemon.jar.

commons-daemon is a third party dependency, so this compilation issue
is possible ... It seems we haven't double checked this one basically.

All the classes that are compiled from the Tomcat repository are
release targeted at 1.7, and some important dependencies are verified
(like JDT).

BTW, Tomcat 8.5 is now EOL, you should plan to upgrade to Tomcat 9.0.

Rémy

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



(tomcat) branch main updated: Add sign key

2024-04-09 Thread remm
This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
 new 9c107b50f5 Add sign key
9c107b50f5 is described below

commit 9c107b50f5e25145d787dfe8a69a962d558c1ef1
Author: remm 
AuthorDate: Tue Apr 9 14:05:36 2024 +0200

Add sign key
---
 KEYS | 61 +
 1 file changed, 61 insertions(+)

diff --git a/KEYS b/KEYS
index 4b5ee9f4ca..9d46a9cfe6 100644
--- a/KEYS
+++ b/KEYS
@@ -451,3 +451,64 @@ 
wgS+SH6oAHlGwpxhhzXBlqZsHXm+w+2oazWUhxFFGEe5U245GEtNf0AznBMDWTqg
 yZUcTCEB33B2jQ9z0XUEp+6B2F5iZQ==
 =4AB7
 -END PGP PUBLIC KEY BLOCK-
+
+pub   rsa4096 2019-05-05 [SC]
+  48F8 E69F 6390 C9F2 5CFE  DCD2 6824 8959 359E 722B
+uid   [ultimate] Remy Maucherat 
+sig 368248959359E722B 2019-05-05  Remy Maucherat 
+sub   rsa4096 2019-05-05 [E]
+sig  68248959359E722B 2019-05-05  Remy Maucherat 
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+
+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
+=l4Ry
+-END PGP PUBLIC KEY BLOCK-
+
+
+


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



(tomcat) 01/01: Tag 11.0.0-M19

2024-04-09 Thread remm
This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to tag 11.0.0-M19
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 19e301275f23056e3c46ab296c87cf6e16fbe68f
Author: remm 
AuthorDate: Tue Apr 9 14:10:33 2024 +0200

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

diff --git a/build.properties.release b/build.properties.release
new file mode 100644
index 00..bfc17d64d9
--- /dev/null
+++ b/build.properties.release
@@ -0,0 +1,54 @@
+# -
+# 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=2024-04-09T12:06:10Z
+
+# Enable insertion of detached signatures into the Windows installer.
+do.codesigning=true
+
+# Re-use the same GPG executable.
+gpg.exec=/usr/bin/gpg
+
+# 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.14 compiled on August 16 2023
+#
+# Java Name:   OpenJDK 64-Bit Server VM
+# Java Vendor: Eclipse Adoptium
+# Java Version:22+36
+
+# The following is provided for information only. Builds will be repeatable
+# whether or not the build environment is consistent with this information.
+#
+# OS:  amd64 Linux 6.8.4-200.fc39.x86_64
+# File encoding:   UTF-8
+#
+# Release Manager: remm
+release-java-version=22+36
+release-ant-version=1.10.14
diff --git a/res/install-win/Uninstall.exe.sig 
b/res/install-win/Uninstall.exe.sig
new file mode 100644
index 00..52b3cd5fe8
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..43a67b8e2d
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..393a8b3fda
--- /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=11.0.0-M19
+
+# Re-use the same GPG executable.
+gpg.exec=/usr/bin/gpg
+
+# Set the user n

(tomcat) tag 11.0.0-M19 created (now 19e301275f)

2024-04-09 Thread remm
This is an automated email from the ASF dual-hosted git repository.

remm pushed a change to tag 11.0.0-M19
in repository https://gitbox.apache.org/repos/asf/tomcat.git


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

 new 19e301275f Tag 11.0.0-M19

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



svn commit: r68404 - in /dev/tomcat/tomcat-11/v11.0.0-M19: ./ bin/ bin/embed/ src/

2024-04-09 Thread remm
Author: remm
Date: Tue Apr  9 12:13:57 2024
New Revision: 68404

Log:
Upload Tomcat 11.0.0-M19 for voting

Added:
dev/tomcat/tomcat-11/v11.0.0-M19/
dev/tomcat/tomcat-11/v11.0.0-M19/KEYS
dev/tomcat/tomcat-11/v11.0.0-M19/README.html
dev/tomcat/tomcat-11/v11.0.0-M19/RELEASE-NOTES
dev/tomcat/tomcat-11/v11.0.0-M19/bin/
dev/tomcat/tomcat-11/v11.0.0-M19/bin/README.html

dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19-deployer.tar.gz   
(with props)

dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19-deployer.tar.gz.asc
   (with props)

dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19-deployer.tar.gz.sha512
dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19-deployer.zip  
 (with props)

dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19-deployer.zip.asc  
 (with props)

dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19-deployer.zip.sha512

dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19-fulldocs.tar.gz   
(with props)

dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19-fulldocs.tar.gz.asc
   (with props)

dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19-fulldocs.tar.gz.sha512

dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19-windows-x64.zip   
(with props)

dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19-windows-x64.zip.asc
   (with props)

dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19-windows-x64.zip.sha512
dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19.exe   (with 
props)
dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19.exe.asc   
(with props)
dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19.exe.sha512
dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19.tar.gz   
(with props)
dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19.tar.gz.asc   
(with props)
dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19.tar.gz.sha512
dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19.zip   (with 
props)
dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19.zip.asc   
(with props)
dev/tomcat/tomcat-11/v11.0.0-M19/bin/apache-tomcat-11.0.0-M19.zip.sha512
dev/tomcat/tomcat-11/v11.0.0-M19/bin/embed/

dev/tomcat/tomcat-11/v11.0.0-M19/bin/embed/apache-tomcat-11.0.0-M19-embed.tar.gz
   (with props)

dev/tomcat/tomcat-11/v11.0.0-M19/bin/embed/apache-tomcat-11.0.0-M19-embed.tar.gz.asc
   (with props)

dev/tomcat/tomcat-11/v11.0.0-M19/bin/embed/apache-tomcat-11.0.0-M19-embed.tar.gz.sha512

dev/tomcat/tomcat-11/v11.0.0-M19/bin/embed/apache-tomcat-11.0.0-M19-embed.zip   
(with props)

dev/tomcat/tomcat-11/v11.0.0-M19/bin/embed/apache-tomcat-11.0.0-M19-embed.zip.asc
   (with props)

dev/tomcat/tomcat-11/v11.0.0-M19/bin/embed/apache-tomcat-11.0.0-M19-embed.zip.sha512
dev/tomcat/tomcat-11/v11.0.0-M19/src/
dev/tomcat/tomcat-11/v11.0.0-M19/src/apache-tomcat-11.0.0-M19-src.tar.gz   
(with props)

dev/tomcat/tomcat-11/v11.0.0-M19/src/apache-tomcat-11.0.0-M19-src.tar.gz.asc   
(with props)

dev/tomcat/tomcat-11/v11.0.0-M19/src/apache-tomcat-11.0.0-M19-src.tar.gz.sha512
dev/tomcat/tomcat-11/v11.0.0-M19/src/apache-tomcat-11.0.0-M19-src.zip   
(with props)
dev/tomcat/tomcat-11/v11.0.0-M19/src/apache-tomcat-11.0.0-M19-src.zip.asc   
(with props)
dev/tomcat/tomcat-11/v11.0.0-M19/src/apache-tomcat-11.0.0-M19-src.zip.sha512

Added: dev/tomcat/tomcat-11/v11.0.0-M19/KEYS
==
--- dev/tomcat/tomcat-11/v11.0.0-M19/KEYS (added)
+++ dev/tomcat/tomcat-11/v11.0.0-M19/KEYS Tue Apr  9 12:13:57 2024
@@ -0,0 +1,514 @@
+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/IReKUanjHzm4XSymKDTeqqzidi4k6PDD4jyHb8k8vxi6

(tomcat) branch main updated: Next is M20

2024-04-09 Thread remm
This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
 new 61531b18be Next is M20
61531b18be is described below

commit 61531b18be5905da7d1e4d2282c6e6cae2a32a2a
Author: remm 
AuthorDate: Tue Apr 9 14:22:22 2024 +0200

Next is M20
---
 build.properties.default | 2 +-
 res/maven/mvn.properties.default | 2 +-
 webapps/docs/changelog.xml   | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 0780fd796b..0d6d7cabdc 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -33,7 +33,7 @@ version.major=11
 version.minor=0
 version.build=0
 version.patch=0
-version.suffix=-M19
+version.suffix=-M20
 version.dev=-dev
 
 # - Build tools -
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index c6ec943726..b24d1afa20 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=11.0.0-M19
+maven.asf.release.deploy.version=11.0.0-M20
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 52b61cd0d1..b380cb21e5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,7 +104,9 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
+
+
   
 
   


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



(tomcat) branch 10.1.x updated: Avoid sendError ISE

2024-04-09 Thread remm
This is an automated email from the ASF dual-hosted git repository.

remm 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 a2ab554c33 Avoid sendError ISE
a2ab554c33 is described below

commit a2ab554c335fa30931473ad9314456dab7ddf874
Author: remm 
AuthorDate: Tue Apr 9 14:23:35 2024 +0200

Avoid sendError ISE

BZ68862
---
 java/org/apache/catalina/filters/FailedRequestFilter.java | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/filters/FailedRequestFilter.java 
b/java/org/apache/catalina/filters/FailedRequestFilter.java
index 389575c7ce..bbed7cbd8a 100644
--- a/java/org/apache/catalina/filters/FailedRequestFilter.java
+++ b/java/org/apache/catalina/filters/FailedRequestFilter.java
@@ -87,7 +87,11 @@ public class FailedRequestFilter extends FilterBase {
 break;
 }
 
-((HttpServletResponse) response).sendError(status);
+try {
+((HttpServletResponse) response).sendError(status);
+} catch (IllegalStateException e) {
+// Already committed, ignore
+}
 return;
 }
 chain.doFilter(request, response);


-
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: Avoid sendError ISE

2024-04-09 Thread remm
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new bfb6ffcad7 Avoid sendError ISE
bfb6ffcad7 is described below

commit bfb6ffcad7cea76712f5e398fb4c19a5d10248ac
Author: remm 
AuthorDate: Tue Apr 9 14:23:35 2024 +0200

Avoid sendError ISE

BZ68862
---
 java/org/apache/catalina/filters/FailedRequestFilter.java | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/filters/FailedRequestFilter.java 
b/java/org/apache/catalina/filters/FailedRequestFilter.java
index 2d14bac26d..8d4e451c6b 100644
--- a/java/org/apache/catalina/filters/FailedRequestFilter.java
+++ b/java/org/apache/catalina/filters/FailedRequestFilter.java
@@ -87,7 +87,11 @@ public class FailedRequestFilter extends FilterBase {
 break;
 }
 
-((HttpServletResponse) response).sendError(status);
+try {
+((HttpServletResponse) response).sendError(status);
+} catch (IllegalStateException e) {
+// Already committed, ignore
+}
 return;
 }
 chain.doFilter(request, response);


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



[Bug 68862] InputBuffer#handleReadException breaks FailedRequestFilter

2024-04-09 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=68862

Remy Maucherat  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution|--- |FIXED

--- Comment #6 from Remy Maucherat  ---
This code was removed, so I forgot about it. I added a catch ISE for now in
FailedRequestFilter.

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



[VOTE] Release Apache Tomcat 11.0.0-M19

2024-04-09 Thread Rémy Maucherat
The proposed Apache Tomcat 11.0.0-M19 release is now available for
voting.

Apache Tomcat 11.0.0-M19 is a milestone release of the 11.0.x branch and
has been made to provide users with early access to the new features in
Apache Tomcat 11.0.x so that they may provide feedback. The notable
changes compared to the previous milestone include:

- Finalize update to the Jakarta EE 11 specifications.

- Cookies header generation enhancements.

- Fix regression when reloading TLS configuration and files.

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

Applications that run on Tomcat 9 and earlier will not run on Tomcat 11
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. Applications using deprecated APIs may require
further changes.

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-11/v11.0.0-M19/

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

The tag is:
https://github.com/apache/tomcat/tree/11.0.0-M19
19e301275f23056e3c46ab296c87cf6e16fbe68f

The proposed 11.0.0-M19 release is:
[ ] -1 Broken - do not release
[ ] +1 Alpha  - go ahead and release as 11.0.0-M19

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



(tomcat) tag 9.0.88 created (now e644d98329)

2024-04-09 Thread remm
This is an automated email from the ASF dual-hosted git repository.

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


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

 new e644d98329 Tag 9.0.88

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 9.0.88

2024-04-09 Thread remm
This is an automated email from the ASF dual-hosted git repository.

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

commit e644d98329aca2ccf7f2014c0670c5fabc7fcb16
Author: remm 
AuthorDate: Tue Apr 9 15:26:34 2024 +0200

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

diff --git a/build.properties.release b/build.properties.release
new file mode 100644
index 00..49010a3b57
--- /dev/null
+++ b/build.properties.release
@@ -0,0 +1,54 @@
+# -
+# 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=2024-04-09T13:22:30Z
+
+# Enable insertion of detached signatures into the Windows installer.
+do.codesigning=true
+
+# Re-use the same GPG executable.
+gpg.exec=/usr/bin/gpg
+
+# 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.14 compiled on August 16 2023
+#
+# Java Name:   OpenJDK 64-Bit Server VM
+# Java Vendor: Eclipse Adoptium
+# Java Version:17.0.10+7
+
+# The following is provided for information only. Builds will be repeatable
+# whether or not the build environment is consistent with this information.
+#
+# OS:  amd64 Linux 6.8.4-200.fc39.x86_64
+# File encoding:   UTF-8
+#
+# Release Manager: remm
+release-java-version=17.0.10+7
+release-ant-version=1.10.14
diff --git a/res/install-win/Uninstall.exe.sig 
b/res/install-win/Uninstall.exe.sig
new file mode 100644
index 00..6239f3bda2
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..6fc50c9262
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..3c38627728
--- /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=9.0.88
+
+# Re-use the same GPG executable.
+gpg.exec=/usr/bin/gpg
+
+# Set the user name 

svn commit: r68406 - in /dev/tomcat/tomcat-9/v9.0.88: ./ bin/ bin/embed/ src/

2024-04-09 Thread remm
Author: remm
Date: Tue Apr  9 13:29:15 2024
New Revision: 68406

Log:
Upload Tomcat 9.0.88 for voting

Added:
dev/tomcat/tomcat-9/v9.0.88/
dev/tomcat/tomcat-9/v9.0.88/KEYS
dev/tomcat/tomcat-9/v9.0.88/README.html
dev/tomcat/tomcat-9/v9.0.88/RELEASE-NOTES
dev/tomcat/tomcat-9/v9.0.88/bin/
dev/tomcat/tomcat-9/v9.0.88/bin/README.html
dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88-deployer.tar.gz.asc   
(with props)
dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88-deployer.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88-deployer.zip   (with 
props)
dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88-deployer.zip.asc   
(with props)
dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88-deployer.zip.sha512
dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88-fulldocs.tar.gz.asc   
(with props)
dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88-fulldocs.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88-windows-x64.zip   
(with props)
dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88-windows-x64.zip.asc   
(with props)
dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88-windows-x64.zip.sha512
dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88-windows-x86.zip   
(with props)
dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88-windows-x86.zip.asc   
(with props)
dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88-windows-x86.zip.sha512
dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88.exe   (with props)
dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88.exe.asc   (with props)
dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88.exe.sha512
dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88.tar.gz   (with props)
dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88.tar.gz.asc   (with 
props)
dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88.zip   (with props)
dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88.zip.asc   (with props)
dev/tomcat/tomcat-9/v9.0.88/bin/apache-tomcat-9.0.88.zip.sha512
dev/tomcat/tomcat-9/v9.0.88/bin/embed/
dev/tomcat/tomcat-9/v9.0.88/bin/embed/apache-tomcat-9.0.88-embed.tar.gz   
(with props)
dev/tomcat/tomcat-9/v9.0.88/bin/embed/apache-tomcat-9.0.88-embed.tar.gz.asc 
  (with props)

dev/tomcat/tomcat-9/v9.0.88/bin/embed/apache-tomcat-9.0.88-embed.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.88/bin/embed/apache-tomcat-9.0.88-embed.zip   
(with props)
dev/tomcat/tomcat-9/v9.0.88/bin/embed/apache-tomcat-9.0.88-embed.zip.asc   
(with props)
dev/tomcat/tomcat-9/v9.0.88/bin/embed/apache-tomcat-9.0.88-embed.zip.sha512
dev/tomcat/tomcat-9/v9.0.88/src/
dev/tomcat/tomcat-9/v9.0.88/src/apache-tomcat-9.0.88-src.tar.gz   (with 
props)
dev/tomcat/tomcat-9/v9.0.88/src/apache-tomcat-9.0.88-src.tar.gz.asc   (with 
props)
dev/tomcat/tomcat-9/v9.0.88/src/apache-tomcat-9.0.88-src.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.88/src/apache-tomcat-9.0.88-src.zip   (with props)
dev/tomcat/tomcat-9/v9.0.88/src/apache-tomcat-9.0.88-src.zip.asc   (with 
props)
dev/tomcat/tomcat-9/v9.0.88/src/apache-tomcat-9.0.88-src.zip.sha512

Added: dev/tomcat/tomcat-9/v9.0.88/KEYS
==
--- dev/tomcat/tomcat-9/v9.0.88/KEYS (added)
+++ dev/tomcat/tomcat-9/v9.0.88/KEYS Tue Apr  9 13:29:15 2024
@@ -0,0 +1,237 @@
+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   1024D/33C60243 2004-09-12
+  Key fingerprint = DCFD 35E0 BF8C A734 4752  DE8B 6FB2 1E89 33C6 0243
+uid  Mark E D Thomas 
+uid  Mark E D Thomas 
+uid  Mark E D Thomas 
+sub   2048g/0BECE548 2004-09-12
+
+pub   4096R/2F6059E7 2009-09-18
+  Key fingerprint = A9C5 DF4D 22E9 9998 D987  5A51 10C0 1C5A 2F60 59E7
+uid  Mark E D Thomas 
+sub   4096R/5E763BEC 2009-09-18
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG v1.4.9 (MingW32)
+
+mQGiBEFEjegRBADocGttfROvtLGrTOW3xRqZHmFWybmEaI6jmnRdN/1gGXmb3wQL
+rHsS3fLFIIOYLPph0Kov9q4qNq36LekShIvjMBDFoj2/wRxaUtFq81asaRZg8Mcw
+4kVeIoe8OIOuWmvYhU8SH2jJNUnVVrpTPAa6QWquTmseNi6UJMjLxuL7DwCg//9u
+k2yj0vk6e4WSO6Fe5+EkQDED/AjQsy0kj9TpNHkKSSUR2evRlWPYA0YtxBSbsgON
+tT0cYipAp5IcYt6Zq5QzHiZreyQXLAjItDS2oGCIXfNbTYJ3kxxJTCU

(tomcat) branch 9.0.x updated: Next is 9.0.89

2024-04-09 Thread remm
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new a90704ab50 Next is 9.0.89
a90704ab50 is described below

commit a90704ab5015395314846b324935f833bdc6d81e
Author: remm 
AuthorDate: Tue Apr 9 15:52:17 2024 +0200

Next is 9.0.89
---
 build.properties.default | 2 +-
 res/maven/mvn.properties.default | 2 +-
 webapps/docs/changelog.xml   | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 9033fe4eba..b597c46e56 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -31,7 +31,7 @@
 # - Version Control Flags -
 version.major=9
 version.minor=0
-version.build=88
+version.build=89
 version.patch=0
 version.suffix=
 version.dev=-dev
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index d4acd46e6c..b18bc924c5 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -39,7 +39,7 @@ 
maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d
 maven.asf.release.repo.repositoryId=apache.releases.https
 
 # Release version info
-maven.asf.release.deploy.version=9.0.88
+maven.asf.release.deploy.version=9.0.89
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9f6d7f51b5..21aac5e54c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,7 +104,9 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
+
+
   
 
   


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



[VOTE] Release Apache Tomcat 9.0.88

2024-04-09 Thread Rémy Maucherat
The proposed Apache Tomcat 9.0.88 release is now available for voting.

The notable changes compared to 9.0.87 are:

- Cookies header generation enhancements.

- Fix regression when reloading TLS configuration and files.

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.88/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1489
The tag is:
https://github.com/apache/tomcat/tree/9.0.88
e644d98329aca2ccf7f2014c0670c5fabc7fcb16

The proposed 9.0.88 release is:
[ ] -1, Broken - do not release
[ ] +1, Stable - go ahead and release as 9.0.88

Rémy

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



(tomcat) tag 10.1.21 created (now 9a207bc5e7)

2024-04-09 Thread schultz
This is an automated email from the ASF dual-hosted git repository.

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


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

 new 9a207bc5e7 Tag 10.1.21

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

2024-04-09 Thread schultz
This is an automated email from the ASF dual-hosted git repository.

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

commit 9a207bc5e71b8bf0ecdcdc4cd99018186b8b0f39
Author: ChristopherSchultz 
AuthorDate: Tue Apr 9 15:29:14 2024 -0400

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

diff --git a/build.properties.release b/build.properties.release
new file mode 100644
index 00..8e07d63da6
--- /dev/null
+++ b/build.properties.release
@@ -0,0 +1,54 @@
+# -
+# 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=2024-04-09T19:24:30Z
+
+# Enable insertion of detached signatures into the Windows installer.
+do.codesigning=true
+
+# Re-use the same GPG executable.
+gpg.exec=/opt/homebrew/bin/gpg
+
+# 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.14 compiled on August 16 2023
+#
+# Java Name:   OpenJDK 64-Bit Server VM
+# Java Vendor: Eclipse Adoptium
+# Java Version:17.0.10+7
+
+# The following is provided for information only. Builds will be repeatable
+# whether or not the build environment is consistent with this information.
+#
+# OS:  aarch64 Mac OS X 14.3.1
+# File encoding:   UTF-8
+#
+# Release Manager: schultz
+release-java-version=17.0.10+7
+release-ant-version=1.10.14
diff --git a/res/install-win/Uninstall.exe.sig 
b/res/install-win/Uninstall.exe.sig
new file mode 100644
index 00..3fa4e59b26
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..4f9d285237
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..edc043e7a1
--- /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.21
+
+# Re-use the same GPG executable.
+gpg.exec=/opt/homebrew/

svn commit: r68408 - in /dev/tomcat/tomcat-10/v10.1.21: ./ bin/ bin/embed/ src/

2024-04-09 Thread schultz
Author: schultz
Date: Tue Apr  9 19:30:57 2024
New Revision: 68408

Log:
Upload v10.1.21 for voting

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

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

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

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

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

dev/tomcat/tomcat-10/v10.1.21/bin/embed/apache-tomcat-10.1.21-embed.tar.gz.asc

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

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

Added: dev/tomcat/tomcat-10/v10.1.21/KEYS
==
--- dev/tomcat/tomcat-10/v10.1.21/KEYS (added)
+++ dev/tomcat/tomcat-10/v10.1.21/KEYS Tue Apr  9 19:30:57 2024
@@ -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

[VOTE] Release Apache Tomcat 10.1.21

2024-04-09 Thread Christopher Schultz

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

The notable changes compared to 10.1.21 are:

- Add OpenSSL support when FFM is available

- Improve locking strategies in Catalina core

- Updates to Apache Commons dependencies

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.21/

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

The tag is:
https://github.com/apache/tomcat/tree/10.1.21
9a207bc5e71b8bf0ecdcdc4cd99018186b8b0f39

Please reply with a +1 for release or -0/-1 with an explanation.

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

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



[Bug 68876] New: serverStartup.pdf missing sources

2024-04-09 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=68876

Bug ID: 68876
   Summary: serverStartup.pdf missing sources
   Product: Tomcat 9
   Version: 9.0.87
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Documentation
  Assignee: dev@tomcat.apache.org
  Reporter: t...@debian.org
  Target Milestone: -

webapps/docs/architecture/startup/serverStartup.pdf seems to have been created
in some UML utility by a Windows® user in Tomcat 5 times.

Please do something to update it, fix typos like “Warpper”, and so we can have
the source code in the git repository as well, or ideally it would be built
from the source code (e.g. using graphviz or something, which could be
installed as build dependency in the Debian packaging).

-- 
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 10.1.x updated: Increment version numbers for next release.

2024-04-09 Thread 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 1f06766924 Increment version numbers for next release.
1f06766924 is described below

commit 1f06766924e56758b11faf3812e2d15b60492d4d
Author: ChristopherSchultz 
AuthorDate: Tue Apr 9 15:44:54 2024 -0400

Increment version numbers for next release.
---
 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 00be11738f..6fa20d3d3d 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -31,7 +31,7 @@
 # - Version Control Flags -
 version.major=10
 version.minor=1
-version.build=21
+version.build=22
 version.patch=0
 version.suffix=
 version.dev=-dev
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 8e094bf1a9..1f48ad8fdc 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.21
+maven.asf.release.deploy.version=10.1.22
 
 #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



[Bug 68878] New: Tomcat feints death, there is no ClientPoller thread in the stack information

2024-04-09 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=68878

Bug ID: 68878
   Summary: Tomcat feints death, there is no ClientPoller thread
in the stack information
   Product: Tomcat 9
   Version: 9.0.39
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: WebSocket
  Assignee: dev@tomcat.apache.org
  Reporter: huangzeling8...@dingtalk.com
  Target Milestone: -

HandlerInterceptor.afterCompletion thread exception appears online
Java. lang. NullPointerException: null
At org. springframework. boot. actor. metrics. web. Servlet
LongTaskTimingHandlerInterceptor. stopLongTaskTimers
(LongTaskTimingHandlerInterceptor. java: 123)~[spring boot actor 2.3.5.
RELEASE. jar!/: 2.3.5. RELEASE]
At org. springframework. boot. actor. metrics. web. Servlet
LongTaskTimingHandlerInterceptor. afterCompletion
(LongTaskTimingHandlerInterceptor. java: 79),
Upon checking the stack information, it was found that the thread of
ClientPoller in Tomcat was missing. Tomcat experienced a fake death situation
without any access log. I suspect it may be related to websocket, as a
websocket client disconnected and experienced the following situation

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