(tomcat) branch 9.0.x updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new 53f0ae527f Fix typo 53f0ae527f is described below commit 53f0ae527f34ea3153f13808d77ac88476baa633 Author: Mark Thomas AuthorDate: Wed Feb 26 17:24:18 2025 + Fix typo --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 6b9d8fa628..15cefdf8b4 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -175,7 +175,7 @@ -69576: Avoid possible failure intializing +69576: Avoid possible failure initializing JreCompat due to uncaught exception introduced for the check for CVE-2024-56337. (remm) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 11.0.x updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 11.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/11.0.x by this push: new 1bb9d1ef12 Fix typo 1bb9d1ef12 is described below commit 1bb9d1ef12a9c39e1e710ea31cb0eb884b0d03ed Author: Mark Thomas AuthorDate: Wed Feb 26 17:24:18 2025 + Fix typo --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index d637b7c89e..b7c34b0032 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -182,7 +182,7 @@ -69576: Avoid possible failure intializing +69576: Avoid possible failure initializing JreCompat due to uncaught exception introduced for the check for CVE-2024-56337. (remm) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new 9b0ad19f48 Fix typo 9b0ad19f48 is described below commit 9b0ad19f485fd1f87f2d121694cd8e145ae246b4 Author: Mark Thomas AuthorDate: Wed Feb 26 17:24:18 2025 + Fix typo --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index ca1c1ccf6f..3789f89d2f 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -182,7 +182,7 @@ -69576: Avoid possible failure intializing +69576: Avoid possible failure initializing JreCompat due to uncaught exception introduced for the check for CVE-2024-56337. (remm) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 69599] Changelog missing for Tomcat 10.1.36
https://bz.apache.org/bugzilla/show_bug.cgi?id=69599 Christopher Schultz changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WONTFIX --- Comment #1 from Christopher Schultz --- The changelog for 10.1.36 is incorrectly labeled 10.1.35 in the current public changelog. You'll notice that 10.1.35 is listed twice. The one toward the top of the page is the (mislabeled) changelog for 10.1.36. We will not be correcting the 10.1.36 release artifacts, but they will be corrected in the 10.1.37 release. The public web site will be updated at that time as well. I would expect 10.1.37 to be released in roughly one week. -- 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 69595] Add file-size-based rotation to AccessLogValve
https://bz.apache.org/bugzilla/show_bug.cgi?id=69595 Christopher Schultz changed: What|Removed |Added Summary|It seems that the file size |Add file-size-based |based rotation feature |rotation to AccessLogValve |needs to be added to| |AccessLogValve. | -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 11.0.x updated: Update change log
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 11.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/11.0.x by this push: new 8da24416d1 Update change log 8da24416d1 is described below commit 8da24416d1ece545fdbe1bbacf887df3755055a0 Author: Mark Thomas AuthorDate: Wed Feb 26 17:19:36 2025 + Update change log --- webapps/docs/changelog.xml | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index ee746a0696..d637b7c89e 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -116,10 +116,6 @@ possible that cached 'not found' results could effectively hide lookup results using the correct resource name. (markt) - -Improve the mechanism for detecting whether a web application has been -deployed to a case sensitive or a case insensitive file system. (markt) - Enable the JNDIRealm to validate credentials provided to HttpServletRequest.login(String username, String password) @@ -127,7 +123,8 @@ Improve the checks for exposure to and protection against CVE-2024-56337 -so that reflection is not used unless required. (markt) +so that reflection is not used unless required. The checks for whether +the file system is case sensitive or not have been removed. (markt) Fix a bug in the JRE compatibility detection that incorrectly identified - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 11.0.x updated: Add release date for 11.0.4
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 11.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/11.0.x by this push: new 029655b0b8 Add release date for 11.0.4 029655b0b8 is described below commit 029655b0b81ba1c91bad36655735c5d8bbbabe7f Author: Mark Thomas AuthorDate: Wed Feb 26 17:18:23 2025 + Add release date for 11.0.4 --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 14dde0b930..ee746a0696 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -181,7 +181,7 @@ - + - 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: Update change log
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new d5cac6c27f Update change log d5cac6c27f is described below commit d5cac6c27feac723e471a194038f4dffda0121c5 Author: Mark Thomas AuthorDate: Wed Feb 26 17:19:36 2025 + Update change log --- webapps/docs/changelog.xml | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 070746e257..377e03c740 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -116,10 +116,6 @@ possible that cached 'not found' results could effectively hide lookup results using the correct resource name. (markt) - -Improve the mechanism for detecting whether a web application has been -deployed to a case sensitive or a case insensitive file system. (markt) - Enable the JNDIRealm to validate credentials provided to HttpServletRequest.login(String username, String password) @@ -131,7 +127,8 @@ Improve the checks for exposure to and protection against CVE-2024-56337 -so that reflection is not used unless required. (markt) +so that reflection is not used unless required. The checks for whether +the file system is case sensitive or not have been removed. (markt) Add support for logging the connection ID (as returned by - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Add release date for 10.1.36
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new 91d4af4f9a Add release date for 10.1.36 91d4af4f9a is described below commit 91d4af4f9af19c37a2271aea73a655a8f99a9af4 Author: Mark Thomas AuthorDate: Wed Feb 26 17:21:49 2025 + Add release date for 10.1.36 --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 377e03c740..ca1c1ccf6f 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -178,7 +178,7 @@ - + - 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: Update change log
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new 34dd606aba Update change log 34dd606aba is described below commit 34dd606aba228f1639b1cd8432e4985321e7a8e1 Author: Mark Thomas AuthorDate: Wed Feb 26 17:19:36 2025 + Update change log --- webapps/docs/changelog.xml | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index cb0efeb8a7..6b9d8fa628 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -116,10 +116,6 @@ possible that cached 'not found' results could effectively hide lookup results using the correct resource name. (markt) - -Improve the mechanism for detecting whether a web application has been -deployed to a case sensitive or a case insensitive file system. (markt) - Enable the JNDIRealm to validate credentials provided to HttpServletRequest.login(String username, String password) @@ -131,7 +127,8 @@ Improve the checks for exposure to and protection against CVE-2024-56337 -so that reflection is not used unless required. (markt) +so that reflection is not used unless required. The checks for whether +the file system is case sensitive or not have been removed. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated (6318783952 -> 5bc4bfb668)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git from 6318783952 Fix race condition in HTTP/2 stream reset. Fixes 500 responses. new 293736f2ab Update Byte Buddy to 1.17.1. new 5cf5176128 Update Checkstyle to 10.21.3 new 154f3bfe0c Update SpotBugs to 4.9.1 new 5bc4bfb668 Update JSign to 7.1 The 4 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: build.properties.default | 16 webapps/docs/changelog.xml | 12 2 files changed, 20 insertions(+), 8 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 04/04: Update JSign to 7.1
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
commit 5bc4bfb668180bb59feefab1d4178ceb3900537e
Author: Mark Thomas
AuthorDate: Wed Feb 26 16:51:00 2025 +
Update JSign to 7.1
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 0cc4323c20..1a47ed9bbf 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -317,10 +317,10 @@
migration-lib.jar=${migration-lib.home}/jakartaee-migration-${migration-lib.vers
migration-lib.loc=${base-maven.loc}/org/apache/tomcat/jakartaee-migration/${migration-lib.version}/jakartaee-migration-${migration-lib.version}-shaded.jar
# - JSign, version 4.1 or later -
-jsign.version=6.0
+jsign.version=7.1
jsign.checksum.enabled=true
jsign.checksum.algorithm=MD5|SHA-1
-jsign.checksum.value=c14fe256b5bc42dc6934d3ce7b659cdf|d2f1a60711c3b51123f84cd9e04dd9d482d95f5e
+jsign.checksum.value=91dadce3950b260d8097d1ca9cfe3c6f|348919ddaeed5100e1dd6a05b98da6c61e192afe
jsign.home=${base.path}/jsign-${jsign.version}
jsign.jar=${jsign.home}/jsign-${jsign.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cfbb2e4c5d..03895193ce 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -244,6 +244,9 @@
Update SpotBugs to 4.9.1. (markt)
+
+Update JSign to 7.1. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 03/04: Update SpotBugs to 4.9.1
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
commit 154f3bfe0c656b4935888b5002678a0b79895fbf
Author: Mark Thomas
AuthorDate: Wed Feb 26 16:49:22 2025 +
Update SpotBugs to 4.9.1
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index f2f8742928..0cc4323c20 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -287,10 +287,10 @@ jacoco.jar=${jacoco.home}/lib/jacocoant.jar
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
# - SpotBugs (originally FindBugs) -
-spotbugs.version=4.9.0
+spotbugs.version=4.9.1
spotbugs.checksum.enabled=true
spotbugs.checksum.algorithm=SHA-512
-spotbugs.checksum.value=84dc14d73e2ac12afd6987c5ff10c92398f28392c60a760c13764243ad24a8f77b8444530641745053204dd9f32ca36ec953632a940f88a94f52e14232c61130
+spotbugs.checksum.value=9240d07bb315ea437a85e90c887cf8e655275b0e0f6abfea8f1a2999c67a4c1690bff5c31101c4473895ab51456dd4a380b247b9451576c065f5c29c8eca4fe5
spotbugs.home=${base.path}/spotbugs-${spotbugs.version}
spotbugs.jar=${spotbugs.home}/lib/spotbugs-ant.jar
spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/spotbugs-${spotbugs.version}.tgz
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5483030f07..cfbb2e4c5d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -241,6 +241,9 @@
Update Checkstyle to 10.21.3. (markt)
+
+Update SpotBugs to 4.9.1. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/04: Update Byte Buddy to 1.17.1.
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
commit 293736f2abf4431d3a8ea4d5f6d1b728f08096e2
Author: Mark Thomas
AuthorDate: Wed Feb 26 16:46:31 2025 +
Update Byte Buddy to 1.17.1.
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index e91ea12647..e65bbfc152 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -251,10 +251,10 @@
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
# - byte-buddy, used by EasyMock, version 1.12.18 or later -
-bytebuddy.version=1.16.1
+bytebuddy.version=1.17.1
bytebuddy.checksum.enabled=true
bytebuddy.checksum.algorithm=MD5|SHA-1
-bytebuddy.checksum.value=ba44d75d8a9a19e029ce52a8010b2238|f95f4d5efa5e07706129048a62b38a0acb35592c
+bytebuddy.checksum.value=133a95ba62ed6a61d83facee7e5823d8|8b5205fad48196a88d3d66dddff5a7417bce3596
bytebuddy.home=${base.path}/byte-buddy-${bytebuddy.version}
bytebuddy.jar=${bytebuddy.home}/byte-buddy-${bytebuddy.version}.jar
bytebuddy.loc=${base-maven.loc}/net/bytebuddy/byte-buddy/${bytebuddy.version}/byte-buddy-${bytebuddy.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e22e6bb796..2c75e7d040 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -235,6 +235,9 @@
Explicitly set the locale to be used for Javadoc. For official
releases,
this locale will be English (US) to support reproducible builds.
(schultz)
+
+Update Byte Buddy to 1.17.1. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/04: Update Checkstyle to 10.21.3
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
commit 5cf5176128233d4c92541f3f7e1d5706e318665e
Author: Mark Thomas
AuthorDate: Wed Feb 26 16:47:54 2025 +
Update Checkstyle to 10.21.3
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index e65bbfc152..f2f8742928 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -269,10 +269,10 @@
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
# - Checkstyle, version 6.16 or later -
-checkstyle.version=10.21.2
+checkstyle.version=10.21.3
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=0d19bcbbd62a674f0f174cc5aabf920fe8a01102d1de269c7c7bb9c31219c15d6a95d79c7d175de03664061ed1e8c3683b26a4e4a70957d32e367f16a33b7b69
+checkstyle.checksum.value=7792b199cf556ff7849bb7cd3043cc39a06371a9448ca62d146e1016724ca6cf0b65ac6f3d08fce7dcad7b06200a3d7bf81a5969bdea171981cbf6243e6680ec
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2c75e7d040..5483030f07 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -238,6 +238,9 @@
Update Byte Buddy to 1.17.1. (markt)
+
+Update Checkstyle to 10.21.3. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 11.0.x updated: Update Byte Buddy to 1.17.1.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new e40f89d8a8 Update Byte Buddy to 1.17.1.
e40f89d8a8 is described below
commit e40f89d8a864cdcb307a81296661380046403cb8
Author: Mark Thomas
AuthorDate: Wed Feb 26 16:46:31 2025 +
Update Byte Buddy to 1.17.1.
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 8eff6d66f3..a0cab05922 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -250,10 +250,10 @@
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
# - byte-buddy, used by EasyMock, version 1.12.18 or later -
-bytebuddy.version=1.16.1
+bytebuddy.version=1.17.1
bytebuddy.checksum.enabled=true
bytebuddy.checksum.algorithm=MD5|SHA-1
-bytebuddy.checksum.value=ba44d75d8a9a19e029ce52a8010b2238|f95f4d5efa5e07706129048a62b38a0acb35592c
+bytebuddy.checksum.value=133a95ba62ed6a61d83facee7e5823d8|8b5205fad48196a88d3d66dddff5a7417bce3596
bytebuddy.home=${base.path}/byte-buddy-${bytebuddy.version}
bytebuddy.jar=${bytebuddy.home}/byte-buddy-${bytebuddy.version}.jar
bytebuddy.loc=${base-maven.loc}/net/bytebuddy/byte-buddy/${bytebuddy.version}/byte-buddy-${bytebuddy.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 884fb03ceb..cd791971a9 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -166,6 +166,9 @@
Add makensis as an option for building the Installer for
Windows on non-Windows platforms. (rjung/markt)
+
+Update Byte Buddy to 1.17.1. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Update Byte Buddy to 1.17.1.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 7374a085ae Update Byte Buddy to 1.17.1.
7374a085ae is described below
commit 7374a085ae06daed8e1ea857f9f925c5352021fa
Author: Mark Thomas
AuthorDate: Wed Feb 26 16:46:31 2025 +
Update Byte Buddy to 1.17.1.
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 5d33c82b3a..5c0bcfcf06 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -273,10 +273,10 @@
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
# - byte-buddy, used by EasyMock, version 1.12.18 or later -
-bytebuddy.version=1.16.1
+bytebuddy.version=1.17.1
bytebuddy.checksum.enabled=true
bytebuddy.checksum.algorithm=MD5|SHA-1
-bytebuddy.checksum.value=ba44d75d8a9a19e029ce52a8010b2238|f95f4d5efa5e07706129048a62b38a0acb35592c
+bytebuddy.checksum.value=133a95ba62ed6a61d83facee7e5823d8|8b5205fad48196a88d3d66dddff5a7417bce3596
bytebuddy.home=${base.path}/byte-buddy-${bytebuddy.version}
bytebuddy.jar=${bytebuddy.home}/byte-buddy-${bytebuddy.version}.jar
bytebuddy.loc=${base-maven.loc}/net/bytebuddy/byte-buddy/${bytebuddy.version}/byte-buddy-${bytebuddy.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2564090636..d1e92f2198 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -159,6 +159,9 @@
Add makensis as an option for building the Installer for
Windows on non-Windows platforms. (rjung/markt)
+
+Update Byte Buddy to 1.17.1. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Update Byte Buddy to 1.17.1.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 7b3397dbce Update Byte Buddy to 1.17.1.
7b3397dbce is described below
commit 7b3397dbce797d8439b0aef798192fa0a873e1e2
Author: Mark Thomas
AuthorDate: Wed Feb 26 16:46:31 2025 +
Update Byte Buddy to 1.17.1.
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index a28c0a8b7e..cf70ecc69b 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -271,10 +271,10 @@
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
# - byte-buddy, used by EasyMock, version 1.12.18 or later -
-bytebuddy.version=1.16.1
+bytebuddy.version=1.17.1
bytebuddy.checksum.enabled=true
bytebuddy.checksum.algorithm=MD5|SHA-1
-bytebuddy.checksum.value=ba44d75d8a9a19e029ce52a8010b2238|f95f4d5efa5e07706129048a62b38a0acb35592c
+bytebuddy.checksum.value=133a95ba62ed6a61d83facee7e5823d8|8b5205fad48196a88d3d66dddff5a7417bce3596
bytebuddy.home=${base.path}/byte-buddy-${bytebuddy.version}
bytebuddy.jar=${bytebuddy.home}/byte-buddy-${bytebuddy.version}.jar
bytebuddy.loc=${base-maven.loc}/net/bytebuddy/byte-buddy/${bytebuddy.version}/byte-buddy-${bytebuddy.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9c0b1f712a..19ec719274 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -166,6 +166,9 @@
Add makensis as an option for building the Installer for
Windows on non-Windows platforms. (rjung/markt)
+
+Update Byte Buddy to 1.17.1. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Update Checkstyle to 10.21.3
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 42ecbed487 Update Checkstyle to 10.21.3
42ecbed487 is described below
commit 42ecbed487405fda0d01341c9cfd74a3fe74daf3
Author: Mark Thomas
AuthorDate: Wed Feb 26 16:47:54 2025 +
Update Checkstyle to 10.21.3
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index cf70ecc69b..a6ec8ac50d 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -289,10 +289,10 @@
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
# - Checkstyle, version 6.16 or later -
-checkstyle.version=10.21.2
+checkstyle.version=10.21.3
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=0d19bcbbd62a674f0f174cc5aabf920fe8a01102d1de269c7c7bb9c31219c15d6a95d79c7d175de03664061ed1e8c3683b26a4e4a70957d32e367f16a33b7b69
+checkstyle.checksum.value=7792b199cf556ff7849bb7cd3043cc39a06371a9448ca62d146e1016724ca6cf0b65ac6f3d08fce7dcad7b06200a3d7bf81a5969bdea171981cbf6243e6680ec
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 19ec719274..7de512adcd 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -169,6 +169,9 @@
Update Byte Buddy to 1.17.1. (markt)
+
+Update Checkstyle to 10.21.3. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 11.0.x updated: Update Checkstyle to 10.21.3
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 1e55f83de7 Update Checkstyle to 10.21.3
1e55f83de7 is described below
commit 1e55f83de75bb4bd37c87e512eab8cc55daf49f0
Author: Mark Thomas
AuthorDate: Wed Feb 26 16:47:54 2025 +
Update Checkstyle to 10.21.3
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index a0cab05922..e442990ea3 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -268,10 +268,10 @@
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
# - Checkstyle, version 6.16 or later -
-checkstyle.version=10.21.2
+checkstyle.version=10.21.3
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=0d19bcbbd62a674f0f174cc5aabf920fe8a01102d1de269c7c7bb9c31219c15d6a95d79c7d175de03664061ed1e8c3683b26a4e4a70957d32e367f16a33b7b69
+checkstyle.checksum.value=7792b199cf556ff7849bb7cd3043cc39a06371a9448ca62d146e1016724ca6cf0b65ac6f3d08fce7dcad7b06200a3d7bf81a5969bdea171981cbf6243e6680ec
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cd791971a9..a3bda6a664 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -169,6 +169,9 @@
Update Byte Buddy to 1.17.1. (markt)
+
+Update Checkstyle to 10.21.3. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Fix race condition in HTTP/2 stream reset. Fixes 500 responses.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 3a9e995561 Fix race condition in HTTP/2 stream reset. Fixes 500
responses.
3a9e995561 is described below
commit 3a9e995561df352769ae18944599e4a307a5e20e
Author: Mark Thomas
AuthorDate: Wed Feb 26 16:28:21 2025 +
Fix race condition in HTTP/2 stream reset. Fixes 500 responses.
---
java/org/apache/coyote/http2/Stream.java | 21 -
webapps/docs/changelog.xml | 4
2 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index c543ecd127..88cbf6d8c5 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -1511,11 +1511,22 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
readStateLock.unlock();
}
-// Trigger ReadListener.onError()
-getCoyoteRequest().setAttribute(RequestDispatcher.ERROR_EXCEPTION,
-new
IOException(sm.getString("stream.clientResetRequest")));
-coyoteRequest.action(ActionCode.DISPATCH_ERROR, null);
-coyoteRequest.action(ActionCode.DISPATCH_EXECUTE, null);
+/*
+ * There is a potential race between a reset being received by the
Http2UpgradeHandler and the
+ * StreamProcessor recycling the Stream. The use of recycledLock
ensures that an attempt is not made to
+ * notify the ReadListener after the Stream has been recycled.
+ */
+if (!recycled) {
+synchronized (recycledLock) {
+if (!recycled) {
+// Trigger ReadListener.onError()
+
getCoyoteRequest().setAttribute(RequestDispatcher.ERROR_EXCEPTION,
+new
IOException(sm.getString("stream.clientResetRequest")));
+coyoteRequest.action(ActionCode.DISPATCH_ERROR, null);
+coyoteRequest.action(ActionCode.DISPATCH_EXECUTE,
null);
+}
+}
+}
}
@Override
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8248c461b2..2564090636 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -147,6 +147,10 @@
Content-Encoding if the client submits a TE
header containing gzip. (remm)
+
+Fix a race condition in the handling of HTTP/2 stream reset that could
+cause unexpected 500 responses. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Fix race condition in HTTP/2 stream reset. Fixes 500 responses.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new cc0c222e14 Fix race condition in HTTP/2 stream reset. Fixes 500
responses.
cc0c222e14 is described below
commit cc0c222e142369cbe701d2a48b56d08955931fef
Author: Mark Thomas
AuthorDate: Wed Feb 26 16:28:21 2025 +
Fix race condition in HTTP/2 stream reset. Fixes 500 responses.
---
java/org/apache/coyote/http2/Stream.java | 21 -
webapps/docs/changelog.xml | 4
2 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index 233293c7b7..c4c8ac941e 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -1511,11 +1511,22 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
readStateLock.unlock();
}
-// Trigger ReadListener.onError()
-getCoyoteRequest().setAttribute(RequestDispatcher.ERROR_EXCEPTION,
-new
IOException(sm.getString("stream.clientResetRequest")));
-coyoteRequest.action(ActionCode.DISPATCH_ERROR, null);
-coyoteRequest.action(ActionCode.DISPATCH_EXECUTE, null);
+/*
+ * There is a potential race between a reset being received by the
Http2UpgradeHandler and the
+ * StreamProcessor recycling the Stream. The use of recycledLock
ensures that an attempt is not made to
+ * notify the ReadListener after the Stream has been recycled.
+ */
+if (!recycled) {
+synchronized (recycledLock) {
+if (!recycled) {
+// Trigger ReadListener.onError()
+
getCoyoteRequest().setAttribute(RequestDispatcher.ERROR_EXCEPTION,
+new
IOException(sm.getString("stream.clientResetRequest")));
+coyoteRequest.action(ActionCode.DISPATCH_ERROR, null);
+coyoteRequest.action(ActionCode.DISPATCH_EXECUTE,
null);
+}
+}
+}
}
@Override
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1e358d206e..9c0b1f712a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -154,6 +154,10 @@
Content-Encoding if the client submits a TE
header containing gzip. (remm)
+
+Fix a race condition in the handling of HTTP/2 stream reset that could
+cause unexpected 500 responses. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Fix race condition in HTTP/2 stream reset. Fixes 500 responses.
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 6318783952 Fix race condition in HTTP/2 stream reset. Fixes 500
responses.
6318783952 is described below
commit 63187839521a26c1b7d0a1c076ce6a331cf8b035
Author: Mark Thomas
AuthorDate: Wed Feb 26 16:28:21 2025 +
Fix race condition in HTTP/2 stream reset. Fixes 500 responses.
---
java/org/apache/coyote/http2/Stream.java | 21 -
webapps/docs/changelog.xml | 4
2 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index 2efe820f3a..427bd4e97f 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -1413,11 +1413,22 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
readStateLock.unlock();
}
-// Trigger ReadListener.onError()
-getCoyoteRequest().setAttribute(RequestDispatcher.ERROR_EXCEPTION,
-new
IOException(sm.getString("stream.clientResetRequest")));
-coyoteRequest.action(ActionCode.DISPATCH_ERROR, null);
-coyoteRequest.action(ActionCode.DISPATCH_EXECUTE, null);
+/*
+ * There is a potential race between a reset being received by the
Http2UpgradeHandler and the
+ * StreamProcessor recycling the Stream. The use of recycledLock
ensures that an attempt is not made to
+ * notify the ReadListener after the Stream has been recycled.
+ */
+if (!recycled) {
+synchronized (recycledLock) {
+if (!recycled) {
+// Trigger ReadListener.onError()
+
getCoyoteRequest().setAttribute(RequestDispatcher.ERROR_EXCEPTION,
+new
IOException(sm.getString("stream.clientResetRequest")));
+coyoteRequest.action(ActionCode.DISPATCH_ERROR, null);
+coyoteRequest.action(ActionCode.DISPATCH_EXECUTE,
null);
+}
+}
+}
}
@Override
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5f0741cc28..e22e6bb796 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -191,6 +191,10 @@
Content-Encoding if the client submits a TE
header containing gzip. (remm)
+
+Fix a race condition in the handling of HTTP/2 stream reset that could
+cause unexpected 500 responses. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 11.0.x updated: Fix race condition in HTTP/2 stream reset. Fixes 500 responses.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 5c9cc0c819 Fix race condition in HTTP/2 stream reset. Fixes 500
responses.
5c9cc0c819 is described below
commit 5c9cc0c81957501436085f1e6b6ae1866fed3d90
Author: Mark Thomas
AuthorDate: Wed Feb 26 16:28:21 2025 +
Fix race condition in HTTP/2 stream reset. Fixes 500 responses.
---
java/org/apache/coyote/http2/Stream.java | 21 -
webapps/docs/changelog.xml | 4
2 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index 7d959e321e..e514914fe7 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -1412,11 +1412,22 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
readStateLock.unlock();
}
-// Trigger ReadListener.onError()
-getCoyoteRequest().setAttribute(RequestDispatcher.ERROR_EXCEPTION,
-new
IOException(sm.getString("stream.clientResetRequest")));
-coyoteRequest.action(ActionCode.DISPATCH_ERROR, null);
-coyoteRequest.action(ActionCode.DISPATCH_EXECUTE, null);
+/*
+ * There is a potential race between a reset being received by the
Http2UpgradeHandler and the
+ * StreamProcessor recycling the Stream. The use of recycledLock
ensures that an attempt is not made to
+ * notify the ReadListener after the Stream has been recycled.
+ */
+if (!recycled) {
+synchronized (recycledLock) {
+if (!recycled) {
+// Trigger ReadListener.onError()
+
getCoyoteRequest().setAttribute(RequestDispatcher.ERROR_EXCEPTION,
+new
IOException(sm.getString("stream.clientResetRequest")));
+coyoteRequest.action(ActionCode.DISPATCH_ERROR, null);
+coyoteRequest.action(ActionCode.DISPATCH_EXECUTE,
null);
+}
+}
+}
}
@Override
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 044ffad14e..884fb03ceb 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -154,6 +154,10 @@
Content-Encoding if the client submits a TE
header containing gzip. (remm)
+
+Fix a race condition in the handling of HTTP/2 stream reset that could
+cause unexpected 500 responses. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Update Checkstyle to 10.21.3
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new f8e7847c72 Update Checkstyle to 10.21.3
f8e7847c72 is described below
commit f8e7847c725354ff4a0dbe8009e87a18053eb1d8
Author: Mark Thomas
AuthorDate: Wed Feb 26 16:47:54 2025 +
Update Checkstyle to 10.21.3
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 5c0bcfcf06..fd91275945 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -291,10 +291,10 @@
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
# - Checkstyle, version 6.16 or later -
-checkstyle.version=10.21.2
+checkstyle.version=10.21.3
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=0d19bcbbd62a674f0f174cc5aabf920fe8a01102d1de269c7c7bb9c31219c15d6a95d79c7d175de03664061ed1e8c3683b26a4e4a70957d32e367f16a33b7b69
+checkstyle.checksum.value=7792b199cf556ff7849bb7cd3043cc39a06371a9448ca62d146e1016724ca6cf0b65ac6f3d08fce7dcad7b06200a3d7bf81a5969bdea171981cbf6243e6680ec
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d1e92f2198..94daea61f2 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -162,6 +162,9 @@
Update Byte Buddy to 1.17.1. (markt)
+
+Update Checkstyle to 10.21.3. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Update SpotBugs to 4.9.1
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 8c8c5d1cd4 Update SpotBugs to 4.9.1
8c8c5d1cd4 is described below
commit 8c8c5d1cd46475df170e3325fda66dbbd37adbf4
Author: Mark Thomas
AuthorDate: Wed Feb 26 16:49:22 2025 +
Update SpotBugs to 4.9.1
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index a6ec8ac50d..01cdca097d 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -307,10 +307,10 @@ jacoco.jar=${jacoco.home}/lib/jacocoant.jar
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
# - SpotBugs (originally FindBugs) -
-spotbugs.version=4.9.0
+spotbugs.version=4.9.1
spotbugs.checksum.enabled=true
spotbugs.checksum.algorithm=SHA-512
-spotbugs.checksum.value=84dc14d73e2ac12afd6987c5ff10c92398f28392c60a760c13764243ad24a8f77b8444530641745053204dd9f32ca36ec953632a940f88a94f52e14232c61130
+spotbugs.checksum.value=9240d07bb315ea437a85e90c887cf8e655275b0e0f6abfea8f1a2999c67a4c1690bff5c31101c4473895ab51456dd4a380b247b9451576c065f5c29c8eca4fe5
spotbugs.home=${base.path}/spotbugs-${spotbugs.version}
spotbugs.jar=${spotbugs.home}/lib/spotbugs-ant.jar
spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/spotbugs-${spotbugs.version}.tgz
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7de512adcd..d264b95f06 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -172,6 +172,9 @@
Update Checkstyle to 10.21.3. (markt)
+
+Update SpotBugs to 4.9.1. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 11.0.x updated: Update SpotBugs to 4.9.1
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new a46fa6fccb Update SpotBugs to 4.9.1
a46fa6fccb is described below
commit a46fa6fccba8ccc9b81b28e4d87a7b3b9eb2e9eb
Author: Mark Thomas
AuthorDate: Wed Feb 26 16:49:22 2025 +
Update SpotBugs to 4.9.1
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index e442990ea3..a30910faa7 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -286,10 +286,10 @@ jacoco.jar=${jacoco.home}/lib/jacocoant.jar
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
# - SpotBugs (originally FindBugs) -
-spotbugs.version=4.9.0
+spotbugs.version=4.9.1
spotbugs.checksum.enabled=true
spotbugs.checksum.algorithm=SHA-512
-spotbugs.checksum.value=84dc14d73e2ac12afd6987c5ff10c92398f28392c60a760c13764243ad24a8f77b8444530641745053204dd9f32ca36ec953632a940f88a94f52e14232c61130
+spotbugs.checksum.value=9240d07bb315ea437a85e90c887cf8e655275b0e0f6abfea8f1a2999c67a4c1690bff5c31101c4473895ab51456dd4a380b247b9451576c065f5c29c8eca4fe5
spotbugs.home=${base.path}/spotbugs-${spotbugs.version}
spotbugs.jar=${spotbugs.home}/lib/spotbugs-ant.jar
spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/spotbugs-${spotbugs.version}.tgz
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a3bda6a664..deeb6d335c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -172,6 +172,9 @@
Update Checkstyle to 10.21.3. (markt)
+
+Update SpotBugs to 4.9.1. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Update JSign to 7.1
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 3cdba8fb4d Update JSign to 7.1
3cdba8fb4d is described below
commit 3cdba8fb4dc01f6bcd57607a7ba9215bbcd534bc
Author: Mark Thomas
AuthorDate: Wed Feb 26 16:51:00 2025 +
Update JSign to 7.1
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 01cdca097d..edcdb2ef41 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -337,10 +337,10 @@
migration-lib.jar=${migration-lib.home}/jakartaee-migration-${migration-lib.vers
migration-lib.loc=${base-maven.loc}/org/apache/tomcat/jakartaee-migration/${migration-lib.version}/jakartaee-migration-${migration-lib.version}-shaded.jar
# - JSign, version 4.1 or later -
-jsign.version=6.0
+jsign.version=7.1
jsign.checksum.enabled=true
jsign.checksum.algorithm=MD5|SHA-1
-jsign.checksum.value=c14fe256b5bc42dc6934d3ce7b659cdf|d2f1a60711c3b51123f84cd9e04dd9d482d95f5e
+jsign.checksum.value=91dadce3950b260d8097d1ca9cfe3c6f|348919ddaeed5100e1dd6a05b98da6c61e192afe
jsign.home=${base.path}/jsign-${jsign.version}
jsign.jar=${jsign.home}/jsign-${jsign.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d264b95f06..070746e257 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -175,6 +175,9 @@
Update SpotBugs to 4.9.1. (markt)
+
+Update JSign to 7.1. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 11.0.x updated: Update JSign to 7.1
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 991754d854 Update JSign to 7.1
991754d854 is described below
commit 991754d854b7ea228d87ceb8d900911e23eae538
Author: Mark Thomas
AuthorDate: Wed Feb 26 16:51:00 2025 +
Update JSign to 7.1
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index a30910faa7..1ca0d2b9ae 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -316,10 +316,10 @@
migration-lib.jar=${migration-lib.home}/jakartaee-migration-${migration-lib.vers
migration-lib.loc=${base-maven.loc}/org/apache/tomcat/jakartaee-migration/${migration-lib.version}/jakartaee-migration-${migration-lib.version}-shaded.jar
# - JSign, version 4.1 or later -
-jsign.version=6.0
+jsign.version=7.1
jsign.checksum.enabled=true
jsign.checksum.algorithm=MD5|SHA-1
-jsign.checksum.value=c14fe256b5bc42dc6934d3ce7b659cdf|d2f1a60711c3b51123f84cd9e04dd9d482d95f5e
+jsign.checksum.value=91dadce3950b260d8097d1ca9cfe3c6f|348919ddaeed5100e1dd6a05b98da6c61e192afe
jsign.home=${base.path}/jsign-${jsign.version}
jsign.jar=${jsign.home}/jsign-${jsign.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index deeb6d335c..14dde0b930 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -175,6 +175,9 @@
Update SpotBugs to 4.9.1. (markt)
+
+Update JSign to 7.1. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Update JSign to 7.1
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 7a41504f19 Update JSign to 7.1
7a41504f19 is described below
commit 7a41504f19c1239a4dd14d16f5a705c4065302bc
Author: Mark Thomas
AuthorDate: Wed Feb 26 16:51:00 2025 +
Update JSign to 7.1
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index c94f9c0f5e..fe921a2e92 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -329,10 +329,10 @@ bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar
bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.bnd-${bnd.version}.jar
# - JSign, version 4.1 or later -
-jsign.version=6.0
+jsign.version=7.1
jsign.checksum.enabled=true
jsign.checksum.algorithm=MD5|SHA-1
-jsign.checksum.value=c14fe256b5bc42dc6934d3ce7b659cdf|d2f1a60711c3b51123f84cd9e04dd9d482d95f5e
+jsign.checksum.value=91dadce3950b260d8097d1ca9cfe3c6f|348919ddaeed5100e1dd6a05b98da6c61e192afe
jsign.home=${base.path}/jsign-${jsign.version}
jsign.jar=${jsign.home}/jsign-${jsign.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 35ea02b7aa..cb0efeb8a7 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -168,6 +168,9 @@
Update SpotBugs to 4.9.1. (markt)
+
+Update JSign to 7.1. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Update SpotBugs to 4.9.1
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new a6785948af Update SpotBugs to 4.9.1
a6785948af is described below
commit a6785948afb21d9d7103bfd9ecc53a0f98c3c798
Author: Mark Thomas
AuthorDate: Wed Feb 26 16:49:22 2025 +
Update SpotBugs to 4.9.1
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index fd91275945..c94f9c0f5e 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -309,10 +309,10 @@ jacoco.jar=${jacoco.home}/lib/jacocoant.jar
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
# - SpotBugs (originally FindBugs) -
-spotbugs.version=4.9.0
+spotbugs.version=4.9.1
spotbugs.checksum.enabled=true
spotbugs.checksum.algorithm=SHA-512
-spotbugs.checksum.value=84dc14d73e2ac12afd6987c5ff10c92398f28392c60a760c13764243ad24a8f77b8444530641745053204dd9f32ca36ec953632a940f88a94f52e14232c61130
+spotbugs.checksum.value=9240d07bb315ea437a85e90c887cf8e655275b0e0f6abfea8f1a2999c67a4c1690bff5c31101c4473895ab51456dd4a380b247b9451576c065f5c29c8eca4fe5
spotbugs.home=${base.path}/spotbugs-${spotbugs.version}
spotbugs.jar=${spotbugs.home}/lib/spotbugs-ant.jar
spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/spotbugs-${spotbugs.version}.tgz
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 94daea61f2..35ea02b7aa 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -165,6 +165,9 @@
Update Checkstyle to 10.21.3. (markt)
+
+Update SpotBugs to 4.9.1. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Make sure temporary files are deleted
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 1c8a00224c Make sure temporary files are deleted
1c8a00224c is described below
commit 1c8a00224cf4282d623d1694a01e0e4a7ab09d84
Author: remm
AuthorDate: Wed Feb 26 19:34:47 2025 +0100
Make sure temporary files are deleted
The API forces catching exceptions to delete the temporary file.
Also log a warning if delete fails.
---
java/org/apache/catalina/servlets/DefaultServlet.java | 11 ++-
java/org/apache/catalina/servlets/LocalStrings.properties | 1 +
webapps/docs/changelog.xml| 4
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java
b/java/org/apache/catalina/servlets/DefaultServlet.java
index 0a6a4f0a1e..0e4a33e50c 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -637,7 +637,9 @@ public class DefaultServlet extends HttpServlet {
}
}
if (tempContentFile != null) {
-tempContentFile.delete();
+if (!tempContentFile.delete()) {
+log(sm.getString("defaultServlet.deleteTempFileFailed",
tempContentFile.getAbsolutePath()));
+}
}
}
}
@@ -692,6 +694,13 @@ public class DefaultServlet extends HttpServlet {
randAccessContentFile.write(transferBuffer, 0,
numBytesRead);
}
}
+
+} catch (IOException | RuntimeException | Error e) {
+// This has to be done this way to be able to close the file
without changing the method signature
+if (!contentFile.delete()) {
+log(sm.getString("defaultServlet.deleteTempFileFailed",
contentFile.getAbsolutePath()));
+}
+throw e;
}
return contentFile;
diff --git a/java/org/apache/catalina/servlets/LocalStrings.properties
b/java/org/apache/catalina/servlets/LocalStrings.properties
index 6f172cbbc8..c09a862802 100644
--- a/java/org/apache/catalina/servlets/LocalStrings.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings.properties
@@ -40,6 +40,7 @@ cgiServlet.runStdErrFail=I/O problems with stderr
defaultServlet.blockExternalEntity=Blocked access to external entity with
publicId [{0}] and systemId [{0}]
defaultServlet.blockExternalEntity2=Blocked access to external entity with
name [{0}], publicId [{1}], baseURI [{2}] and systemId [{3}]
defaultServlet.blockExternalSubset=Blocked access to external subset with name
[{0}] and baseURI [{1}]
+defaultServlet.deleteTempFileFailed=Failed to delete temporary file [{0}] used
for partial PUT
defaultServlet.directory.parent=Up To [{0}]
defaultServlet.directory.title=Directory Listing For [{0}]
defaultServlet.globalXSLTTooBig=The global XSLT file [{0}] is too big to buffer
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 03895193ce..ce102da757 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -166,6 +166,10 @@
ExtendedAccessLogValve. Based on pull request 814
by Dmole. (markt)
+
+Avoid scenarios where temporary files used for partial PUT would not
+be deleted. (remm)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Make sure temporary files are deleted
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 213139c581 Make sure temporary files are deleted
213139c581 is described below
commit 213139c581091dfa278f2ed66ed849c255d9e217
Author: remm
AuthorDate: Wed Feb 26 19:34:47 2025 +0100
Make sure temporary files are deleted
The API forces catching exceptions to delete the temporary file.
Also log a warning if delete fails.
---
java/org/apache/catalina/servlets/DefaultServlet.java | 11 ++-
java/org/apache/catalina/servlets/LocalStrings.properties | 1 +
webapps/docs/changelog.xml| 4
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java
b/java/org/apache/catalina/servlets/DefaultServlet.java
index 3ae7c4c032..4e1fef7929 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -660,7 +660,9 @@ public class DefaultServlet extends HttpServlet {
}
}
if (tempContentFile != null) {
-tempContentFile.delete();
+if (!tempContentFile.delete()) {
+log(sm.getString("defaultServlet.deleteTempFileFailed",
tempContentFile.getAbsolutePath()));
+}
}
}
}
@@ -715,6 +717,13 @@ public class DefaultServlet extends HttpServlet {
randAccessContentFile.write(transferBuffer, 0,
numBytesRead);
}
}
+
+} catch (IOException | RuntimeException | Error e) {
+// This has to be done this way to be able to close the file
without changing the method signature
+if (!contentFile.delete()) {
+log(sm.getString("defaultServlet.deleteTempFileFailed",
contentFile.getAbsolutePath()));
+}
+throw e;
}
return contentFile;
diff --git a/java/org/apache/catalina/servlets/LocalStrings.properties
b/java/org/apache/catalina/servlets/LocalStrings.properties
index b869d0819d..d2e6a16c33 100644
--- a/java/org/apache/catalina/servlets/LocalStrings.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings.properties
@@ -43,6 +43,7 @@ cgiServlet.runStdErrFail=I/O problems with stderr
defaultServlet.blockExternalEntity=Blocked access to external entity with
publicId [{0}] and systemId [{0}]
defaultServlet.blockExternalEntity2=Blocked access to external entity with
name [{0}], publicId [{1}], baseURI [{2}] and systemId [{3}]
defaultServlet.blockExternalSubset=Blocked access to external subset with name
[{0}] and baseURI [{1}]
+defaultServlet.deleteTempFileFailed=Failed to delete temporary file [{0}] used
for partial PUT
defaultServlet.directory.parent=Up To [{0}]
defaultServlet.directory.title=Directory Listing For [{0}]
defaultServlet.missingResource=The requested resource [{0}] is not available
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3789f89d2f..4b0d2d665b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -137,6 +137,10 @@
ExtendedAccessLogValve. Based on pull request 814
by Dmole. (markt)
+
+Avoid scenarios where temporary files used for partial PUT would not
+be deleted. (remm)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 11.0.x updated: Make sure temporary files are deleted
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 28b3c7cf18 Make sure temporary files are deleted
28b3c7cf18 is described below
commit 28b3c7cf1866ac06cca7718d1d5603b18c160cd8
Author: remm
AuthorDate: Wed Feb 26 19:34:47 2025 +0100
Make sure temporary files are deleted
The API forces catching exceptions to delete the temporary file.
Also log a warning if delete fails.
---
java/org/apache/catalina/servlets/DefaultServlet.java | 11 ++-
java/org/apache/catalina/servlets/LocalStrings.properties | 1 +
webapps/docs/changelog.xml| 4
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java
b/java/org/apache/catalina/servlets/DefaultServlet.java
index 9ba87003cd..edda9304f5 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -650,7 +650,9 @@ public class DefaultServlet extends HttpServlet {
}
}
if (tempContentFile != null) {
-tempContentFile.delete();
+if (!tempContentFile.delete()) {
+log(sm.getString("defaultServlet.deleteTempFileFailed",
tempContentFile.getAbsolutePath()));
+}
}
}
}
@@ -705,6 +707,13 @@ public class DefaultServlet extends HttpServlet {
randAccessContentFile.write(transferBuffer, 0,
numBytesRead);
}
}
+
+} catch (IOException | RuntimeException | Error e) {
+// This has to be done this way to be able to close the file
without changing the method signature
+if (!contentFile.delete()) {
+log(sm.getString("defaultServlet.deleteTempFileFailed",
contentFile.getAbsolutePath()));
+}
+throw e;
}
return contentFile;
diff --git a/java/org/apache/catalina/servlets/LocalStrings.properties
b/java/org/apache/catalina/servlets/LocalStrings.properties
index 711680e99b..b849c68d54 100644
--- a/java/org/apache/catalina/servlets/LocalStrings.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings.properties
@@ -43,6 +43,7 @@ cgiServlet.runStdErrFail=I/O problems with stderr
defaultServlet.blockExternalEntity=Blocked access to external entity with
publicId [{0}] and systemId [{0}]
defaultServlet.blockExternalEntity2=Blocked access to external entity with
name [{0}], publicId [{1}], baseURI [{2}] and systemId [{3}]
defaultServlet.blockExternalSubset=Blocked access to external subset with name
[{0}] and baseURI [{1}]
+defaultServlet.deleteTempFileFailed=Failed to delete temporary file [{0}] used
for partial PUT
defaultServlet.directory.parent=Up To [{0}]
defaultServlet.directory.title=Directory Listing For [{0}]
defaultServlet.globalXSLTTooBig=The global XSLT file [{0}] is too big to buffer
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b7c34b0032..d3fdad0261 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -137,6 +137,10 @@
ExtendedAccessLogValve. Based on pull request 814
by Dmole. (markt)
+
+Avoid scenarios where temporary files used for partial PUT would not
+be deleted. (remm)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Make sure temporary files are deleted
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 0f6b8ed6af Make sure temporary files are deleted
0f6b8ed6af is described below
commit 0f6b8ed6afc8f7a512d0e3399b80935b955af9c2
Author: remm
AuthorDate: Wed Feb 26 19:34:47 2025 +0100
Make sure temporary files are deleted
The API forces catching exceptions to delete the temporary file.
Also log a warning if delete fails.
---
java/org/apache/catalina/servlets/DefaultServlet.java | 11 ++-
java/org/apache/catalina/servlets/LocalStrings.properties | 1 +
webapps/docs/changelog.xml| 4
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java
b/java/org/apache/catalina/servlets/DefaultServlet.java
index c58ce2b5b0..cdaa6bdf92 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -660,7 +660,9 @@ public class DefaultServlet extends HttpServlet {
}
}
if (tempContentFile != null) {
-tempContentFile.delete();
+if (!tempContentFile.delete()) {
+log(sm.getString("defaultServlet.deleteTempFileFailed",
tempContentFile.getAbsolutePath()));
+}
}
}
}
@@ -715,6 +717,13 @@ public class DefaultServlet extends HttpServlet {
randAccessContentFile.write(transferBuffer, 0,
numBytesRead);
}
}
+
+} catch (IOException | RuntimeException | Error e) {
+// This has to be done this way to be able to close the file
without changing the method signature
+if (!contentFile.delete()) {
+log(sm.getString("defaultServlet.deleteTempFileFailed",
contentFile.getAbsolutePath()));
+}
+throw e;
}
return contentFile;
diff --git a/java/org/apache/catalina/servlets/LocalStrings.properties
b/java/org/apache/catalina/servlets/LocalStrings.properties
index b869d0819d..d2e6a16c33 100644
--- a/java/org/apache/catalina/servlets/LocalStrings.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings.properties
@@ -43,6 +43,7 @@ cgiServlet.runStdErrFail=I/O problems with stderr
defaultServlet.blockExternalEntity=Blocked access to external entity with
publicId [{0}] and systemId [{0}]
defaultServlet.blockExternalEntity2=Blocked access to external entity with
name [{0}], publicId [{1}], baseURI [{2}] and systemId [{3}]
defaultServlet.blockExternalSubset=Blocked access to external subset with name
[{0}] and baseURI [{1}]
+defaultServlet.deleteTempFileFailed=Failed to delete temporary file [{0}] used
for partial PUT
defaultServlet.directory.parent=Up To [{0}]
defaultServlet.directory.title=Directory Listing For [{0}]
defaultServlet.missingResource=The requested resource [{0}] is not available
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 15cefdf8b4..22e18dd546 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -130,6 +130,10 @@
so that reflection is not used unless required. The checks for whether
the file system is case sensitive or not have been removed. (markt)
+
+Avoid scenarios where temporary files used for partial PUT would not
+be deleted. (remm)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 69599] New: Changelog missing for Tomcat 10.1.36
https://bz.apache.org/bugzilla/show_bug.cgi?id=69599 Bug ID: 69599 Summary: Changelog missing for Tomcat 10.1.36 Product: Tomcat 10 Version: unspecified Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P2 Component: Documentation Assignee: dev@tomcat.apache.org Reporter: alexand...@gmx.net Target Milestone: -- Tomcat 10.1.36 has been released to the public 2025-02-13 13:21[1]. However, this version is still missing in changelog[2]. [1] https://repo1.maven.org/maven2/org/apache/tomcat/embed/tomcat-embed-core/10.1.36/ [2] https://tomcat.apache.org/tomcat-10.1-doc/changelog.html -- 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
RSA Key Used to Sign Tomcat 10 Releases Missing from KEYS File
Hi all, I was verifying the signature for the Tomcat 10.1.36 source tarball and noticed that the RSA key used to sign it ( 3262A061C42FC4C7BBB5C25C1CF0293FA53CA458) is not present in the KEYS files. That is the case for 10.1.35 too. Kind regards, Dimitris
Re: RSA Key Used to Sign Tomcat 10 Releases Missing from KEYS File
On Wed, Feb 26, 2025 at 1:32 PM Dimitris Soumis wrote: > Hi all, > > I was verifying the signature for the Tomcat 10.1.36 source tarball and > noticed that the RSA key used to sign it ( > 3262A061C42FC4C7BBB5C25C1CF0293FA53CA458) is not present in the KEYS > files. That is the case for 10.1.35 too. > > Kind regards, > Dimitris > > Just verified that this is a valid key from Christopher, so I suppose that just the KEYS file should be updated with the new key :)
[Bug 69598] New: Reload service account token if changed in KubernetesMembershipProvider
https://bz.apache.org/bugzilla/show_bug.cgi?id=69598 Bug ID: 69598 Summary: Reload service account token if changed in KubernetesMembershipProvider Product: Tomcat 11 Version: unspecified Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P2 Component: Cluster Assignee: dev@tomcat.apache.org Reporter: j...@hkfree.org Target Milestone: --- Created attachment 40001 --> https://bz.apache.org/bugzilla/attachment.cgi?id=40001&action=edit Check sa token modify time before fetching members I our kubernates environment the service account token is changed periodically each hour causing CloudMembershipService to stop fetching members from KubernetesMembershipProvider. There are errors in catalina log: Server returned HTTP response code: 401 for URL: https://A.B.C.D:443/api/v1/namespaces/589474253/pods -- 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 69596] SPAM SPAM SPAM SPAM
https://bz.apache.org/bugzilla/show_bug.cgi?id=69596 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED OS||All Resolution|--- |INVALID Summary|Renting a Ferrari in Miami |SPAM SPAM SPAM SPAM |turns this dream into | |reality.| -- 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 69597] SPAM SPAM SPAM SPAM
https://bz.apache.org/bugzilla/show_bug.cgi?id=69597 Konstantin Kolinko changed: What|Removed |Added OS||All Summary|Renting a Ferrari in Miami |SPAM SPAM SPAM SPAM |turns this dream into | |reality.| Status|NEW |RESOLVED Resolution|--- |INVALID -- 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
