Re: [VOTE] Release Apache Tomcat 10.1.20

2024-03-19 Thread Igal Sapir 
On Tue, Mar 19, 2024 at 6:58 AM Christopher Schultz <
ch...@christopherschultz.net> wrote:

> The proposed Apache Tomcat 10.1.20 release is now available for
> voting.
>
> The notable changes compared to 10.1.19 are:
>
> - Fix regression when reloading TLS configuration and files.
>
> - When restoring a saved POST request after a successful FORM
>authentication, ensure that neither the URI, the query string no
>the protocol are corrupted when restoring the request body.
>
> - Align error handling for Writer and OutputStream. Ensure use of either
>once the response has been recycled triggers a NullPointerException
>provided that discardFacades is configured with the default value of
>true.
>
> 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.20/
>
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1486
>
> The tag is:
> https://github.com/apache/tomcat/tree/10.1.20
> ab4d890c6fa7be3f910370f00fb5c7f10152e21c
>
> The proposed 10.1.20 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 10.1.20
>

+1

Igal



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

(tomcat-tck) branch main updated: Skip the HTTP/2 push tests

2024-03-19 Thread 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-tck.git


The following commit(s) were added to refs/heads/main by this push:
 new e42e04b  Skip the HTTP/2 push tests
e42e04b is described below

commit e42e04b7ca45e73b6ea3fc9f9b25d0919d33536c
Author: Mark Thomas 
AuthorDate: Tue Mar 19 18:46:07 2024 +

Skip the HTTP/2 push tests
---
 servlet-tck/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/servlet-tck/pom.xml b/servlet-tck/pom.xml
index 0157c03..9525f09 100644
--- a/servlet-tck/pom.xml
+++ b/servlet-tck/pom.xml
@@ -109,6 +109,7 @@
 
 5
 true
+
false
 
 
 


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

2024-03-19 Thread Christopher Schultz 

Jon,

On 3/19/24 13:50, Mcalexander, Jon J. wrote:

I know I'm not a tester, however is 8.5.100 relevant knowing that
8.5x is EOL at the end of the month?
That is correct. I expect this will be the final 8.5.x release unless 
something awful happens in the near future.


I'd be happy to have any member of this community (and you are such if 
you are reading this post) do any kind of testing they deem useful for a 
Tomcat release.


Feel free to run the unit tests (ant test) in your environment and 
report the results. Run your own application using this 
release-candidate and let us know if anything isn't working as expected. 
Or use the "verify-release" to keep us honest. Any of those things are 
helpful to any release manager.


Thanks,
-chris


-Original Message-
From: Christopher Schultz 
Sent: Tuesday, March 19, 2024 11:09 AM
To: Tomcat Developers List 
Subject: Re: [VOTE] Release Apache Tomcat 8.5.100

All,

On 3/19/24 10:23, Christopher Schultz wrote:

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

The notable changes compared to 8.5.99 are:

- Fix regression when reloading TLS configuration and files.

- When restoring a saved POST request after a successful FORM
    authentication, ensure that neither the URI, the query string no
    the protocol are corrupted when restoring the request body.

- Align error handling for Writer and OutputStream. Ensure use of
either
    once the response has been recycled triggers a NullPointerException
    provided that discardFacades is configured with the default value
of
    true.

Along with lots of other bug fixes and improvements.

For full details, see the changelog:
https://urldefense.com/v3/__https://nightlies.apache.org/tomcat/tomcat
-

8.5.x/docs/changelog.html__;!!F9svGWnIaVPGSwU!rXnT69JeMfvxYHMbtyS
moAV

SiTjPT2db8olE5tsg1Pcp5wt0SEnRqO3ek_Gc2yNI74-t2phO83t-

WxXwouIr8Sv8R32ve

xfP$

It can be obtained from:
https://urldefense.com/v3/__https://dist.apache.org/repos/dist/dev/tom
cat/tomcat-

8/v8.5.100/__;!!F9svGWnIaVPGSwU!rXnT69JeMfvxYHMbtySmoAVSiTj

PT2db8olE5tsg1Pcp5wt0SEnRqO3ek_Gc2yNI74-t2phO83t-

WxXwouIr8Sv8RyseCXd6$


The Maven staging repo is:
https://urldefense.com/v3/__https://repository.apache.org/content/repo
sitories/orgapachetomcat-

1487__;!!F9svGWnIaVPGSwU!rXnT69JeMfvxYHMbtySm

oAVSiTjPT2db8olE5tsg1Pcp5wt0SEnRqO3ek_Gc2yNI74-t2phO83t-

WxXwouIr8Sv8R8

MLP2bU$

The tag is:
https://urldefense.com/v3/__https://github.com/apache/tomcat/tree/8.5.


100/__;!!F9svGWnIaVPGSwU!rXnT69JeMfvxYHMbtySmoAVSiTjPT2db8olE5ts
g1Pcp5

wt0SEnRqO3ek_Gc2yNI74-t2phO83t-WxXwouIr8Sv8RxxIvQsW$
eddcf278ad919382608ada1898b2c5b63675c6d5

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


+1 for stable release.

The build is 100% reproducible and the unit tests pass[1] including APR on
MacOS x86-64. Works on a vanilla servlet-based application in a development
environment.

[1] The unit tests that fail do so due to a class format error arising from the
combination of the Eclipse compiler, the version of Java, etc.
and can be ignored.

Details:
* Environment
*  Java (build):openjdk version "17.0.10" 2024-01-16 OpenJDK Runtime
Environment Temurin-17.0.10+7 (build 17.0.10+7) OpenJDK 64-Bit Server
VM
Temurin-17.0.10+7 (build 17.0.10+7, mixed mode)
*  Java (test): openjdk version "17.0.10" 2024-01-16 OpenJDK Runtime
Environment Temurin-17.0.10+7 (build 17.0.10+7) OpenJDK 64-Bit Server
VM
Temurin-17.0.10+7 (build 17.0.10+7, mixed mode)
*  OS:  Darwin 21.6.0 x86_64
*  cc:  Apple clang version 12.0.0 (clang-1200.0.31.1)
*  make:GNU Make 3.81
*  OpenSSL:   OpenSSL 3.2.0 23 Nov 2023 (Library: OpenSSL 3.2.0 23
Nov 2023)
*  APR: 1.7.4
*
* Valid SHA-512 signature for apache-tomcat-8.5.100.zip
* Valid GPG signature for apache-tomcat-8.5.100.zip
* Valid SHA-512 signature for apache-tomcat-8.5.100.tar.gz
* Valid GPG signature for apache-tomcat-8.5.100.tar.gz
* Valid SHA-512 signature for apache-tomcat-8.5.100.exe
* Valid GPG signature for apache-tomcat-8.5.100.exe
* Valid SHA512 signature for apache-tomcat-8.5.100-src.zip
* Valid GPG signature for apache-tomcat-8.5.100-src.zip
* Valid SHA512 signature for apache-tomcat-8.5.100-src.tar.gz
* Valid GPG signature for apache-tomcat-8.5.100-src.tar.gz
*
* Binary Zip and tarball: Same
* Source Zip and tarball: Same
*
* Building dependencies returned: 0
* tcnative builds cleanly
* Tomcat builds cleanly
* Junit Tests: FAILED
*
* Tests that failed:
* org.apache.catalina.mapper.TestMapperWebapps.APR.txt
* org.apache.catalina.mapper.TestMapperWebapps.NIO.txt
* org.apache.catalina.mapper.TestMapperWebapps.NIO2.txt

Unit tests also pass on Linux x86-64. Details:

* Environment
*  Java (build):openjdk version "17.0.10" 2024-01-16 OpenJDK Runtime
Environment (build 17.0.10+7-Debian-1deb12u1) OpenJDK 64-Bit Server VM
(build 17.0.10+7-Debian-1deb12u1, mixed mode, sharing)
*  Java (test):

Re: [VOTE] Release Apache Tomcat 8.5.100

2024-03-19 Thread Igal Sapir 
On Tue, Mar 19, 2024 at 7:24 AM Christopher Schultz <
ch...@christopherschultz.net> wrote:

