10.1.19: sporadic NullPointerException in org.apache.tomcat.websocket.TestWsSessionSuspendResume.testSuspendThenClose()
Hi there, I see sporadic NullPointerExceptions when running the new unit test in org.apache.tomcat.websocket.TestWsSessionSuspendResume: Testcase: testSuspendThenClose took 1.952 sec Caused an ERROR Cannot invoke "org.apache.tomcat.websocket.WsSession.isClosed()" because "org.apache.tomcat.websocket.TestWsSessionSuspendResume$SuspendCloseEndpoint.serverSession" is null java.lang.NullPointerException: Cannot invoke "org.apache.tomcat.websocket.WsSession.isClosed()" because "org.apache.tomcat.websocket.TestWsSessionSuspendResume$SuspendCloseEndpoint.serverSession" is null at org.apache.tomcat.websocket.TestWsSessionSuspendResume$SuspendCloseEndpoint.isServerSessionFullyClosed(TestWsSessionSuspendResume.java:229) at org.apache.tomcat.websocket.TestWsSessionSuspendResume.testSuspendThenClose(TestWsSessionSuspendResume.java:173) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) It happen ed 22 times in 714 different combinations of Java versions, JDK vendors, JSSE or tcnative connectors and Linux versions. They do not seem to depend on the Java version, experiencing them for Java 11 and 17 (21 not yet tested). Most of the exceptions happen during tests with tcnative 1.3.0 or 2.0.7, but at least once also with JSSE. The specific test is new in this version. Best regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 9.0.86
Rémy, On 2/15/24 18:26, Christopher Schultz wrote: Rémy, Thanks for RMing. On 2/14/24 03:53, Rémy Maucherat wrote: The proposed Apache Tomcat 9.0.86 release is now available for voting. The notable changes compared to 9.0.85 are: - Add improvements to the CSRF prevention filter including the ability to skip adding nonces for resource name and subtree URL patterns. - Add support for user provided SSLContext instances configured on SSLHostConfigCertificate instances. Based on pull request #673 provided by Hakan Altındağ. - Review usage of debug logging and downgrade trace or data dumping operations from debug level to trace. 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.86/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1481 The tag is: https://github.com/apache/tomcat/tree/9.0.86 542c35ae834fb29616b184a0e4276a5b7f8542de The proposed 9.0.86 release is: [ ] -1, Broken - do not release [ ] +1, Stable - go ahead and release as 9.0.86 +1 for stable release. Build is reproducible on MacOS arm64 and x86-64, except for the "fulldocs" package which has known issues for reproducibility. The unit tests for NIO and NIO2 pass on those platforms as well. APR tests passed on x86-84 but the APR library wasn't loaded successfully on arm64 for some reason which I will investigate later. My tests on the arm64 platform were not correctly-specifying the location of the apr library, so tcnative was not loadable. Fixing that has proved all unit tests for NIO, NIO2, and APR all passing on MacOS arm64. -chris - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.5.99
Am 15.02.24 um 00:10 schrieb Christopher Schultz: The proposed Apache Tomcat 8.5.99 release is now available for voting. The notable changes compared to 8.5.99 are: - Add improvements to the CSRF prevention filter including the ability to skip adding nonces for resource name and subtree URL patterns. - Add support for user provided SSLContext instances configured on SSLHostConfigCertificate instances. Based on pull request #673 provided by Hakan Altındağ. - Review usage of debug logging and downgrade trace or data dumping operations from debug level to trace. 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.99/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1483 The tag is: https://github.com/apache/tomcat/tree/8.5.99/ fe841cca81f15355ed4096c5c155f0ceb49a05da The proposed 8.5.99 release is: [ ] Broken - do not release [x] Stable - go ahead and release as 8.5.99 (stable) +1 for Stable Felix - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org OpenPGP_0xEA6C3728EA91C4AF.asc Description: OpenPGP public key OpenPGP_signature.asc Description: OpenPGP digital signature
Re: [VOTE] Release Apache Tomcat 9.0.86
Am 14.02.24 um 09:53 schrieb Rémy Maucherat: The proposed Apache Tomcat 9.0.86 release is now available for voting. The notable changes compared to 9.0.85 are: - Add improvements to the CSRF prevention filter including the ability to skip adding nonces for resource name and subtree URL patterns. - Add support for user provided SSLContext instances configured on SSLHostConfigCertificate instances. Based on pull request #673 provided by Hakan Altındağ. - Review usage of debug logging and downgrade trace or data dumping operations from debug level to trace. 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.86/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1481 The tag is: https://github.com/apache/tomcat/tree/9.0.86 542c35ae834fb29616b184a0e4276a5b7f8542de The proposed 9.0.86 release is: [ ] -1, Broken - do not release [x] +1, Stable - go ahead and release as 9.0.86 +1 for Stable Felix Rémy - To unsubscribe, e-mail:dev-unsubscr...@tomcat.apache.org For additional commands, e-mail:dev-h...@tomcat.apache.org OpenPGP_0xEA6C3728EA91C4AF.asc Description: OpenPGP public key OpenPGP_signature.asc Description: OpenPGP digital signature
Re: [VOTE] Release Apache Tomcat 10.1.19
Am 14.02.24 um 23:43 schrieb Christopher Schultz: The proposed Apache Tomcat 10.1.19 release is now available for voting. The notable changes compared to 10.1.18 are: - Add improvements to the CSRF prevention filter including the ability to skip adding nonces for resource name and subtree URL patterns. - Add support for user provided SSLContext instances configured on SSLHostConfigCertificate instances. Based on pull request #673 provided by Hakan Altındağ. - Review usage of debug logging and downgrade trace or data dumping operations from debug level to trace. 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.19/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1482 The tag is: https://github.com/apache/tomcat/tree/10.1.19 9287d3342f12d20cbdb66c11228b0f80a40a43a0 The proposed 10.1.19 release is: [ ] Broken - do not release [x] Stable - go ahead and release as 10.1.19 +1 for Stable Felix - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org OpenPGP_0xEA6C3728EA91C4AF.asc Description: OpenPGP public key OpenPGP_signature.asc Description: OpenPGP digital signature
Re: [VOTE] Release Apache Tomcat 11.0.0-M17
Am 13.02.24 um 23:50 schrieb Mark Thomas: The proposed Apache Tomcat 11.0.0-M17 release is now available for voting. Apache Tomcat 11.0.0-M17 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: - Add improvements to the CSRF prevention filter including the ability to skip adding nonces for resource name and subtree URL patterns. - Add support for user provided SSLContext instances configured on SSLHostConfigCertificate instances. Based on pull request #673 provided by Hakan Altındağ. - Review usage of debug logging and downgrade trace or data dumping operations from debug level to trace. 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-M17/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1480 The tag is: https://github.com/apache/tomcat/tree/11.0.0-M17 110bc36637569f7e9d191d21ac8600a8667cfc94 The proposed 11.0.0-M17 release is: [ ] -1 Broken - do not release [x] +1 Alpha - go ahead and release as 11.0.0-M17 +1 for Alpha Felix - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org OpenPGP_0xEA6C3728EA91C4AF.asc Description: OpenPGP public key OpenPGP_signature.asc Description: OpenPGP digital signature
Buildbot failure in on tomcat-9.0.x
Build status: BUILD FAILED: failed compile (failure) Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/37/builds/866 Blamelist: Christopher Schultz , remm Build Text: failed compile (failure) Status Detected: new failure Build Source Stamp: [branch 9.0.x] 3ad83488ec03082f2b1875a2d2d49b7cb298ce4c Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 2 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: QUIC over TCP
On Fri, Feb 16, 2024 at 5:00 PM Mark Thomas wrote: > > Hi all, > > The IETF HTTP working group has received a draft for running QUIC over > TCP+TLS rather than UDP called QUIC on streams. There is also a draft > for running HTTP/3 on QUIC on streams. > > https://lists.w3.org/Archives/Public/ietf-http-wg/2024JanMar/0078.html > > I have only skimmed these but this looks like a much more viable > implementation route for HTTP/3 for Tomcat. > > It is early days. I was imagining I would look at this over the summer > once the work for Jakarta EE 11 was complete. Even in the best of the best scenario where the OpenSSL QUIC implementation is great and easy to use, it would still be a Tomcat 12 only thing due to the Java version constraints (given the pushback on EE 11 using Java 21, it might actually be Tomcat 13 instead ;) ). So yes a plan with TCP is a lot more realistic for Tomcat. Rémy > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 68631] Observing org.apache.catalina.connector.ClientAbortException: java.net.SocketTimeoutException
https://bz.apache.org/bugzilla/show_bug.cgi?id=68631 --- Comment #3 from Mark Thomas --- Update to latest 9.0.x release and retest. If you still see the issue, provide the simplest possible test case (with source) that demonstrates the issue on a clean install of Tomcat. Not marking as NEEDINFO (yet) as I want to test a 9000 byte upload over TLS first (but I'd be surprised if that failed on a default install). -- 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 68631] Observing org.apache.catalina.connector.ClientAbortException: java.net.SocketTimeoutException
https://bz.apache.org/bugzilla/show_bug.cgi?id=68631 --- Comment #2 from Suryanarayana Garlapati --- Any help here? -- 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
QUIC over TCP
Hi all, The IETF HTTP working group has received a draft for running QUIC over TCP+TLS rather than UDP called QUIC on streams. There is also a draft for running HTTP/3 on QUIC on streams. https://lists.w3.org/Archives/Public/ietf-http-wg/2024JanMar/0078.html I have only skimmed these but this looks like a much more viable implementation route for HTTP/3 for Tomcat. It is early days. I was imagining I would look at this over the summer once the work for Jakarta EE 11 was complete. Mark - 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: Correct changelog.
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 fed66068b6 Correct changelog. fed66068b6 is described below commit fed66068b666f5a1ee0602b108ce5df54e1b422f Author: Christopher Schultz AuthorDate: Fri Feb 16 10:19:42 2024 -0500 Correct changelog. --- webapps/docs/changelog.xml | 16 ++-- 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index edd962380a..cfa29db518 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -105,6 +105,16 @@ issues do not "pop up" wrt. others). --> + + + +Improvements to French translations. (remm) + + +Improvements to Japanese translations by tak7iji. (markt) + + + @@ -227,12 +237,6 @@ Add strings for debug level messages. (remm) - -Improvements to French translations. (remm) - - -Improvements to Japanese translations by tak7iji. (markt) - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 8.5.x updated: Increment version numbers for next release.
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 ec068a5457 Increment version numbers for next release. ec068a5457 is described below commit ec068a5457f95465af5d3c021ce948a09dff9abb Author: Christopher Schultz AuthorDate: Fri Feb 16 10:18:03 2024 -0500 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 ffce6fa232..2c4cd6f702 100644 --- a/build.properties.default +++ b/build.properties.default @@ -31,7 +31,7 @@ # - Version Control Flags - version.major=8 version.minor=5 -version.build=99 +version.build=100 version.patch=0 version.suffix= version.dev=-dev diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default index e771545a06..a1bc77c6fe 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.99 +maven.asf.release.deploy.version=8.5.100 #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 735453a2a1..edd962380a 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 8.5.99
All, On 2/14/24 18:10, Christopher Schultz wrote: The proposed Apache Tomcat 8.5.99 release is now available for voting. The notable changes compared to 8.5.99 are: - Add improvements to the CSRF prevention filter including the ability to skip adding nonces for resource name and subtree URL patterns. - Add support for user provided SSLContext instances configured on SSLHostConfigCertificate instances. Based on pull request #673 provided by Hakan Altındağ. - Review usage of debug logging and downgrade trace or data dumping operations from debug level to trace. 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.99/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1483 The tag is: https://github.com/apache/tomcat/tree/8.5.99/ fe841cca81f15355ed4096c5c155f0ceb49a05da The proposed 8.5.99 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 8.5.99 (stable) +1 for stable release. Works on plain servlet-based application in a development environment. The build is reproducible on Linux minus a few discrepancies with exact JDK build numbers in JAR file MANIFEST.MF files. Unit tests pass on MacOS and Linux. Note that the TestMapperWebapps unit-test fails because the version of ECJ that ships with Tomcat is too old for Java 17, and I haven't made arrangements in my test harness to upgrade ECJ. 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.99.zip * Valid GPG signature for apache-tomcat-8.5.99.zip * Valid SHA-512 signature for apache-tomcat-8.5.99.tar.gz * Valid GPG signature for apache-tomcat-8.5.99.tar.gz * Valid SHA-512 signature for apache-tomcat-8.5.99.exe * Valid GPG signature for apache-tomcat-8.5.99.exe * Valid Windows Digital Signature for apache-tomcat-8.5.99.exe * Valid SHA512 signature for apache-tomcat-8.5.99-src.zip * Valid GPG signature for apache-tomcat-8.5.99-src.zip * Valid SHA512 signature for apache-tomcat-8.5.99-src.tar.gz * Valid GPG signature for apache-tomcat-8.5.99-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, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 8.5.x updated: Add instructions for comparing release artifacts with a local release build.
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 661bce79de Add instructions for comparing release artifacts with a
local release build.
661bce79de is described below
commit 661bce79dec1860c95ed84dd1682cd589e0a975d
Author: Christopher Schultz
AuthorDate: Fri Feb 16 10:03:21 2024 -0500
Add instructions for comparing release artifacts with a local release build.
---
build.xml | 8
1 file changed, 8 insertions(+)
diff --git a/build.xml b/build.xml
index 3f581e8201..4e344aa818 100644
--- a/build.xml
+++ b/build.xml
@@ -3784,6 +3784,14 @@ Considering using a tool such as "diffoscope"[1] to
inspect the differences
between the official release and your local-build. There may be trivial
differences that should not be considered troublesome.
+For example:
+$ wget
https://dist.apache.org/repos/dist/release/tomcat/tomcat-${version.major}/v${version}/src/apache-tomcat-${version}-src.tar.gz
+ or, for a release candidate:
+$ wget
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-${version.major}/v${version}/src/apache-tomcat-${version}-src.tar.gz
+ then:
+$ diffoscope apache-tomcat-${version}-src.tar.gz
output/release/v${version}/src/apache-tomcat-${version}-src.tar.gz
+
+
[1] https://diffoscope.org/
-
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: Add instructions for comparing release artifacts with a local release build.
This is an automated email from the ASF dual-hosted git repository.
schultz pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 3ad83488ec Add instructions for comparing release artifacts with a
local release build.
3ad83488ec is described below
commit 3ad83488ec03082f2b1875a2d2d49b7cb298ce4c
Author: Christopher Schultz
AuthorDate: Fri Feb 16 10:03:21 2024 -0500
Add instructions for comparing release artifacts with a local release build.
---
build.xml | 14 ++
1 file changed, 14 insertions(+)
diff --git a/build.xml b/build.xml
index 9f878e0d79..638df5ecc6 100644
--- a/build.xml
+++ b/build.xml
@@ -4213,6 +4213,20 @@ reproducible-10=${reproducible-10}
One or more signatures failed.
+
+Considering using a tool such as "diffoscope"[1] to inspect the differences
+between the official release and your local-build. There may be trivial
+differences that should not be considered troublesome.
+
+For example:
+$ wget
https://dist.apache.org/repos/dist/release/tomcat/tomcat-${version.major}/v${version}/src/apache-tomcat-${version}-src.tar.gz
+ or, for a release candidate:
+$ wget
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-${version.major}/v${version}/src/apache-tomcat-${version}-src.tar.gz
+ then:
+$ diffoscope apache-tomcat-${version}-src.tar.gz
output/release/v${version}/src/apache-tomcat-${version}-src.tar.gz
+
+
+[1] https://diffoscope.org/
-
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 instructions for comparing release artifacts with a local release build.
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 57278a5712 Add instructions for comparing release artifacts with a
local release build.
57278a5712 is described below
commit 57278a571212bd372b4b1615bcc35fa8a456c761
Author: Christopher Schultz
AuthorDate: Fri Feb 16 10:03:21 2024 -0500
Add instructions for comparing release artifacts with a local release build.
---
build.xml | 8
1 file changed, 8 insertions(+)
diff --git a/build.xml b/build.xml
index b2add858d9..c3f3268742 100644
--- a/build.xml
+++ b/build.xml
@@ -4279,6 +4279,14 @@ Considering using a tool such as "diffoscope"[1] to
inspect the differences
between the official release and your local-build. There may be trivial
differences that should not be considered troublesome.
+For example:
+$ wget
https://dist.apache.org/repos/dist/release/tomcat/tomcat-${version.major}/v${version}/src/apache-tomcat-${version}-src.tar.gz
+ or, for a release candidate:
+$ wget
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-${version.major}/v${version}/src/apache-tomcat-${version}-src.tar.gz
+ then:
+$ diffoscope apache-tomcat-${version}-src.tar.gz
output/release/v${version}/src/apache-tomcat-${version}-src.tar.gz
+
+
[1] https://diffoscope.org/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Add instructions for comparing release artifacts with a local release build.
This is an automated email from the ASF dual-hosted git repository.
schultz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 4bd1cbf898 Add instructions for comparing release artifacts with a
local release build.
4bd1cbf898 is described below
commit 4bd1cbf8984dbb6148d59b68422796fc225fd764
Author: Christopher Schultz
AuthorDate: Fri Feb 16 10:03:21 2024 -0500
Add instructions for comparing release artifacts with a local release build.
---
build.xml | 8
1 file changed, 8 insertions(+)
diff --git a/build.xml b/build.xml
index 18f6a6a11e..22379895f9 100644
--- a/build.xml
+++ b/build.xml
@@ -4206,6 +4206,14 @@ Considering using a tool such as "diffoscope"[1] to
inspect the differences
between the official release and your local-build. There may be trivial
differences that should not be considered troublesome.
+For example:
+$ wget
https://dist.apache.org/repos/dist/release/tomcat/tomcat-${version.major}/v${version}/src/apache-tomcat-${version}-src.tar.gz
+ or, for a release candidate:
+$ wget
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-${version.major}/v${version}/src/apache-tomcat-${version}-src.tar.gz
+ then:
+$ diffoscope apache-tomcat-${version}-src.tar.gz
output/release/v${version}/src/apache-tomcat-${version}-src.tar.gz
+
+
[1] https://diffoscope.org/
-
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: Missing commit
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 684a8aeebd Missing commit
684a8aeebd is described below
commit 684a8aeebd403a15a9add59d8dceab389bc40924
Author: remm
AuthorDate: Fri Feb 16 14:04:31 2024 +0100
Missing commit
---
java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
b/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
index b8031526d0..9008db20d6 100644
--- a/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
+++ b/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
@@ -242,7 +242,7 @@ public abstract class WsRemoteEndpointImplBase implements
RemoteEndpoint {
encoderBuffer.clear();
CoderResult cr = encoder.encode(part, encoderBuffer, true);
if (cr.isError()) {
-throw new IllegalArgumentException(cr.toString());
+throw new
IllegalArgumentException(sm.getString("wsRemoteEndpoint.encoderError", cr));
}
isDone = !cr.isOverflow();
encoderBuffer.flip();
-
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: Missing commit
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 55349a708d Missing commit
55349a708d is described below
commit 55349a708d3f612f2e06194db01b9d25316e906a
Author: remm
AuthorDate: Fri Feb 16 14:04:31 2024 +0100
Missing commit
---
java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
b/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
index d5de3a9916..7c28b06901 100644
--- a/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
+++ b/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
@@ -243,7 +243,7 @@ public abstract class WsRemoteEndpointImplBase implements
RemoteEndpoint {
encoderBuffer.clear();
CoderResult cr = encoder.encode(part, encoderBuffer, true);
if (cr.isError()) {
-throw new IllegalArgumentException(cr.toString());
+throw new
IllegalArgumentException(sm.getString("wsRemoteEndpoint.encoderError", cr));
}
isDone = !cr.isOverflow();
encoderBuffer.flip();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Missing commit
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 42c5a0fa07 Missing commit
42c5a0fa07 is described below
commit 42c5a0fa0718d99de572323aa9094bc694323b64
Author: remm
AuthorDate: Fri Feb 16 14:04:31 2024 +0100
Missing commit
---
java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
b/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
index 215508518f..9843a77115 100644
--- a/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
+++ b/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
@@ -246,7 +246,7 @@ public abstract class WsRemoteEndpointImplBase implements
RemoteEndpoint {
encoderBuffer.clear();
CoderResult cr = encoder.encode(part, encoderBuffer, true);
if (cr.isError()) {
-throw new IllegalArgumentException(cr.toString());
+throw new
IllegalArgumentException(sm.getString("wsRemoteEndpoint.encoderError", cr));
}
isDone = !cr.isOverflow();
encoderBuffer.flip();
-
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: Missing strings mostly
This is an automated email from the ASF dual-hosted git repository.
remm 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 29d048b5e5 Missing strings mostly
29d048b5e5 is described below
commit 29d048b5e578361f1abd480ff9398328e5f7e467
Author: remm
AuthorDate: Fri Feb 16 12:19:09 2024 +0100
Missing strings mostly
---
java/org/apache/catalina/filters/CorsFilter.java | 11 +--
.../catalina/filters/LocalStrings.properties | 1 +
java/org/apache/catalina/servlets/CGIServlet.java | 5 ++---
.../catalina/servlets/LocalStrings.properties | 2 ++
.../valves/CrawlerSessionManagerValve.java | 8
.../valves/rewrite/LocalStrings.properties | 5 +
.../catalina/valves/rewrite/Substitution.java | 23 --
7 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/java/org/apache/catalina/filters/CorsFilter.java
b/java/org/apache/catalina/filters/CorsFilter.java
index ada5e9909a..f34e4a5af7 100644
--- a/java/org/apache/catalina/filters/CorsFilter.java
+++ b/java/org/apache/catalina/filters/CorsFilter.java
@@ -352,16 +352,7 @@ public class CorsFilter implements Filter {
response.resetBuffer();
if (log.isDebugEnabled()) {
-// Debug so no need for i18n
-StringBuilder message = new StringBuilder("Invalid CORS request;
Origin=");
-message.append(origin);
-message.append(";Method=");
-message.append(method);
-if (accessControlRequestHeaders != null) {
-message.append(";Access-Control-Request-Headers=");
-message.append(accessControlRequestHeaders);
-}
-log.debug(message.toString());
+sm.getString("corsFilter.invalidRequest", origin, method,
accessControlRequestHeaders);
}
}
diff --git a/java/org/apache/catalina/filters/LocalStrings.properties
b/java/org/apache/catalina/filters/LocalStrings.properties
index be56650ae2..aab53ede4f 100644
--- a/java/org/apache/catalina/filters/LocalStrings.properties
+++ b/java/org/apache/catalina/filters/LocalStrings.properties
@@ -16,6 +16,7 @@
addDefaultCharset.unsupportedCharset=Specified character set [{0}] is not
supported
corsFilter.invalidPreflightMaxAge=Unable to parse preflightMaxAge
+corsFilter.invalidRequest=Invalid CORS request; Origin [{0}] Method [{1}]
Access-Control-Request-Headers [{2}]
corsFilter.invalidSupportsCredentials=It is not allowed to configure
supportsCredentials=[true] when allowedOrigins=[*]
corsFilter.nullRequest=HttpServletRequest object is null
corsFilter.nullRequestType=CORSRequestType object is null
diff --git a/java/org/apache/catalina/servlets/CGIServlet.java
b/java/org/apache/catalina/servlets/CGIServlet.java
index 839c1b1671..39237610a4 100644
--- a/java/org/apache/catalina/servlets/CGIServlet.java
+++ b/java/org/apache/catalina/servlets/CGIServlet.java
@@ -1434,7 +1434,7 @@ public final class CGIServlet extends HttpServlet {
*/
if (!isReady()) {
-throw new IOException(this.getClass().getName() + ": not ready
to run.");
+throw new IOException(sm.getString("cgiServlet.notReady"));
}
if (log.isTraceEnabled()) {
@@ -1443,8 +1443,7 @@ public final class CGIServlet extends HttpServlet {
if ((command.contains(File.separator + "." + File.separator)) ||
(command.contains(File.separator + "..")) ||
(command.contains(".." + File.separator))) {
-throw new IOException(this.getClass().getName() + "Illegal
Character in CGI command path " +
-"('.' or '..') detected. Not running CGI [" + command
+ "].");
+throw new
IOException(sm.getString("cgiServlet.invalidCommand", command));
}
/*
diff --git a/java/org/apache/catalina/servlets/LocalStrings.properties
b/java/org/apache/catalina/servlets/LocalStrings.properties
index 1ce4990490..38807654a3 100644
--- a/java/org/apache/catalina/servlets/LocalStrings.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings.properties
@@ -25,6 +25,8 @@ cgiServlet.find.location=Looking for a file at [{0}]
cgiServlet.find.path=CGI script requested at path [{0}] relative to CGI
location [{1}]
cgiServlet.invalidArgumentDecoded=The decoded command line argument [{0}] did
not match the configured cmdLineArgumentsDecoded pattern [{1}]
cgiServlet.invalidArgumentEncoded=The encoded command line argument [{0}] did
not match the configured cmdLineArgumentsEncoded pattern [{1}]
+cgiServlet.invalidCommand=Illegal Character in CGI command path ('.' or '..')
detected, not running CGI [{0}]
+cgiServlet.notReady=CGI Servlet is not ready to run
cgiServlet.runBadHeader=Bad header line [{0}]
cgiServlet.runFail=I/O problems processing
(tomcat) branch 9.0.x updated: Missing strings mostly
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 324b96928f Missing strings mostly
324b96928f is described below
commit 324b96928fe52ca343e1925d83547881f6a56ba0
Author: remm
AuthorDate: Fri Feb 16 12:19:09 2024 +0100
Missing strings mostly
---
java/org/apache/catalina/filters/CorsFilter.java | 11 +--
.../catalina/filters/LocalStrings.properties | 1 +
java/org/apache/catalina/servlets/CGIServlet.java | 5 ++---
.../catalina/servlets/LocalStrings.properties | 2 ++
.../catalina/storeconfig/LocalStrings.properties | 1 +
.../apache/catalina/storeconfig/StoreRegistry.java | 2 +-
.../membership/cloud/AbstractStreamProvider.java | 7 +++
.../membership/cloud/CloudMembershipProvider.java | 3 ++-
.../membership/cloud/DNSMembershipProvider.java| 2 +-
.../cloud/KubernetesMembershipProvider.java| 2 +-
.../membership/cloud/LocalStrings.properties | 6 ++
.../valves/CrawlerSessionManagerValve.java | 8
.../valves/rewrite/LocalStrings.properties | 5 +
.../catalina/valves/rewrite/Substitution.java | 23 --
.../tomcat/websocket/LocalStrings.properties | 1 +
15 files changed, 44 insertions(+), 35 deletions(-)
diff --git a/java/org/apache/catalina/filters/CorsFilter.java
b/java/org/apache/catalina/filters/CorsFilter.java
index d6e294a1b7..38b4749fe9 100644
--- a/java/org/apache/catalina/filters/CorsFilter.java
+++ b/java/org/apache/catalina/filters/CorsFilter.java
@@ -350,16 +350,7 @@ public class CorsFilter extends GenericFilter {
response.resetBuffer();
if (log.isDebugEnabled()) {
-// Debug so no need for i18n
-StringBuilder message = new StringBuilder("Invalid CORS request;
Origin=");
-message.append(origin);
-message.append(";Method=");
-message.append(method);
-if (accessControlRequestHeaders != null) {
-message.append(";Access-Control-Request-Headers=");
-message.append(accessControlRequestHeaders);
-}
-log.debug(message.toString());
+sm.getString("corsFilter.invalidRequest", origin, method,
accessControlRequestHeaders);
}
}
diff --git a/java/org/apache/catalina/filters/LocalStrings.properties
b/java/org/apache/catalina/filters/LocalStrings.properties
index be56650ae2..aab53ede4f 100644
--- a/java/org/apache/catalina/filters/LocalStrings.properties
+++ b/java/org/apache/catalina/filters/LocalStrings.properties
@@ -16,6 +16,7 @@
addDefaultCharset.unsupportedCharset=Specified character set [{0}] is not
supported
corsFilter.invalidPreflightMaxAge=Unable to parse preflightMaxAge
+corsFilter.invalidRequest=Invalid CORS request; Origin [{0}] Method [{1}]
Access-Control-Request-Headers [{2}]
corsFilter.invalidSupportsCredentials=It is not allowed to configure
supportsCredentials=[true] when allowedOrigins=[*]
corsFilter.nullRequest=HttpServletRequest object is null
corsFilter.nullRequestType=CORSRequestType object is null
diff --git a/java/org/apache/catalina/servlets/CGIServlet.java
b/java/org/apache/catalina/servlets/CGIServlet.java
index 4a41795f17..b825920559 100644
--- a/java/org/apache/catalina/servlets/CGIServlet.java
+++ b/java/org/apache/catalina/servlets/CGIServlet.java
@@ -1434,7 +1434,7 @@ public final class CGIServlet extends HttpServlet {
*/
if (!isReady()) {
-throw new IOException(this.getClass().getName() + ": not ready
to run.");
+throw new IOException(sm.getString("cgiServlet.notReady"));
}
if (log.isTraceEnabled()) {
@@ -1443,8 +1443,7 @@ public final class CGIServlet extends HttpServlet {
if ((command.contains(File.separator + "." + File.separator)) ||
(command.contains(File.separator + "..")) ||
(command.contains(".." + File.separator))) {
-throw new IOException(this.getClass().getName() + "Illegal
Character in CGI command path " +
-"('.' or '..') detected. Not running CGI [" + command
+ "].");
+throw new
IOException(sm.getString("cgiServlet.invalidCommand", command));
}
/*
diff --git a/java/org/apache/catalina/servlets/LocalStrings.properties
b/java/org/apache/catalina/servlets/LocalStrings.properties
index 1ce4990490..38807654a3 100644
--- a/java/org/apache/catalina/servlets/LocalStrings.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings.properties
@@ -25,6 +25,8 @@ cgiServlet.find.location=Looking for a file at [{0}]
cgiServlet.find.path=CGI script requested at path [{0}] relative to CGI
location [{1}]
cgiServlet.invalidArgumentDecoded=The decoded
(tomcat) branch 10.1.x updated: Missing strings mostly
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 ee246168da Missing strings mostly
ee246168da is described below
commit ee246168dacc262f5ca87718ab913b48499194e5
Author: remm
AuthorDate: Fri Feb 16 12:19:09 2024 +0100
Missing strings mostly
---
java/org/apache/catalina/filters/CorsFilter.java | 11 +--
.../catalina/filters/LocalStrings.properties | 1 +
java/org/apache/catalina/servlets/CGIServlet.java | 5 ++--
.../catalina/servlets/LocalStrings.properties | 2 ++
.../apache/catalina/session/DataSourceStore.java | 35 +++---
.../catalina/session/LocalStrings.properties | 1 +
.../catalina/storeconfig/LocalStrings.properties | 1 +
.../apache/catalina/storeconfig/StoreRegistry.java | 2 +-
.../membership/cloud/AbstractStreamProvider.java | 7 ++---
.../membership/cloud/CloudMembershipProvider.java | 3 +-
.../membership/cloud/DNSMembershipProvider.java| 2 +-
.../cloud/KubernetesMembershipProvider.java| 2 +-
.../membership/cloud/LocalStrings.properties | 6
.../valves/CrawlerSessionManagerValve.java | 8 ++---
.../valves/rewrite/LocalStrings.properties | 5
.../catalina/valves/rewrite/Substitution.java | 23 +++---
.../tomcat/websocket/LocalStrings.properties | 1 +
17 files changed, 62 insertions(+), 53 deletions(-)
diff --git a/java/org/apache/catalina/filters/CorsFilter.java
b/java/org/apache/catalina/filters/CorsFilter.java
index 1f063aa4c4..bdc97ddb12 100644
--- a/java/org/apache/catalina/filters/CorsFilter.java
+++ b/java/org/apache/catalina/filters/CorsFilter.java
@@ -350,16 +350,7 @@ public class CorsFilter extends GenericFilter {
response.resetBuffer();
if (log.isDebugEnabled()) {
-// Debug so no need for i18n
-StringBuilder message = new StringBuilder("Invalid CORS request;
Origin=");
-message.append(origin);
-message.append(";Method=");
-message.append(method);
-if (accessControlRequestHeaders != null) {
-message.append(";Access-Control-Request-Headers=");
-message.append(accessControlRequestHeaders);
-}
-log.debug(message.toString());
+sm.getString("corsFilter.invalidRequest", origin, method,
accessControlRequestHeaders);
}
}
diff --git a/java/org/apache/catalina/filters/LocalStrings.properties
b/java/org/apache/catalina/filters/LocalStrings.properties
index be56650ae2..aab53ede4f 100644
--- a/java/org/apache/catalina/filters/LocalStrings.properties
+++ b/java/org/apache/catalina/filters/LocalStrings.properties
@@ -16,6 +16,7 @@
addDefaultCharset.unsupportedCharset=Specified character set [{0}] is not
supported
corsFilter.invalidPreflightMaxAge=Unable to parse preflightMaxAge
+corsFilter.invalidRequest=Invalid CORS request; Origin [{0}] Method [{1}]
Access-Control-Request-Headers [{2}]
corsFilter.invalidSupportsCredentials=It is not allowed to configure
supportsCredentials=[true] when allowedOrigins=[*]
corsFilter.nullRequest=HttpServletRequest object is null
corsFilter.nullRequestType=CORSRequestType object is null
diff --git a/java/org/apache/catalina/servlets/CGIServlet.java
b/java/org/apache/catalina/servlets/CGIServlet.java
index 30b2097b36..7458b5aab2 100644
--- a/java/org/apache/catalina/servlets/CGIServlet.java
+++ b/java/org/apache/catalina/servlets/CGIServlet.java
@@ -1433,7 +1433,7 @@ public final class CGIServlet extends HttpServlet {
*/
if (!isReady()) {
-throw new IOException(this.getClass().getName() + ": not ready
to run.");
+throw new IOException(sm.getString("cgiServlet.notReady"));
}
if (log.isTraceEnabled()) {
@@ -1442,8 +1442,7 @@ public final class CGIServlet extends HttpServlet {
if ((command.contains(File.separator + "." + File.separator)) ||
(command.contains(File.separator + "..")) ||
(command.contains(".." + File.separator))) {
-throw new IOException(this.getClass().getName() + "Illegal
Character in CGI command path " +
-"('.' or '..') detected. Not running CGI [" + command
+ "].");
+throw new
IOException(sm.getString("cgiServlet.invalidCommand", command));
}
/*
diff --git a/java/org/apache/catalina/servlets/LocalStrings.properties
b/java/org/apache/catalina/servlets/LocalStrings.properties
index 1ce4990490..38807654a3 100644
--- a/java/org/apache/catalina/servlets/LocalStrings.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings.properties
@@ -25,6 +25,8 @@ cgiServlet.find.location=Looking for a file at [{0}]
(tomcat) branch main updated: Missing strings mostly
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 ef17c5bea6 Missing strings mostly
ef17c5bea6 is described below
commit ef17c5bea659bcdcb2ef97d248db9a757f280dd7
Author: remm
AuthorDate: Fri Feb 16 12:19:09 2024 +0100
Missing strings mostly
---
java/org/apache/catalina/filters/CorsFilter.java | 11 +--
.../catalina/filters/LocalStrings.properties | 1 +
java/org/apache/catalina/servlets/CGIServlet.java | 5 ++--
.../catalina/servlets/LocalStrings.properties | 2 ++
.../apache/catalina/session/DataSourceStore.java | 35 +++---
.../catalina/session/LocalStrings.properties | 1 +
.../catalina/storeconfig/LocalStrings.properties | 1 +
.../apache/catalina/storeconfig/StoreRegistry.java | 2 +-
.../membership/cloud/AbstractStreamProvider.java | 7 ++---
.../membership/cloud/CloudMembershipProvider.java | 3 +-
.../membership/cloud/DNSMembershipProvider.java| 2 +-
.../cloud/KubernetesMembershipProvider.java| 2 +-
.../membership/cloud/LocalStrings.properties | 6
.../valves/CrawlerSessionManagerValve.java | 8 ++---
.../valves/rewrite/LocalStrings.properties | 5
.../catalina/valves/rewrite/Substitution.java | 23 +++---
.../apache/tomcat/util/net/AbstractEndpoint.java | 2 +-
.../apache/tomcat/util/net/LocalStrings.properties | 1 +
.../tomcat/websocket/LocalStrings.properties | 1 +
19 files changed, 64 insertions(+), 54 deletions(-)
diff --git a/java/org/apache/catalina/filters/CorsFilter.java
b/java/org/apache/catalina/filters/CorsFilter.java
index 1f063aa4c4..bdc97ddb12 100644
--- a/java/org/apache/catalina/filters/CorsFilter.java
+++ b/java/org/apache/catalina/filters/CorsFilter.java
@@ -350,16 +350,7 @@ public class CorsFilter extends GenericFilter {
response.resetBuffer();
if (log.isDebugEnabled()) {
-// Debug so no need for i18n
-StringBuilder message = new StringBuilder("Invalid CORS request;
Origin=");
-message.append(origin);
-message.append(";Method=");
-message.append(method);
-if (accessControlRequestHeaders != null) {
-message.append(";Access-Control-Request-Headers=");
-message.append(accessControlRequestHeaders);
-}
-log.debug(message.toString());
+sm.getString("corsFilter.invalidRequest", origin, method,
accessControlRequestHeaders);
}
}
diff --git a/java/org/apache/catalina/filters/LocalStrings.properties
b/java/org/apache/catalina/filters/LocalStrings.properties
index be56650ae2..aab53ede4f 100644
--- a/java/org/apache/catalina/filters/LocalStrings.properties
+++ b/java/org/apache/catalina/filters/LocalStrings.properties
@@ -16,6 +16,7 @@
addDefaultCharset.unsupportedCharset=Specified character set [{0}] is not
supported
corsFilter.invalidPreflightMaxAge=Unable to parse preflightMaxAge
+corsFilter.invalidRequest=Invalid CORS request; Origin [{0}] Method [{1}]
Access-Control-Request-Headers [{2}]
corsFilter.invalidSupportsCredentials=It is not allowed to configure
supportsCredentials=[true] when allowedOrigins=[*]
corsFilter.nullRequest=HttpServletRequest object is null
corsFilter.nullRequestType=CORSRequestType object is null
diff --git a/java/org/apache/catalina/servlets/CGIServlet.java
b/java/org/apache/catalina/servlets/CGIServlet.java
index c00d98bd4a..2f7cf2f64c 100644
--- a/java/org/apache/catalina/servlets/CGIServlet.java
+++ b/java/org/apache/catalina/servlets/CGIServlet.java
@@ -1438,7 +1438,7 @@ public final class CGIServlet extends HttpServlet {
*/
if (!isReady()) {
-throw new IOException(this.getClass().getName() + ": not ready
to run.");
+throw new IOException(sm.getString("cgiServlet.notReady"));
}
if (log.isTraceEnabled()) {
@@ -1447,8 +1447,7 @@ public final class CGIServlet extends HttpServlet {
if ((command.contains(File.separator + "." + File.separator)) ||
(command.contains(File.separator + "..")) ||
(command.contains(".." + File.separator))) {
-throw new IOException(this.getClass().getName() + "Illegal
Character in CGI command path " +
-"('.' or '..') detected. Not running CGI [" + command
+ "].");
+throw new
IOException(sm.getString("cgiServlet.invalidCommand", command));
}
/*
diff --git a/java/org/apache/catalina/servlets/LocalStrings.properties
b/java/org/apache/catalina/servlets/LocalStrings.properties
index 1ce4990490..38807654a3 100644
--- a/java/org/apache/catalina/servlets/LocalStrings.properties
+++