> The proposed Apache Tomcat 8.5.100 release is now available for voting.
>
> The notable changes compared to 8.5.99 are:
>
> - Fix regression when reloading TLS configuration and files.
>
> - When restoring a saved POST request after a successful FORM
>authentication, ensure that neither the URI, the query string no
>the protocol are corrupted when restoring the request body.
>
> - Align error handling for Writer and OutputStream. Ensure use of either
>once the response has been recycled triggers a NullPointerException
>provided that discardFacades is configured with the default value of
>true.
>
> 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.100/
>
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1487
>
> The tag is:
> https://github.com/apache/tomcat/tree/8.5.100/
> eddcf278ad919382608ada1898b2c5b63675c6d5
>
> The proposed 8.5.100 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 8.5.100 (stable)
>

+1

Igal



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

Re: [VOTE] Release Apache Tomcat 8.5.100

2024-03-19 Thread Rémy Maucherat 
On Tue, Mar 19, 2024 at 3:24 PM Christopher Schultz
 wrote:
>
> The proposed Apache Tomcat 8.5.100 release is now available for voting.
>
> The notable changes compared to 8.5.99 are:
>
> - Fix regression when reloading TLS configuration and files.
>
> - When restoring a saved POST request after a successful FORM
>authentication, ensure that neither the URI, the query string no
>the protocol are corrupted when restoring the request body.
>
> - Align error handling for Writer and OutputStream. Ensure use of either
>once the response has been recycled triggers a NullPointerException
>provided that discardFacades is configured with the default value of
>true.
>
> 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.100/
>
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1487
>
> The tag is:
> https://github.com/apache/tomcat/tree/8.5.100/
> eddcf278ad919382608ada1898b2c5b63675c6d5
>
> The proposed 8.5.100 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 8.5.100 (stable)

Rémy

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

Re: [VOTE] Release Apache Tomcat 8.5.100

2024-03-19 Thread Rémy Maucherat 
On Tue, Mar 19, 2024 at 6:50 PM Mcalexander, Jon J.
 wrote:
>
> I know I'm not a tester, however is 8.5.100 relevant knowing that 8.5x is EOL 
> at the end of the month?

I agree it's not relevant, its only real purpose is to make 8.5.99
relevant (and so on).

Rémy

>
> Thank you!
>
> Dream * Excel * Explore * Inspire
> Jon McAlexander
> Senior Infrastructure Engineer
> Asst. Vice President
> He/His
>
> Middleware Product Engineering
> Enterprise CIO | EAS | Middleware | Infrastructure Solutions
>
> 8080 Cobblestone Rd | Urbandale, IA 50322
> MAC: F4469-010
> Tel 515-988-2508 | Cell 515-988-2508
>
> jonmcalexan...@wellsfargo.com
> This message may contain confidential and/or privileged information. If you 
> are not the addressee or authorized to receive this for the addressee, you 
> must not use, copy, disclose, or take any action based on this message or any 
> information herein. If you have received this message in error, please advise 
> the sender immediately by reply e-mail and delete this message. Thank you for 
> your cooperation.
>
> > -Original Message-
> > From: Christopher Schultz 
> > Sent: Tuesday, March 19, 2024 11:09 AM
> > To: Tomcat Developers List 
> > Subject: Re: [VOTE] Release Apache Tomcat 8.5.100
> >
> > All,
> >
> > On 3/19/24 10:23, Christopher Schultz wrote:
> > > The proposed Apache Tomcat 8.5.100 release is now available for voting.
> > >
> > > The notable changes compared to 8.5.99 are:
> > >
> > > - Fix regression when reloading TLS configuration and files.
> > >
> > > - When restoring a saved POST request after a successful FORM
> > >authentication, ensure that neither the URI, the query string no
> > >the protocol are corrupted when restoring the request body.
> > >
> > > - Align error handling for Writer and OutputStream. Ensure use of
> > > either
> > >once the response has been recycled triggers a NullPointerException
> > >provided that discardFacades is configured with the default value
> > > of
> > >true.
> > >
> > > Along with lots of other bug fixes and improvements.
> > >
> > > For full details, see the changelog:
> > > https://urldefense.com/v3/__https://nightlies.apache.org/tomcat/tomcat
> > > -
> > 8.5.x/docs/changelog.html__;!!F9svGWnIaVPGSwU!rXnT69JeMfvxYHMbtyS
> > moAV
> > > SiTjPT2db8olE5tsg1Pcp5wt0SEnRqO3ek_Gc2yNI74-t2phO83t-
> > WxXwouIr8Sv8R32ve
> > > xfP$
> > >
> > > It can be obtained from:
> > > https://urldefense.com/v3/__https://dist.apache.org/repos/dist/dev/tom
> > > cat/tomcat-
> > 8/v8.5.100/__;!!F9svGWnIaVPGSwU!rXnT69JeMfvxYHMbtySmoAVSiTj
> > > PT2db8olE5tsg1Pcp5wt0SEnRqO3ek_Gc2yNI74-t2phO83t-
> > WxXwouIr8Sv8RyseCXd6$
> > >
> > > The Maven staging repo is:
> > > https://urldefense.com/v3/__https://repository.apache.org/content/repo
> > > sitories/orgapachetomcat-
> > 1487__;!!F9svGWnIaVPGSwU!rXnT69JeMfvxYHMbtySm
> > > oAVSiTjPT2db8olE5tsg1Pcp5wt0SEnRqO3ek_Gc2yNI74-t2phO83t-
> > WxXwouIr8Sv8R8
> > > MLP2bU$
> > >
> > > The tag is:
> > > https://urldefense.com/v3/__https://github.com/apache/tomcat/tree/8.5.
> > >
> > 100/__;!!F9svGWnIaVPGSwU!rXnT69JeMfvxYHMbtySmoAVSiTjPT2db8olE5ts
> > g1Pcp5
> > > wt0SEnRqO3ek_Gc2yNI74-t2phO83t-WxXwouIr8Sv8RxxIvQsW$
> > > eddcf278ad919382608ada1898b2c5b63675c6d5
> > >
> > > The proposed 8.5.100 release is:
> > > [ ] Broken - do not release
> > > [ ] Stable - go ahead and release as 8.5.100 (stable)
> >
> > +1 for stable release.
> >
> > The build is 100% reproducible and the unit tests pass[1] including APR on
> > MacOS x86-64. Works on a vanilla servlet-based application in a development
> > environment.
> >
> > [1] The unit tests that fail do so due to a class format error arising from 
> > the
> > combination of the Eclipse compiler, the version of Java, etc.
> > and can be ignored.
> >
> > Details:
> > * Environment
> > *  Java (build):openjdk version "17.0.10" 2024-01-16 OpenJDK Runtime
> > Environment Temurin-17.0.10+7 (build 17.0.10+7) OpenJDK 64-Bit Server
> > VM
> > Temurin-17.0.10+7 (build 17.0.10+7, mixed mode)
> > *  Java (test): openjdk version "17.0.10" 2024-01-16 OpenJDK Runtime
> > Environment Temurin-17.0.10+7 (build 17.0.10+7) OpenJDK 64-Bit Server
> > VM
> > Temurin-17.0.10+7 (build 17.0.10+7, mixed mode)
> > *  OS:  Darwin 21.6.0 x86_64
> > *  cc:  Apple clang version 12.0.0 (clang-1200.0.31.1)
> > *  make:GNU Make 3.81
> > *  OpenSSL:   OpenSSL 3.2.0 23 Nov 2023 (Library: OpenSSL 3.2.0 23
> > Nov 2023)
> > *  APR: 1.7.4
> > *
> > * Valid SHA-512 signature for apache-tomcat-8.5.100.zip
> > * Valid GPG signature for apache-tomcat-8.5.100.zip
> > * Valid SHA-512 signature for apache-tomcat-8.5.100.tar.gz
> > * Valid GPG signature for apache-tomcat-8.5.100.tar.gz
> > * Valid SHA-512 signature for apache-tomcat-8.5.100.exe
> > * Valid GPG signature for apache-tomcat-8.5.100.exe
> > * Valid SHA512 signature for apache-tomcat-8.5.100-src.zip
> > * Valid GPG signature for apache-tomcat-8.5.100-src.zip
> > *

(tomcat-tck) branch main updated: Add h2c support. Refactor a little.

2024-03-19 Thread 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-tck.git


The following commit(s) were added to refs/heads/main by this push:
 new 3a57d71  Add h2c support. Refactor a little.
3a57d71 is described below

commit 3a57d71beb2c15f23e0bdf6f01713521bfbac086
Author: Mark Thomas 
AuthorDate: Tue Mar 19 17:52:02 2024 +

Add h2c support. Refactor a little.
---
 .../tck/servlet/TomcatServletTckConfiguration.java | 43 +++---
 1 file changed, 30 insertions(+), 13 deletions(-)

diff --git 
a/servlet-tck/src/test/java/org/apache/tomcat/tck/servlet/TomcatServletTckConfiguration.java
 
b/servlet-tck/src/test/java/org/apache/tomcat/tck/servlet/TomcatServletTckConfiguration.java
index 27be6bf..4b043da 100644
--- 
a/servlet-tck/src/test/java/org/apache/tomcat/tck/servlet/TomcatServletTckConfiguration.java
+++ 
b/servlet-tck/src/test/java/org/apache/tomcat/tck/servlet/TomcatServletTckConfiguration.java
@@ -17,14 +17,19 @@
 package org.apache.tomcat.tck.servlet;
 
 import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.util.Locale;
 
 import org.apache.catalina.Container;
 import org.apache.catalina.connector.Connector;
 import org.apache.catalina.core.StandardContext;
 import org.apache.catalina.startup.Tomcat;
+import org.apache.coyote.UpgradeProtocol;
+import org.apache.coyote.http11.AbstractHttp11Protocol;
+import org.apache.coyote.http2.Http2Protocol;
 import org.jboss.arquillian.container.spi.event.container.AfterDeploy;
-import org.jboss.arquillian.container.spi.event.container.BeforeDeploy;
+import org.jboss.arquillian.container.spi.event.container.AfterStart;
+import org.jboss.arquillian.container.spi.event.container.BeforeStart;
 import org.jboss.arquillian.core.api.annotation.Observes;
 import org.jboss.arquillian.core.spi.LoadableExtension;
 import 
org.jboss.arquillian.container.tomcat.embedded.Tomcat10EmbeddedContainer;
@@ -38,23 +43,14 @@ public class TomcatServletTckConfiguration implements 
LoadableExtension {
 
 public static class ServletObserver {
 
-public void configureTomcat(@Observes final BeforeDeploy beforeDeploy) 
{
-Tomcat10EmbeddedContainer container = (Tomcat10EmbeddedContainer) 
beforeDeploy.getDeployableContainer();
+public void configureTomcat(@Observes final AfterStart afterStart) {
+Tomcat10EmbeddedContainer container = (Tomcat10EmbeddedContainer) 
afterStart.getDeployableContainer();
 try {
// Obtain reference to Tomcat instance
 Field tomcatField = 
Tomcat10EmbeddedContainer.class.getDeclaredField("tomcat");
 tomcatField.setAccessible(true);
 Tomcat tomcat = (Tomcat) tomcatField.get(container);
-
-// Update Arquillian configuration with port being used by 
Tomcat
 Connector connector = tomcat.getConnector();
-int localPort = connector.getLocalPort();
-Field configurationField = 
Tomcat10EmbeddedContainer.class.getDeclaredField("configuration");
-configurationField.setAccessible(true);
-Object configuration = configurationField.get(container);
-Field portField = 
container.getConfigurationClass().getDeclaredField("bindHttpPort");
-portField.setAccessible(true);
-portField.set(configuration, Integer.valueOf(localPort));
 
 // Add trailer headers used in TCK to allow list
 connector.setProperty("allowedTrailerHeaders", 
"myTrailer,myTrailer2");
@@ -66,7 +62,28 @@ public class TomcatServletTckConfiguration implements 
LoadableExtension {
 tomcat.addUser("javajoe", "javajoe");
 tomcat.addRole("javajoe", "VP");
 tomcat.addRole("javajoe", "Manager");
-} catch (ReflectiveOperationException e) {
+
+// Update Arquillian configuration with port being used by 
Tomcat
+int localPort = connector.getLocalPort();
+Field configurationField = 
Tomcat10EmbeddedContainer.class.getDeclaredField("configuration");
+configurationField.setAccessible(true);
+Object configuration = configurationField.get(container);
+Field portField = 
container.getConfigurationClass().getDeclaredField("bindHttpPort");
+portField.setAccessible(true);
+portField.set(configuration, Integer.valueOf(localPort));
+
+   // Add HTTP/2 support
+   Http2Protocol http2Protocol = new Http2Protocol();
+   AbstractHttp11Protocol httpProtocol = 
(AbstractHttp11Protocol) connector.getProtocolHandler();
+   http2Protocol.setHttp11Protocol(httpProtocol);
+   connector.addUpgradeProtocol(http2Protocol);
+   // Upgrade

RE: [VOTE] Release Apache Tomcat 8.5.100

2024-03-19 Thread Mcalexander, Jon J. 
I know I'm not a tester, however is 8.5.100 relevant knowing that 8.5x is EOL 
at the end of the month?

Thank you!

Dream * Excel * Explore * Inspire
Jon McAlexander
Senior Infrastructure Engineer
Asst. Vice President
He/His

Middleware Product Engineering
Enterprise CIO | EAS | Middleware | Infrastructure Solutions

8080 Cobblestone Rd | Urbandale, IA 50322
MAC: F4469-010
Tel 515-988-2508 | Cell 515-988-2508

jonmcalexan...@wellsfargo.com
This message may contain confidential and/or privileged information. If you are 
not the addressee or authorized to receive this for the addressee, you must not 
use, copy, disclose, or take any action based on this message or any 
information herein. If you have received this message in error, please advise 
the sender immediately by reply e-mail and delete this message. Thank you for 
your cooperation.

> -Original Message-
> From: Christopher Schultz 
> Sent: Tuesday, March 19, 2024 11:09 AM
> To: Tomcat Developers List 
> Subject: Re: [VOTE] Release Apache Tomcat 8.5.100
> 
> All,
> 
> On 3/19/24 10:23, Christopher Schultz wrote:
> > The proposed Apache Tomcat 8.5.100 release is now available for voting.
> >
> > The notable changes compared to 8.5.99 are:
> >
> > - Fix regression when reloading TLS configuration and files.
> >
> > - When restoring a saved POST request after a successful FORM
> >    authentication, ensure that neither the URI, the query string no
> >    the protocol are corrupted when restoring the request body.
> >
> > - Align error handling for Writer and OutputStream. Ensure use of
> > either
> >    once the response has been recycled triggers a NullPointerException
> >    provided that discardFacades is configured with the default value
> > of
> >    true.
> >
> > Along with lots of other bug fixes and improvements.
> >
> > For full details, see the changelog:
> > https://urldefense.com/v3/__https://nightlies.apache.org/tomcat/tomcat
> > -
> 8.5.x/docs/changelog.html__;!!F9svGWnIaVPGSwU!rXnT69JeMfvxYHMbtyS
> moAV
> > SiTjPT2db8olE5tsg1Pcp5wt0SEnRqO3ek_Gc2yNI74-t2phO83t-
> WxXwouIr8Sv8R32ve
> > xfP$
> >
> > It can be obtained from:
> > https://urldefense.com/v3/__https://dist.apache.org/repos/dist/dev/tom
> > cat/tomcat-
> 8/v8.5.100/__;!!F9svGWnIaVPGSwU!rXnT69JeMfvxYHMbtySmoAVSiTj
> > PT2db8olE5tsg1Pcp5wt0SEnRqO3ek_Gc2yNI74-t2phO83t-
> WxXwouIr8Sv8RyseCXd6$
> >
> > The Maven staging repo is:
> > https://urldefense.com/v3/__https://repository.apache.org/content/repo
> > sitories/orgapachetomcat-
> 1487__;!!F9svGWnIaVPGSwU!rXnT69JeMfvxYHMbtySm
> > oAVSiTjPT2db8olE5tsg1Pcp5wt0SEnRqO3ek_Gc2yNI74-t2phO83t-
> WxXwouIr8Sv8R8
> > MLP2bU$
> >
> > The tag is:
> > https://urldefense.com/v3/__https://github.com/apache/tomcat/tree/8.5.
> >
> 100/__;!!F9svGWnIaVPGSwU!rXnT69JeMfvxYHMbtySmoAVSiTjPT2db8olE5ts
> g1Pcp5
> > wt0SEnRqO3ek_Gc2yNI74-t2phO83t-WxXwouIr8Sv8RxxIvQsW$
> > eddcf278ad919382608ada1898b2c5b63675c6d5
> >
> > The proposed 8.5.100 release is:
> > [ ] Broken - do not release
> > [ ] Stable - go ahead and release as 8.5.100 (stable)
> 
> +1 for stable release.
> 
> The build is 100% reproducible and the unit tests pass[1] including APR on
> MacOS x86-64. Works on a vanilla servlet-based application in a development
> environment.
> 
> [1] The unit tests that fail do so due to a class format error arising from 
> the
> combination of the Eclipse compiler, the version of Java, etc.
> and can be ignored.
> 
> Details:
> * Environment
> *  Java (build):openjdk version "17.0.10" 2024-01-16 OpenJDK Runtime
> Environment Temurin-17.0.10+7 (build 17.0.10+7) OpenJDK 64-Bit Server
> VM
> Temurin-17.0.10+7 (build 17.0.10+7, mixed mode)
> *  Java (test): openjdk version "17.0.10" 2024-01-16 OpenJDK Runtime
> Environment Temurin-17.0.10+7 (build 17.0.10+7) OpenJDK 64-Bit Server
> VM
> Temurin-17.0.10+7 (build 17.0.10+7, mixed mode)
> *  OS:  Darwin 21.6.0 x86_64
> *  cc:  Apple clang version 12.0.0 (clang-1200.0.31.1)
> *  make:GNU Make 3.81
> *  OpenSSL:   OpenSSL 3.2.0 23 Nov 2023 (Library: OpenSSL 3.2.0 23
> Nov 2023)
> *  APR: 1.7.4
> *
> * Valid SHA-512 signature for apache-tomcat-8.5.100.zip
> * Valid GPG signature for apache-tomcat-8.5.100.zip
> * Valid SHA-512 signature for apache-tomcat-8.5.100.tar.gz
> * Valid GPG signature for apache-tomcat-8.5.100.tar.gz
> * Valid SHA-512 signature for apache-tomcat-8.5.100.exe
> * Valid GPG signature for apache-tomcat-8.5.100.exe
> * Valid SHA512 signature for apache-tomcat-8.5.100-src.zip
> * Valid GPG signature for apache-tomcat-8.5.100-src.zip
> * Valid SHA512 signature for apache-tomcat-8.5.100-src.tar.gz
> * Valid GPG signature for apache-tomcat-8.5.100-src.tar.gz
> *
> * Binary Zip and tarball: Same
> * Source Zip and tarball: Same
> *
> * Building dependencies returned: 0
> * tcnative builds cleanly
> * Tomcat builds cleanly
> * Junit Tests: FAILED
> *
> * Tests that failed:
> * org.apache.catalina.mapper.TestMapperWebapps.APR.txt
> *

Re: [VOTE] Release Apache Tomcat 10.1.20

2024-03-19 Thread Romain Manni-Bucau 
+1 (non-binding), tested on several apps with "AsfEE" stack and Yupiik
Fusion, no issue so far.

Romain Manni-Bucau
@rmannibucau  |  Blog
 | Old Blog
 | Github  |
LinkedIn  | Book



Le mar. 19 mars 2024 à 16:55, Rémy Maucherat  a écrit :

> On Tue, Mar 19, 2024 at 2:56 PM Christopher Schultz
>  wrote:
> >
> > The proposed Apache Tomcat 10.1.20 release is now available for
> > voting.
> >
> > The notable changes compared to 10.1.19 are:
> >
> > - Fix regression when reloading TLS configuration and files.
> >
> > - When restoring a saved POST request after a successful FORM
> >authentication, ensure that neither the URI, the query string no
> >the protocol are corrupted when restoring the request body.
> >
> > - Align error handling for Writer and OutputStream. Ensure use of either
> >once the response has been recycled triggers a NullPointerException
> >provided that discardFacades is configured with the default value of
> >true.
> >
> > 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.20/
> >
> > The Maven staging repo is:
> > https://repository.apache.org/content/repositories/orgapachetomcat-1486
> >
> > The tag is:
> > https://github.com/apache/tomcat/tree/10.1.20
> > ab4d890c6fa7be3f910370f00fb5c7f10152e21c
> >
> > The proposed 10.1.20 release is:
> > [ ] Broken - do not release
> > [X] Stable - go ahead and release as 10.1.20
>
> Rémy
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

Re: [VOTE] Release Apache Tomcat 8.5.100

2024-03-19 Thread Christopher Schultz 

All,

On 3/19/24 10:23, Christopher Schultz wrote:

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

The notable changes compared to 8.5.99 are:

- Fix regression when reloading TLS configuration and files.

- When restoring a saved POST request after a successful FORM
   authentication, ensure that neither the URI, the query string no
   the protocol are corrupted when restoring the request body.

- Align error handling for Writer and OutputStream. Ensure use of either
   once the response has been recycled triggers a NullPointerException
   provided that discardFacades is configured with the default value of
   true.

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

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

The tag is:
https://github.com/apache/tomcat/tree/8.5.100/
eddcf278ad919382608ada1898b2c5b63675c6d5

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


+1 for stable release.

The build is 100% reproducible and the unit tests pass[1] including APR 
on MacOS x86-64. Works on a vanilla servlet-based application in a 
development environment.


[1] The unit tests that fail do so due to a class format error arising 
from the combination of the Eclipse compiler, the version of Java, etc. 
and can be ignored.


Details:
* Environment
*  Java (build):openjdk version "17.0.10" 2024-01-16 OpenJDK Runtime 
Environment Temurin-17.0.10+7 (build 17.0.10+7) OpenJDK 64-Bit Server VM 
Temurin-17.0.10+7 (build 17.0.10+7, mixed mode)
*  Java (test): openjdk version "17.0.10" 2024-01-16 OpenJDK Runtime 
Environment Temurin-17.0.10+7 (build 17.0.10+7) OpenJDK 64-Bit Server VM 
Temurin-17.0.10+7 (build 17.0.10+7, mixed mode)

*  OS:  Darwin 21.6.0 x86_64
*  cc:  Apple clang version 12.0.0 (clang-1200.0.31.1)
*  make:GNU Make 3.81
*  OpenSSL:   OpenSSL 3.2.0 23 Nov 2023 (Library: OpenSSL 3.2.0 23 
Nov 2023)

*  APR: 1.7.4
*
* Valid SHA-512 signature for apache-tomcat-8.5.100.zip
* Valid GPG signature for apache-tomcat-8.5.100.zip
* Valid SHA-512 signature for apache-tomcat-8.5.100.tar.gz
* Valid GPG signature for apache-tomcat-8.5.100.tar.gz
* Valid SHA-512 signature for apache-tomcat-8.5.100.exe
* Valid GPG signature for apache-tomcat-8.5.100.exe
* Valid SHA512 signature for apache-tomcat-8.5.100-src.zip
* Valid GPG signature for apache-tomcat-8.5.100-src.zip
* Valid SHA512 signature for apache-tomcat-8.5.100-src.tar.gz
* Valid GPG signature for apache-tomcat-8.5.100-src.tar.gz
*
* Binary Zip and tarball: Same
* Source Zip and tarball: Same
*
* Building dependencies returned: 0
* tcnative builds cleanly
* Tomcat builds cleanly
* Junit Tests: FAILED
*
* Tests that failed:
* org.apache.catalina.mapper.TestMapperWebapps.APR.txt
* org.apache.catalina.mapper.TestMapperWebapps.NIO.txt
* org.apache.catalina.mapper.TestMapperWebapps.NIO2.txt

Unit tests also pass on Linux x86-64. Details:

* Environment
*  Java (build):openjdk version "17.0.10" 2024-01-16 OpenJDK Runtime 
Environment (build 17.0.10+7-Debian-1deb12u1) OpenJDK 64-Bit Server VM 
(build 17.0.10+7-Debian-1deb12u1, mixed mode, sharing)
*  Java (test): openjdk version "17.0.10" 2024-01-16 OpenJDK Runtime 
Environment (build 17.0.10+7-Debian-1deb12u1) OpenJDK 64-Bit Server VM 
(build 17.0.10+7-Debian-1deb12u1, mixed mode, sharing)

*  OS:  Linux 6.1.0-12-amd64 x86_64
*  cc:  cc (Debian 12.2.0-14) 12.2.0
*  make:GNU Make 4.3
*  OpenSSL:   OpenSSL 1.1.1 11 Sep 2018
*  APR: 1.7.2
*
* Valid SHA-512 signature for apache-tomcat-8.5.100.zip
* Valid GPG signature for apache-tomcat-8.5.100.zip
* Valid SHA-512 signature for apache-tomcat-8.5.100.tar.gz
* Valid GPG signature for apache-tomcat-8.5.100.tar.gz
* Valid SHA-512 signature for apache-tomcat-8.5.100.exe
* Valid GPG signature for apache-tomcat-8.5.100.exe
* Valid Windows Digital Signature for apache-tomcat-8.5.100.exe
* Valid SHA512 signature for apache-tomcat-8.5.100-src.zip
* Valid GPG signature for apache-tomcat-8.5.100-src.zip
* Valid SHA512 signature for apache-tomcat-8.5.100-src.tar.gz
* Valid GPG signature for apache-tomcat-8.5.100-src.tar.gz
*
* Binary Zip and tarball: Same
* Source Zip and tarball: Same
*
* Building dependencies returned: 0
* tcnative builds cleanly
* Tomcat builds cleanly
* Junit Tests: FAILED
*
* Tests that failed:
* org.apache.catalina.mapper.TestMapperWebapps.APR.txt
* org.apache.catalina.mapper.TestMapperWebapps.NIO.txt
* org.apache.catalina.mapper.TestMapperWebapps.NIO2.txt

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

Re: [VOTE] Release Apache Tomcat 10.1.20

2024-03-19 Thread Rémy Maucherat 
On Tue, Mar 19, 2024 at 2:56 PM Christopher Schultz
 wrote:
>
> The proposed Apache Tomcat 10.1.20 release is now available for
> voting.
>
> The notable changes compared to 10.1.19 are:
>
> - Fix regression when reloading TLS configuration and files.
>
> - When restoring a saved POST request after a successful FORM
>authentication, ensure that neither the URI, the query string no
>the protocol are corrupted when restoring the request body.
>
> - Align error handling for Writer and OutputStream. Ensure use of either
>once the response has been recycled triggers a NullPointerException
>provided that discardFacades is configured with the default value of
>true.
>
> 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.20/
>
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1486
>
> The tag is:
> https://github.com/apache/tomcat/tree/10.1.20
> ab4d890c6fa7be3f910370f00fb5c7f10152e21c
>
> The proposed 10.1.20 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 10.1.20

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 8.5.100

2024-03-19 Thread Christopher Schultz 

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

The notable changes compared to 8.5.99 are:

- Fix regression when reloading TLS configuration and files.

- When restoring a saved POST request after a successful FORM
  authentication, ensure that neither the URI, the query string no
  the protocol are corrupted when restoring the request body.

- Align error handling for Writer and OutputStream. Ensure use of either
  once the response has been recycled triggers a NullPointerException
  provided that discardFacades is configured with the default value of
  true.

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

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

The tag is:
https://github.com/apache/tomcat/tree/8.5.100/
eddcf278ad919382608ada1898b2c5b63675c6d5

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

-
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 just in case we do another release in the future.

2024-03-19 Thread 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 778586b36d Increment version numbers just in case we do another 
release in the future.
778586b36d is described below

commit 778586b36d6d1f38380d2e8f647654b34afe28cf
Author: Christopher Schultz 
AuthorDate: Tue Mar 19 10:10:34 2024 -0400

Increment version numbers just in case we do another release in the future.
---
 build.properties.default | 2 +-
 res/maven/mvn.properties.default | 2 +-
 webapps/docs/changelog.xml   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 16252374a7..0586390264 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -31,7 +31,7 @@
 # - Version Control Flags -
 version.major=8
 version.minor=5
-version.build=100
+version.build=101
 version.patch=0
 version.suffix=
 version.dev=-dev
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index a1bc77c6fe..d3de933542 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.100
+maven.asf.release.deploy.version=8.5.101
 
 #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 5ce2ccc8f2..1317ec9d3c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,7 +104,7 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
   
 
   


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

(tomcat) branch 10.1.x updated: Increment version numbers for next release.

2024-03-19 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 ae8acc6463 Increment version numbers for next release.
ae8acc6463 is described below

commit ae8acc6463bbc1bd1a8a7f322fbe27844a237f63
Author: Christopher Schultz 
AuthorDate: Tue Mar 19 10:09:10 2024 -0400

Increment version numbers for next release.
---
 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 4a06b0e0da..7e3cf18584 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -31,7 +31,7 @@
 # - Version Control Flags -
 version.major=10
 version.minor=1
-version.build=20
+version.build=21
 version.patch=0
 version.suffix=
 version.dev=-dev
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 306fcaddce..8e094bf1a9 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.20
+maven.asf.release.deploy.version=10.1.21
 
 #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 79ebc663b2..53f2ae09ed 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

Re: [VOTE] Release Apache Tomcat 10.1.20

2024-03-19 Thread Christopher Schultz 

All,

On 3/19/24 09:52, Christopher Schultz wrote:

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

The notable changes compared to 10.1.19 are:

- Fix regression when reloading TLS configuration and files.

- When restoring a saved POST request after a successful FORM
   authentication, ensure that neither the URI, the query string no
   the protocol are corrupted when restoring the request body.

- Align error handling for Writer and OutputStream. Ensure use of either
   once the response has been recycled triggers a NullPointerException
   provided that discardFacades is configured with the default value of
   true.

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

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

The tag is:
https://github.com/apache/tomcat/tree/10.1.20
ab4d890c6fa7be3f910370f00fb5c7f10152e21c

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


+1 for stable release

The build is 100% reproducible and the unit tests pass on MacOS x86-64.

Details:
* Environment
*  Java (build):openjdk version "17.0.10" 2024-01-16 OpenJDK Runtime 
Environment Temurin-17.0.10+7 (build 17.0.10+7) OpenJDK 64-Bit Server VM 
Temurin-17.0.10+7 (build 17.0.10+7, mixed mode)
*  Java (test): openjdk version "17.0.10" 2024-01-16 OpenJDK Runtime 
Environment Temurin-17.0.10+7 (build 17.0.10+7) OpenJDK 64-Bit Server VM 
Temurin-17.0.10+7 (build 17.0.10+7, mixed mode)

*  OS:  Darwin 21.6.0 x86_64
*  cc:  Apple clang version 12.0.0 (clang-1200.0.31.1)
*  make:GNU Make 3.81
*  OpenSSL:   OpenSSL 3.2.0 23 Nov 2023 (Library: OpenSSL 3.2.0 23 
Nov 2023)

*  APR: 1.7.4
*
* Valid SHA-512 signature for apache-tomcat-10.1.20.zip
* Valid GPG signature for apache-tomcat-10.1.20.zip
* Valid SHA-512 signature for apache-tomcat-10.1.20.tar.gz
* Valid GPG signature for apache-tomcat-10.1.20.tar.gz
* Valid SHA-512 signature for apache-tomcat-10.1.20.exe
* Valid GPG signature for apache-tomcat-10.1.20.exe
* Valid SHA512 signature for apache-tomcat-10.1.20-src.zip
* Valid GPG signature for apache-tomcat-10.1.20-src.zip
* Valid SHA512 signature for apache-tomcat-10.1.20-src.tar.gz
* Valid GPG signature for apache-tomcat-10.1.20-src.tar.gz
*
* Binary Zip and tarball: Same
* Source Zip and tarball: Same
*
* Building dependencies returned: 0
* tcnative builds cleanly
* Tomcat builds cleanly
* Junit Tests: PASSED

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

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

2024-03-19 Thread schultz 
Propchange: dev/tomcat/tomcat-8/v8.5.100/src/apache-tomcat-8.5.100-src.tar.gz
--
svn:mime-type = application/octet-stream

Added: dev/tomcat/tomcat-8/v8.5.100/src/apache-tomcat-8.5.100-src.tar.gz.asc
==
--- dev/tomcat/tomcat-8/v8.5.100/src/apache-tomcat-8.5.100-src.tar.gz.asc 
(added)
+++ dev/tomcat/tomcat-8/v8.5.100/src/apache-tomcat-8.5.100-src.tar.gz.asc Tue 
Mar 19 14:00:54 2024
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAmX5mZEACgkQHPApP6U8
+pFhsAhAAja8i74+cxuOLjS4LDhIbi58bOy/xTHawuKcKfP5ZztwEluDwrKjBGM1w
+I72F7xcAxxvyR2wWbOS/ofSkncrKnDYeu/nSlY9oQJ/TqeNGaidv5LOcICnEciX5
+Zz6Xj8N1yVIi8Ijr3z13LXsllxPzORLquxnf3G5gmnM3UDOqmtDnNaRUnpnvM3ap
+5vtLLg20x3IBEYmpdrX+Dd6Rt7eSZo4GO+MpjUaJrAoBWBZ4zTkdrAxZHri8FgJJ
+gGdllCWlIE2Dqx5ik9zuEqkSLfKUTe28rH4s88SNkByQHSnmlTMERKgxGEldklvR
+MxYcICP6GRtsHbod1DK9qUeSWJqnP/m349vHfj1XMDy5PTZesvxX0PK/OsRnWXk/
+NWys6EdXRJmLaFrxpGpTvBULlH8k3pBXIpbBNwe92opdhazjVuZHqlLOytN1pytU
++Ph3mlICNc33dYxGwIn4G0S9f8euyfiNZdAs4y3AQ8glvSf8UFlb2yfMwK6BDZ9D
+B0nGI67nNcFuc3gj/6fMU5AC7WWbFJLHmWz9BnR9xmQfugm5ernldu/bF1Fe/QXS
++d4d4LmaQ8cnTP4rpq4u/3YoyYM6O2NWURMw0Kb7dgob6FYhBduX3C/tNcwdR6rq
+3rEP3mg8VXTc/P+GJBdDLEBGy9TuBffjfUCWsKiwdcVuiOgqIlI=
+=iyrM
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-8/v8.5.100/src/apache-tomcat-8.5.100-src.tar.gz.sha512
==
--- dev/tomcat/tomcat-8/v8.5.100/src/apache-tomcat-8.5.100-src.tar.gz.sha512 
(added)
+++ dev/tomcat/tomcat-8/v8.5.100/src/apache-tomcat-8.5.100-src.tar.gz.sha512 
Tue Mar 19 14:00:54 2024
@@ -0,0 +1 @@
+ae03d6b99ba4d7b7718c0c9040db7cdd5db3e047efa3dc8ff145b3005733285b134462e0d47ef10730aba6d5ef9f7aa9d4fbd46f1dafe0ac622ac8fc2201aea2
 *apache-tomcat-8.5.100-src.tar.gz
\ No newline at end of file

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

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

Added: dev/tomcat/tomcat-8/v8.5.100/src/apache-tomcat-8.5.100-src.zip.asc
==
--- dev/tomcat/tomcat-8/v8.5.100/src/apache-tomcat-8.5.100-src.zip.asc (added)
+++ dev/tomcat/tomcat-8/v8.5.100/src/apache-tomcat-8.5.100-src.zip.asc Tue Mar 
19 14:00:54 2024
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAmX5mY4ACgkQHPApP6U8
+pFgoZg/+I0uP7vAs9C2p0KGlTpBeVpe/9XgKnWDm6iCsaXIeuPKFjh6NbrpQrf73
+4w9BK09fj1IspXZFH0EukeWHjg9cMdnFhl5KAE3Be8NFSJWRX2eJIbiSf3h9X4G+
+9AiOE8xVYJhB9hAlTC9HcNwLUDCBcP4jx4x91eKaXtD3BNtRM5ul2yB+KhLyt9KN
+R+LuuEpnqVXQVZ6gVKfq81CCv4Mf6jUZ67tvPTAFyblsEtK7BjWYgw6k+yqU57Mq
+jyUuwm4DlMPlBz+SnVUpPenVvlTouUgJOTSqdQbKDTJfeISMY6C0cFsKW1jD2ids
+Ts1ZQYaX1V7AXWK4APthlM78MXVAQC/4vsGYsRly7dtuyaVLyOnMwtaqmGzL3jlO
+Acu4skwIuRMGtnkZsJa2JjObn2iYM8XPu/6D9os2RTEgdGvDGRA6d+PkrJ1cJIcS
+DX1deCUnJbpzQGBVZ1m0ST4lJN71vyzrFV47FzW+lhcGWPE4qMz8bv0EA6O3zTiF
+Uf9esRCZ/guzXdxZi5eduA6ga0lo02woQfscLiUAyKTa9k/5IkHQQESt2AbVIWy8
+YQTdDUtsNb1zdvGzAHh1LFSRIT4dbBvb0u8IncT7p8uRdScnSuIjjgp/zV0iNori
+3k7t7GdWmQhdXRr//l2bPjuF5GVkIVePLYTLuvpZKub8hQk711E=
+=dkB1
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-8/v8.5.100/src/apache-tomcat-8.5.100-src.zip.sha512
==
--- dev/tomcat/tomcat-8/v8.5.100/src/apache-tomcat-8.5.100-src.zip.sha512 
(added)
+++ dev/tomcat/tomcat-8/v8.5.100/src/apache-tomcat-8.5.100-src.zip.sha512 Tue 
Mar 19 14:00:54 2024
@@ -0,0 +1 @@
+00fd812bf06c5b15cf61a90e04656dbeca3ef52ec0ae101334dfa3ab44cae0c8f5cac66c703c1347b8a937336f5bd921ce9d6efbe878ed37c7a1090f5d3661e9
 *apache-tomcat-8.5.100-src.zip
\ No newline at end of file



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

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

2024-03-19 Thread schultz 
Author: schultz
Date: Tue Mar 19 14:00:54 2024
New Revision: 68007

Log:
Upload v8.5.100 for voting

Added:
dev/tomcat/tomcat-8/v8.5.100/
dev/tomcat/tomcat-8/v8.5.100/KEYS
dev/tomcat/tomcat-8/v8.5.100/README.html
dev/tomcat/tomcat-8/v8.5.100/RELEASE-NOTES
dev/tomcat/tomcat-8/v8.5.100/bin/
dev/tomcat/tomcat-8/v8.5.100/bin/README.html
dev/tomcat/tomcat-8/v8.5.100/bin/apache-tomcat-8.5.100-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.100/bin/apache-tomcat-8.5.100-deployer.tar.gz.asc

dev/tomcat/tomcat-8/v8.5.100/bin/apache-tomcat-8.5.100-deployer.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.100/bin/apache-tomcat-8.5.100-deployer.zip   (with 
props)
dev/tomcat/tomcat-8/v8.5.100/bin/apache-tomcat-8.5.100-deployer.zip.asc
dev/tomcat/tomcat-8/v8.5.100/bin/apache-tomcat-8.5.100-deployer.zip.sha512
dev/tomcat/tomcat-8/v8.5.100/bin/apache-tomcat-8.5.100-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.100/bin/apache-tomcat-8.5.100-fulldocs.tar.gz.asc

dev/tomcat/tomcat-8/v8.5.100/bin/apache-tomcat-8.5.100-fulldocs.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.100/bin/apache-tomcat-8.5.100-windows-x64.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.100/bin/apache-tomcat-8.5.100-windows-x64.zip.asc

dev/tomcat/tomcat-8/v8.5.100/bin/apache-tomcat-8.5.100-windows-x64.zip.sha512
dev/tomcat/tomcat-8/v8.5.100/bin/apache-tomcat-8.5.100-windows-x86.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.100/bin/apache-tomcat-8.5.100-windows-x86.zip.asc

dev/tomcat/tomcat-8/v8.5.100/bin/apache-tomcat-8.5.100-windows-x86.zip.sha512
dev/tomcat/tomcat-8/v8.5.100/bin/apache-tomcat-8.5.100.exe   (with props)
dev/tomcat/tomcat-8/v8.5.100/bin/apache-tomcat-8.5.100.exe.asc
dev/tomcat/tomcat-8/v8.5.100/bin/apache-tomcat-8.5.100.exe.sha512
dev/tomcat/tomcat-8/v8.5.100/bin/apache-tomcat-8.5.100.tar.gz   (with props)
dev/tomcat/tomcat-8/v8.5.100/bin/apache-tomcat-8.5.100.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.100/bin/apache-tomcat-8.5.100.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.100/bin/apache-tomcat-8.5.100.zip   (with props)
dev/tomcat/tomcat-8/v8.5.100/bin/apache-tomcat-8.5.100.zip.asc
dev/tomcat/tomcat-8/v8.5.100/bin/apache-tomcat-8.5.100.zip.sha512
dev/tomcat/tomcat-8/v8.5.100/bin/embed/
dev/tomcat/tomcat-8/v8.5.100/bin/embed/apache-tomcat-8.5.100-embed.tar.gz   
(with props)

dev/tomcat/tomcat-8/v8.5.100/bin/embed/apache-tomcat-8.5.100-embed.tar.gz.asc

dev/tomcat/tomcat-8/v8.5.100/bin/embed/apache-tomcat-8.5.100-embed.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.100/bin/embed/apache-tomcat-8.5.100-embed.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.100/bin/embed/apache-tomcat-8.5.100-embed.zip.asc

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

Added: dev/tomcat/tomcat-8/v8.5.100/KEYS
==
--- dev/tomcat/tomcat-8/v8.5.100/KEYS (added)
+++ dev/tomcat/tomcat-8/v8.5.100/KEYS Tue Mar 19 14:00:54 2024
@@ -0,0 +1,785 @@
+This file contains the PGP keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS
+Apache developers:
+(pgpk -ll  && pgpk -xa ) >> this file.
+  or
+(gpg --fingerprint --list-sigs 
+ && gpg --armor --export ) >> this file.
+
+Apache developers: please ensure that your key is also available via the
+PGP keyservers (such as pgpkeys.mit.edu).
+
+
+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

(tomcat) 01/01: Tag 8.5.100

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

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

commit eddcf278ad919382608ada1898b2c5b63675c6d5
Author: ChristopherSchultz 
AuthorDate: Tue Mar 19 09:59:18 2024 -0400

Tag 8.5.100
---
 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..34fb37183e
--- /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-03-19T13:54:42Z
+
+# 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..22db297f4f
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..37c7bb00cc
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..a35bba231b
--- /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.100
+
+# Re-use the same GPG executable.

(tomcat) tag 8.5.100 created (now eddcf278ad)

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

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


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

 new eddcf278ad Tag 8.5.100

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

[VOTE] Release Apache Tomcat 10.1.20

2024-03-19 Thread Christopher Schultz 

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

The notable changes compared to 10.1.19 are:

- Fix regression when reloading TLS configuration and files.

- When restoring a saved POST request after a successful FORM
  authentication, ensure that neither the URI, the query string no
  the protocol are corrupted when restoring the request body.

- Align error handling for Writer and OutputStream. Ensure use of either
  once the response has been recycled triggers a NullPointerException
  provided that discardFacades is configured with the default value of
  true.

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

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

The tag is:
https://github.com/apache/tomcat/tree/10.1.20
ab4d890c6fa7be3f910370f00fb5c7f10152e21c

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

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

(tomcat) 01/02: Unify comma-separated-value code and optimize the implementation (#707)

2024-03-19 Thread 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

commit 7482d9bfdcb7a1d3cd931ff0bf1c21d963c96a05
Author: Christopher Schultz 
AuthorDate: Sun Mar 17 10:33:00 2024 -0400

Unify comma-separated-value code and optimize the implementation (#707)

Add new StringUtils.splitCommaSeparated utility method which uses a simple 
search pattern for comma-separated values instead of a regular expression.
---
 java/org/apache/catalina/connector/Connector.java  |  3 ++-
 .../org/apache/catalina/filters/ExpiresFilter.java | 15 ++
 .../apache/catalina/filters/RemoteCIDRFilter.java  |  3 ++-
 .../apache/catalina/filters/RemoteIpFilter.java| 15 ++
 java/org/apache/catalina/realm/JNDIRealm.java  |  6 --
 java/org/apache/catalina/util/NetMaskSet.java  |  4 +++-
 .../apache/catalina/valves/RemoteCIDRValve.java|  3 ++-
 java/org/apache/catalina/valves/RemoteIpValve.java | 18 +++-
 java/org/apache/tomcat/util/buf/StringUtils.java   | 24 ++
 .../catalina/filters/TestRemoteIpFilter.java   |  4 ++--
 .../apache/catalina/valves/TestRemoteIpValve.java  |  5 +++--
 11 files changed, 61 insertions(+), 39 deletions(-)

diff --git a/java/org/apache/catalina/connector/Connector.java 
b/java/org/apache/catalina/connector/Connector.java
index e102bac5bb..a1c1244d03 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -45,6 +45,7 @@ import org.apache.tomcat.util.buf.B2CConverter;
 import org.apache.tomcat.util.buf.CharsetUtil;
 import org.apache.tomcat.util.buf.EncodedSolidusHandling;
 import org.apache.tomcat.util.buf.UDecoder;
+import org.apache.tomcat.util.buf.StringUtils;
 import org.apache.tomcat.util.net.SSLHostConfig;
 import org.apache.tomcat.util.net.openssl.OpenSSLImplementation;
 import org.apache.tomcat.util.res.StringManager;
@@ -539,7 +540,7 @@ public class Connector extends LifecycleMBeanBase {
 HashSet methodSet = new HashSet<>();
 
 if (null != methods) {
-methodSet.addAll(Arrays.asList(methods.split("\\s*,\\s*")));
+
methodSet.addAll(Arrays.asList(StringUtils.splitCommaSeparated(methods)));
 }
 
 if (methodSet.contains("TRACE")) {
diff --git a/java/org/apache/catalina/filters/ExpiresFilter.java 
b/java/org/apache/catalina/filters/ExpiresFilter.java
index a4ad475cce..7eb63a7612 100644
--- a/java/org/apache/catalina/filters/ExpiresFilter.java
+++ b/java/org/apache/catalina/filters/ExpiresFilter.java
@@ -28,7 +28,6 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.StringTokenizer;
-import java.util.regex.Pattern;
 
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
@@ -47,6 +46,7 @@ import org.apache.catalina.core.ApplicationMappingImpl;
 import org.apache.catalina.core.ApplicationMappingMatch;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.buf.StringUtils;
 
 /**
  * 
@@ -1013,11 +1013,6 @@ public class ExpiresFilter extends FilterBase {
 
 }
 
-/**
- * {@link Pattern} for a comma delimited string that support whitespace 
characters
- */
-private static final Pattern commaSeparatedValuesPattern = 
Pattern.compile("\\s*,\\s*");
-
 private static final String HEADER_CACHE_CONTROL = "Cache-Control";
 
 private static final String HEADER_EXPIRES = "Expires";
@@ -1042,7 +1037,7 @@ public class ExpiresFilter extends FilterBase {
  * @return never {@code null} array
  */
 protected static int[] commaDelimitedListToIntArray(String 
commaDelimitedInts) {
-String[] intsAsStrings = 
commaDelimitedListToStringArray(commaDelimitedInts);
+String[] intsAsStrings = 
StringUtils.splitCommaSeparated(commaDelimitedInts);
 int[] ints = new int[intsAsStrings.length];
 for (int i = 0; i < intsAsStrings.length; i++) {
 String intAsString = intsAsStrings[i];
@@ -1062,10 +1057,12 @@ public class ExpiresFilter extends FilterBase {
  * @param commaDelimitedStrings the string to be split
  *
  * @return array of patterns (non {@code null})
+ *
+ * @deprecated Unused. Will be removed in Tomcat 11.
  */
+@Deprecated
 protected static String[] commaDelimitedListToStringArray(String 
commaDelimitedStrings) {
-return (commaDelimitedStrings == null || 
commaDelimitedStrings.length() == 0) ? new String[0] :
-commaSeparatedValuesPattern.split(commaDelimitedStrings);
+return StringUtils.splitCommaSeparated(commaDelimitedStrings);
 }
 
 /**
diff --git a/java/org/apache/catalina/filters/RemoteCIDRFilter.java 
b/java/org/apache/catalina/filters/RemoteCIDRFilter.java
index fbd4caf764..5961dd43ae 100644
---

(tomcat) branch 8.5.x updated (a11bac054f -> 1fa3b5d1e0)

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

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


from a11bac054f Fix regression in user provided SSLContext support
 new 7482d9bfdc Unify comma-separated-value code and optimize the 
implementation (#707)
 new 1fa3b5d1e0 Fix import order.

The 2 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.


Summary of changes:
 java/org/apache/catalina/connector/Connector.java  |  3 ++-
 .../org/apache/catalina/filters/ExpiresFilter.java | 15 ++
 .../apache/catalina/filters/RemoteCIDRFilter.java  |  3 ++-
 .../apache/catalina/filters/RemoteIpFilter.java| 15 ++
 java/org/apache/catalina/realm/JNDIRealm.java  |  6 --
 java/org/apache/catalina/util/NetMaskSet.java  |  4 +++-
 .../apache/catalina/valves/RemoteCIDRValve.java|  3 ++-
 java/org/apache/catalina/valves/RemoteIpValve.java | 18 +++-
 java/org/apache/tomcat/util/buf/StringUtils.java   | 24 ++
 .../catalina/filters/TestRemoteIpFilter.java   |  4 ++--
 .../apache/catalina/valves/TestRemoteIpValve.java  |  5 +++--
 11 files changed, 61 insertions(+), 39 deletions(-)


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

(tomcat) 02/02: Fix import order.

2024-03-19 Thread 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

commit 1fa3b5d1e08d7d59b52bd8a65390437fe73e
Author: Christopher Schultz 
AuthorDate: Tue Mar 19 09:48:16 2024 -0400

Fix import order.
---
 java/org/apache/catalina/connector/Connector.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/connector/Connector.java 
b/java/org/apache/catalina/connector/Connector.java
index a1c1244d03..03ab2b8f0f 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -44,8 +44,8 @@ import org.apache.tomcat.util.IntrospectionUtils;
 import org.apache.tomcat.util.buf.B2CConverter;
 import org.apache.tomcat.util.buf.CharsetUtil;
 import org.apache.tomcat.util.buf.EncodedSolidusHandling;
-import org.apache.tomcat.util.buf.UDecoder;
 import org.apache.tomcat.util.buf.StringUtils;
+import org.apache.tomcat.util.buf.UDecoder;
 import org.apache.tomcat.util.net.SSLHostConfig;
 import org.apache.tomcat.util.net.openssl.OpenSSLImplementation;
 import org.apache.tomcat.util.res.StringManager;


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

svn commit: r68006 - in /dev/tomcat/tomcat-10/v10.1.20: ./ bin/ bin/embed/ src/

2024-03-19 Thread schultz 
Author: schultz
Date: Tue Mar 19 12:57:42 2024
New Revision: 68006

Log:
Upload v10.1.20 for voting.

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

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

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

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

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

dev/tomcat/tomcat-10/v10.1.20/bin/embed/apache-tomcat-10.1.20-embed.tar.gz.asc

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

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

Added: dev/tomcat/tomcat-10/v10.1.20/KEYS
==
--- dev/tomcat/tomcat-10/v10.1.20/KEYS (added)
+++ dev/tomcat/tomcat-10/v10.1.20/KEYS Tue Mar 19 12:57:42 2024
@@ -0,0 +1,562 @@
+This file contains the PGP keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS
+Apache developers:
+(pgpk -ll  && pgpk -xa ) >> this file.
+  or
+(gpg --fingerprint --list-sigs 
+ && gpg --armor --export ) >> this file.
+
+Apache developers: please ensure that your key is also available via the
+PGP keyservers (such as pgpkeys.mit.edu).
+
+
+pub   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

(tomcat) 01/01: Tag 10.1.20

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

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

commit ab4d890c6fa7be3f910370f00fb5c7f10152e21c
Author: ChristopherSchultz 
AuthorDate: Tue Mar 19 08:55:07 2024 -0400

Tag 10.1.20
---
 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..20d835073f
--- /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-03-19T12:49:58Z
+
+# 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..f4668ebcba
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..394a1a2cab
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..6fa717a708
--- /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.20
+
+# Re-use the same GPG executable.

(tomcat) tag 10.1.20 created (now ab4d890c6f)

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

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


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

 new ab4d890c6f Tag 10.1.20

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

Re: [PR] Sort the resource list,Ensure consistency in the order of loading res… [tomcat]

2024-03-19 Thread via GitHub 


markt-asf closed pull request #708: Sort the resource list,Ensure consistency 
in the order of loading res…
URL: https://github.com/apache/tomcat/pull/708


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


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

Re: [PR] Sort the resource list,Ensure consistency in the order of loading res… [tomcat]

2024-03-19 Thread via GitHub 


markt-asf commented on PR #708:
URL: https://github.com/apache/tomcat/pull/708#issuecomment-2006814096

   Closing see https://bz.apache.org/bugzilla/show_bug.cgi?id=57129 for the 
reasons.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


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

Re: (tomcat) branch main updated: IDE says this is no longer required

2024-03-19 Thread Mark Thomas 

On 18/03/2024 22:18, Rémy Maucherat wrote:

On Mon, Mar 18, 2024 at 9:30 PM Mark Thomas  wrote:


On 18/03/2024 20:24, ma...@apache.org wrote:

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 1972d821a0 IDE says this is no longer required
1972d821a0 is described below

commit 1972d821a093002328e7a43c4a7e2ef1fb017af2
Author: Mark Thomas 
AuthorDate: Mon Mar 18 20:24:07 2024 +

  IDE says this is no longer required


Just realised this was new rather than old. I'm guessing you are
compiling with Java 22 in the IDE which is why you need this?


Yes, it's an IDE warning.


No problem. I'll revert my change.

Mark

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

(tomcat) branch main updated: Checkstyle

2024-03-19 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 d88395724c Checkstyle
d88395724c is described below

commit d88395724c9def7cb03005c1a5db2410e6d89930
Author: remm 
AuthorDate: Tue Mar 19 09:31:37 2024 +0100

Checkstyle
---
 webapps/docs/changelog.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1766e6ede2..78bc1f2619 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -159,7 +159,6 @@
 org.apache.catalina.security.TLSCertificateReloadListener.
 (markt)
   
-  
 
   
   


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

[PR] Sort the resource list,Ensure consistency in the order of loading res… [tomcat]

2024-03-19 Thread via GitHub 


zxm1234 opened a new pull request, #708:
URL: https://github.com/apache/tomcat/pull/708

   …ources.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


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