(tomcat) branch 11.0.x updated: Increment version for next development cycle
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 7d569db90a Increment version for next development cycle 7d569db90a is described below commit 7d569db90abc15baa13145916d6329c1147758dc Author: Mark Thomas AuthorDate: Thu Oct 3 19:29:45 2024 +0100 Increment version for next development cycle --- 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 9027b22629..afb143607a 100644 --- a/build.properties.default +++ b/build.properties.default @@ -31,7 +31,7 @@ # - Version Control Flags - version.major=11 version.minor=0 -version.build=0 +version.build=1 version.patch=0 version.suffix= version.dev=-dev diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default index a0c47caf07..5bc2cb8b3e 100644 --- a/res/maven/mvn.properties.default +++ b/res/maven/mvn.properties.default @@ -39,7 +39,7 @@ maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d maven.asf.release.repo.repositoryId=apache.releases.https # Release version info -maven.asf.release.deploy.version=11.0.0 +maven.asf.release.deploy.version=11.0.1 #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 a27201539d..318715eca1 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
svn commit: r72065 - in /dev/tomcat/tomcat-11/v11.0.0: ./ bin/ bin/embed/ src/
Author: markt Date: Thu Oct 3 17:42:51 2024 New Revision: 72065 Log: Upload 11.0.0 for voting Added: dev/tomcat/tomcat-11/v11.0.0/ dev/tomcat/tomcat-11/v11.0.0/KEYS dev/tomcat/tomcat-11/v11.0.0/README.html dev/tomcat/tomcat-11/v11.0.0/RELEASE-NOTES dev/tomcat/tomcat-11/v11.0.0/bin/ dev/tomcat/tomcat-11/v11.0.0/bin/README.html dev/tomcat/tomcat-11/v11.0.0/bin/apache-tomcat-11.0.0-deployer.tar.gz (with props) dev/tomcat/tomcat-11/v11.0.0/bin/apache-tomcat-11.0.0-deployer.tar.gz.asc dev/tomcat/tomcat-11/v11.0.0/bin/apache-tomcat-11.0.0-deployer.tar.gz.sha512 dev/tomcat/tomcat-11/v11.0.0/bin/apache-tomcat-11.0.0-deployer.zip (with props) dev/tomcat/tomcat-11/v11.0.0/bin/apache-tomcat-11.0.0-deployer.zip.asc dev/tomcat/tomcat-11/v11.0.0/bin/apache-tomcat-11.0.0-deployer.zip.sha512 dev/tomcat/tomcat-11/v11.0.0/bin/apache-tomcat-11.0.0-fulldocs.tar.gz (with props) dev/tomcat/tomcat-11/v11.0.0/bin/apache-tomcat-11.0.0-fulldocs.tar.gz.asc dev/tomcat/tomcat-11/v11.0.0/bin/apache-tomcat-11.0.0-fulldocs.tar.gz.sha512 dev/tomcat/tomcat-11/v11.0.0/bin/apache-tomcat-11.0.0-windows-x64.zip (with props) dev/tomcat/tomcat-11/v11.0.0/bin/apache-tomcat-11.0.0-windows-x64.zip.asc dev/tomcat/tomcat-11/v11.0.0/bin/apache-tomcat-11.0.0-windows-x64.zip.sha512 dev/tomcat/tomcat-11/v11.0.0/bin/apache-tomcat-11.0.0.exe (with props) dev/tomcat/tomcat-11/v11.0.0/bin/apache-tomcat-11.0.0.exe.asc dev/tomcat/tomcat-11/v11.0.0/bin/apache-tomcat-11.0.0.exe.sha512 dev/tomcat/tomcat-11/v11.0.0/bin/apache-tomcat-11.0.0.tar.gz (with props) dev/tomcat/tomcat-11/v11.0.0/bin/apache-tomcat-11.0.0.tar.gz.asc dev/tomcat/tomcat-11/v11.0.0/bin/apache-tomcat-11.0.0.tar.gz.sha512 dev/tomcat/tomcat-11/v11.0.0/bin/apache-tomcat-11.0.0.zip (with props) dev/tomcat/tomcat-11/v11.0.0/bin/apache-tomcat-11.0.0.zip.asc dev/tomcat/tomcat-11/v11.0.0/bin/apache-tomcat-11.0.0.zip.sha512 dev/tomcat/tomcat-11/v11.0.0/bin/embed/ dev/tomcat/tomcat-11/v11.0.0/bin/embed/apache-tomcat-11.0.0-embed.tar.gz (with props) dev/tomcat/tomcat-11/v11.0.0/bin/embed/apache-tomcat-11.0.0-embed.tar.gz.asc dev/tomcat/tomcat-11/v11.0.0/bin/embed/apache-tomcat-11.0.0-embed.tar.gz.sha512 dev/tomcat/tomcat-11/v11.0.0/bin/embed/apache-tomcat-11.0.0-embed.zip (with props) dev/tomcat/tomcat-11/v11.0.0/bin/embed/apache-tomcat-11.0.0-embed.zip.asc dev/tomcat/tomcat-11/v11.0.0/bin/embed/apache-tomcat-11.0.0-embed.zip.sha512 dev/tomcat/tomcat-11/v11.0.0/src/ dev/tomcat/tomcat-11/v11.0.0/src/apache-tomcat-11.0.0-src.tar.gz (with props) dev/tomcat/tomcat-11/v11.0.0/src/apache-tomcat-11.0.0-src.tar.gz.asc dev/tomcat/tomcat-11/v11.0.0/src/apache-tomcat-11.0.0-src.tar.gz.sha512 dev/tomcat/tomcat-11/v11.0.0/src/apache-tomcat-11.0.0-src.zip (with props) dev/tomcat/tomcat-11/v11.0.0/src/apache-tomcat-11.0.0-src.zip.asc dev/tomcat/tomcat-11/v11.0.0/src/apache-tomcat-11.0.0-src.zip.sha512 Added: dev/tomcat/tomcat-11/v11.0.0/KEYS == --- dev/tomcat/tomcat-11/v11.0.0/KEYS (added) +++ dev/tomcat/tomcat-11/v11.0.0/KEYS Thu Oct 3 17:42:51 2024 @@ -0,0 +1,573 @@ +This file contains the PGP&GPG keys of various Apache developers. +Please don't use them for email unless you have to. Their main +purpose is code signing. + +Apache users: pgp < KEYS +Apache developers: +(pgpk -ll && pgpk -xa ) >> this file. + or +(gpg --fingerprint --list-sigs + && gpg --armor --export ) >> this file. + +Apache developers: please ensure that your key is also available via the +PGP keyservers (such as pgpkeys.mit.edu). + + +pub 4096R/2F6059E7 2009-09-18 + Key fingerprint = A9C5 DF4D 22E9 9998 D987 5A51 10C0 1C5A 2F60 59E7 +uid Mark E D Thomas +sub 4096R/5E763BEC 2009-09-18 + +-BEGIN PGP PUBLIC KEY BLOCK- +Comment: GPGTools - http://gpgtools.org + +mQINBEq0DukBEAD4jovHOPJDxoD+JnO1Go2kiwpgRULasGlrVKuSUdP6wzcaqWmX +pqtOJKKwW2MQFQLmg7nQ9RjJwy3QCbKNDJQA/bwbQT1F7WzTCz2S6vxC4zxKck4t +6RZBq2dJsYKF0CEh6ZfY4dmKvhq+3istSoFRdHYoOPGWZpuRDqfZPdGm/m335/6K +GH59oysn1NE7a2a+kZzjBSEgv23+l4Z1Rg7+fpz1JcdHSdC2Z+ZRxML25eVatRVz +4yvDOZItqDURP24zWOodxgboldV6Y88C3v/7KRR+1vklzkuA2FqF8Q4r/2f0su7M +UVviQcy29y/RlLSDTTYoVlCZ1ni14qFU7Hpw43KJtgXmcUwq31T1+SlXdYjNJ1aF +kUi8BjCHDcSgE/IReKUanjHzm4XSymKDTeqqzidi4k6PDD4jyHb8k8vxi6qT6Udn +lcfo5NBkkUT1TauhEy8ktHhbl9k60BvvMBP9l6cURiJg1WS77egI4P/82oPbzzFi +GFqXyJKULVgxtdQ3JikCpodp3f1fh6PlYZwkW4xCJLJucJ5MiQp07HAkMVW5w+k8 +Xvuk4i5quh3N+2kzKHOOiQCDmN0sz0XjOE+7XBvM1lvz3+UarLfgSVmW8aheLd7e +aIl5ItBk8844ZJ60LrQ+JiIqvqJemxyIM6epoZvY5a3ZshZpcLilC5hW8QARAQAB +tCJNYXJrIEUgRCBUaG9tYXMgPG1hcmt0QGFwYWNoZS5vcmc+iQI3BBMBCgAhBQJK +tA7pAhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJEBDAHFovYFnn2YgQAKN6 +FLG/I1Ij3PUlC/XNlhasQxPe
(tomcat) 01/01: Tga 11.0.0
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to tag 11.0.0 in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 56e547d387ab49f688c93fe9ca082b1b5d94deed Author: Mark Thomas AuthorDate: Thu Oct 3 18:11:45 2024 +0100 Tga 11.0.0 --- build.properties.release | 54 +++ res/install-win/Uninstall.exe.sig| Bin 0 -> 10202 bytes res/install-win/tomcat-installer.exe.sig | Bin 0 -> 10202 bytes res/maven/mvn.properties.release | 27 webapps/docs/changelog.xml | 2 +- 5 files changed, 82 insertions(+), 1 deletion(-) diff --git a/build.properties.release b/build.properties.release new file mode 100644 index 00..cd912f5d7d --- /dev/null +++ b/build.properties.release @@ -0,0 +1,54 @@ +# - +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# - + +# This file was auto-generated by the pre-release Ant target. + +# Any unwanted settings may be over-ridden in a build.properties file located +# in the same directory as this file. + +# Set the version-dev to "" (empty string) as this is not a development release. +version.dev= + +# Ensure consistent timestamps for reproducible builds. +ant.tstamp.now.iso=2024-10-03T17:00:16Z + +# Enable insertion of detached signatures into the Windows installer. +do.codesigning=true + +# Re-use the same GPG executable. +gpg.exec=C:/Program Files (x86)/GnuPG/bin/gpg.exe + +# Reproducible builds require the use of the build tools defined below. The +# vendors (where appropriate) and versions must match exactly for a reproducible +# build since this data is embedded in various files, particularly JAR file +# manifests, as part of the build process. +# +# Apache Ant: Apache Ant(TM) version 1.10.15 compiled on August 25 2024 +# +# Java Name: OpenJDK 64-Bit Server VM +# Java Vendor: Eclipse Adoptium +# Java Version:22.0.2+9 + +# The following is provided for information only. Builds will be repeatable +# whether or not the build environment is consistent with this information. +# +# OS: amd64 Windows Server 2022 10.0 +# File encoding: UTF-8 +# +# Release Manager: markt +release-java-version=22.0.2+9 +release-ant-version=1.10.15 diff --git a/res/install-win/Uninstall.exe.sig b/res/install-win/Uninstall.exe.sig new file mode 100644 index 00..1416fa63aa Binary files /dev/null and b/res/install-win/Uninstall.exe.sig differ diff --git a/res/install-win/tomcat-installer.exe.sig b/res/install-win/tomcat-installer.exe.sig new file mode 100644 index 00..ad9b0f5a8c Binary files /dev/null and b/res/install-win/tomcat-installer.exe.sig differ diff --git a/res/maven/mvn.properties.release b/res/maven/mvn.properties.release new file mode 100644 index 00..0bd4eb2ff8 --- /dev/null +++ b/res/maven/mvn.properties.release @@ -0,0 +1,27 @@ +# - +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# - + +# This file was auto-generated by the pre-release Ant target. + +# Remove "-dev" from the version since this is not a development release. +maven.asf.release.depl
(tomcat) tag 11.0.0 created (now 56e547d387)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to tag 11.0.0 in repository https://gitbox.apache.org/repos/asf/tomcat.git at 56e547d387 (commit) This tag includes the following new commits: new 56e547d387 Tga 11.0.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Additional fix for BZ 69362
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 ade2480f12 Additional fix for BZ 69362
ade2480f12 is described below
commit ade2480f128525d32189055ea936552437c1c8af
Author: Mark Thomas
AuthorDate: Thu Oct 3 17:04:09 2024 +0100
Additional fix for BZ 69362
https://bz.apache.org/bugzilla/show_bug.cgi?id=69362
---
java/org/apache/catalina/servlets/WebdavServlet.java | 16 +++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index 1555c8d37a..2ddbd66ed8 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -1713,7 +1713,21 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
deleteCollection(req, path, errorList);
if (!resource.delete()) {
-errorList.put(path,
Integer.valueOf(WebdavStatus.SC_METHOD_NOT_ALLOWED));
+/*
+ * See RFC 4918, section 9.6.1, last paragraph.
+ *
+ * If a child resource can't be deleted then the parent
resource SHOULD NOT be included in the
+ * multi-status response since the notice of the failure to
delete the child implies that all
+ * parent resources could also not be deleted.
+ */
+if (resources.list(path).length == 0) {
+/*
+ * The resource could not be deleted. If the resource is a
directory and it has no children (or all
+ * those children have been successfully deleted) then it
should be listed in the multi-status
+ * response.
+ */
+errorList.put(path,
Integer.valueOf(WebdavStatus.SC_METHOD_NOT_ALLOWED));
+}
}
if (!errorList.isEmpty()) {
-
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: Additional fix for BZ 69362
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 5b73427c4b Additional fix for BZ 69362
5b73427c4b is described below
commit 5b73427c4b66da3505a7a3659193c69a2d27e697
Author: Mark Thomas
AuthorDate: Thu Oct 3 17:04:09 2024 +0100
Additional fix for BZ 69362
https://bz.apache.org/bugzilla/show_bug.cgi?id=69362
---
java/org/apache/catalina/servlets/WebdavServlet.java | 16 +++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index 9de0144ef6..dcf7aee188 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -1714,7 +1714,21 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
deleteCollection(req, path, errorList);
if (!resource.delete()) {
-errorList.put(path,
Integer.valueOf(WebdavStatus.SC_METHOD_NOT_ALLOWED));
+/*
+ * See RFC 4918, section 9.6.1, last paragraph.
+ *
+ * If a child resource can't be deleted then the parent
resource SHOULD NOT be included in the
+ * multi-status response since the notice of the failure to
delete the child implies that all
+ * parent resources could also not be deleted.
+ */
+if (resources.list(path).length == 0) {
+/*
+ * The resource could not be deleted. If the resource is a
directory and it has no children (or all
+ * those children have been successfully deleted) then it
should be listed in the multi-status
+ * response.
+ */
+errorList.put(path,
Integer.valueOf(WebdavStatus.SC_METHOD_NOT_ALLOWED));
+}
}
if (!errorList.isEmpty()) {
-
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: Additional fix for BZ 69362
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 9d9b9afda3 Additional fix for BZ 69362
9d9b9afda3 is described below
commit 9d9b9afda331ad197d169be1129bde2dffc020ee
Author: Mark Thomas
AuthorDate: Thu Oct 3 17:04:09 2024 +0100
Additional fix for BZ 69362
https://bz.apache.org/bugzilla/show_bug.cgi?id=69362
---
java/org/apache/catalina/servlets/WebdavServlet.java | 16 +++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index 9de0144ef6..dcf7aee188 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -1714,7 +1714,21 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
deleteCollection(req, path, errorList);
if (!resource.delete()) {
-errorList.put(path,
Integer.valueOf(WebdavStatus.SC_METHOD_NOT_ALLOWED));
+/*
+ * See RFC 4918, section 9.6.1, last paragraph.
+ *
+ * If a child resource can't be deleted then the parent
resource SHOULD NOT be included in the
+ * multi-status response since the notice of the failure to
delete the child implies that all
+ * parent resources could also not be deleted.
+ */
+if (resources.list(path).length == 0) {
+/*
+ * The resource could not be deleted. If the resource is a
directory and it has no children (or all
+ * those children have been successfully deleted) then it
should be listed in the multi-status
+ * response.
+ */
+errorList.put(path,
Integer.valueOf(WebdavStatus.SC_METHOD_NOT_ALLOWED));
+}
}
if (!errorList.isEmpty()) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Additional fix for BZ 69362
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 4f6a28452a Additional fix for BZ 69362
4f6a28452a is described below
commit 4f6a28452a6f2f312d7218c402c618015276b0b4
Author: Mark Thomas
AuthorDate: Thu Oct 3 17:04:09 2024 +0100
Additional fix for BZ 69362
https://bz.apache.org/bugzilla/show_bug.cgi?id=69362
---
java/org/apache/catalina/servlets/WebdavServlet.java | 16 +++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index 89c9bbf08e..1b72342a47 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -1716,7 +1716,21 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
deleteCollection(req, path, errorList);
if (!resource.delete()) {
-errorList.put(path,
Integer.valueOf(WebdavStatus.SC_METHOD_NOT_ALLOWED));
+/*
+ * See RFC 4918, section 9.6.1, last paragraph.
+ *
+ * If a child resource can't be deleted then the parent
resource SHOULD NOT be included in the
+ * multi-status response since the notice of the failure to
delete the child implies that all
+ * parent resources could also not be deleted.
+ */
+if (resources.list(path).length == 0) {
+/*
+ * The resource could not be deleted. If the resource is a
directory and it has no children (or all
+ * those children have been successfully deleted) then it
should be listed in the multi-status
+ * response.
+ */
+errorList.put(path,
Integer.valueOf(WebdavStatus.SC_METHOD_NOT_ALLOWED));
+}
}
if (!errorList.isEmpty()) {
-
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 BZ 69361 Make multi-status and processing order consistent
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 f4a55f8bed Fix BZ 69361 Make multi-status and processing order
consistent
f4a55f8bed is described below
commit f4a55f8bed4e9fd63e05117231c7fa0856cbb632
Author: Mark Thomas
AuthorDate: Thu Oct 3 16:42:41 2024 +0100
Fix BZ 69361 Make multi-status and processing order consistent
https://bz.apache.org/bugzilla/show_bug.cgi?id=69361
---
java/org/apache/catalina/servlets/WebdavServlet.java | 6 +++---
webapps/docs/changelog.xml | 5 +
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index c434b82277..1555c8d37a 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -31,8 +31,8 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.Deque;
-import java.util.HashMap;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -1528,7 +1528,7 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
// Copying source to destination
-Map errorList = new HashMap<>();
+Map errorList = new LinkedHashMap<>();
boolean infiniteCopy = true;
String depthHeader = req.getHeader("Depth");
@@ -1709,7 +1709,7 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
}
} else {
-Map errorList = new HashMap<>();
+Map errorList = new LinkedHashMap<>();
deleteCollection(req, path, errorList);
if (!resource.delete()) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 16e8fc3fe5..849cf56414 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -155,6 +155,11 @@
Add log warning if non wildcard mappings are used with the
WebdavServlet. (remm)
+
+69361: Ensure that the order of entires in a multi-status
+response to a WebDAV is consistent with the order in which resources
+were processed. (markt)
+
69362: Provide a better multi-status response when deleting
a
collection via WebDAV fails. Empty directories that cannot be deleted
-
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 BZ 69361 Make multi-status and processing order consistent
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 d502ba42b0 Fix BZ 69361 Make multi-status and processing order
consistent
d502ba42b0 is described below
commit d502ba42b0981ec6633228b166c2508c227f720e
Author: Mark Thomas
AuthorDate: Thu Oct 3 16:42:41 2024 +0100
Fix BZ 69361 Make multi-status and processing order consistent
https://bz.apache.org/bugzilla/show_bug.cgi?id=69361
---
java/org/apache/catalina/servlets/WebdavServlet.java | 6 +++---
webapps/docs/changelog.xml | 5 +
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index b18953ba2a..9de0144ef6 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -31,8 +31,8 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.Deque;
-import java.util.HashMap;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -1529,7 +1529,7 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
// Copying source to destination
-Map errorList = new HashMap<>();
+Map errorList = new LinkedHashMap<>();
boolean infiniteCopy = true;
String depthHeader = req.getHeader("Depth");
@@ -1710,7 +1710,7 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
}
} else {
-Map errorList = new HashMap<>();
+Map errorList = new LinkedHashMap<>();
deleteCollection(req, path, errorList);
if (!resource.delete()) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4a5167b7cf..38b5f9cbd3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -160,6 +160,11 @@
Add log warning if non wildcard mappings are used with the
WebdavServlet. (remm)
+
+69361: Ensure that the order of entires in a multi-status
+response to a WebDAV is consistent with the order in which resources
+were processed. (markt)
+
69362: Provide a better multi-status response when deleting
a
collection via WebDAV fails. Empty directories that cannot be deleted
-
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 BZ 69361 Make multi-status and processing order consistent
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 69a4bbffde Fix BZ 69361 Make multi-status and processing order
consistent
69a4bbffde is described below
commit 69a4bbffdeeb827fc4dcf90ab7c2dcfa2940cf0f
Author: Mark Thomas
AuthorDate: Thu Oct 3 16:42:41 2024 +0100
Fix BZ 69361 Make multi-status and processing order consistent
https://bz.apache.org/bugzilla/show_bug.cgi?id=69361
---
java/org/apache/catalina/servlets/WebdavServlet.java | 6 +++---
webapps/docs/changelog.xml | 5 +
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index b18953ba2a..9de0144ef6 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -31,8 +31,8 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.Deque;
-import java.util.HashMap;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -1529,7 +1529,7 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
// Copying source to destination
-Map errorList = new HashMap<>();
+Map errorList = new LinkedHashMap<>();
boolean infiniteCopy = true;
String depthHeader = req.getHeader("Depth");
@@ -1710,7 +1710,7 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
}
} else {
-Map errorList = new HashMap<>();
+Map errorList = new LinkedHashMap<>();
deleteCollection(req, path, errorList);
if (!resource.delete()) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cbd6567244..a27201539d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -160,6 +160,11 @@
Add log warning if non wildcard mappings are used with the
WebdavServlet. (remm)
+
+69361: Ensure that the order of entires in a multi-status
+response to a WebDAV is consistent with the order in which resources
+were processed. (markt)
+
69362: Provide a better multi-status response when deleting
a
collection via WebDAV fails. Empty directories that cannot be deleted
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Ensure multi-stauts order is consistent with processing order
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 1f6329e632 Ensure multi-stauts order is consistent with processing
order
1f6329e632 is described below
commit 1f6329e632c2c9581731513b3b53e403fc1d3510
Author: Mark Thomas
AuthorDate: Thu Oct 3 16:42:41 2024 +0100
Ensure multi-stauts order is consistent with processing order
---
java/org/apache/catalina/servlets/WebdavServlet.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index 62b588a789..89c9bbf08e 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -31,8 +31,8 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.Deque;
-import java.util.HashMap;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -1531,7 +1531,7 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
// Copying source to destination
-Map errorList = new HashMap<>();
+Map errorList = new LinkedHashMap<>();
boolean infiniteCopy = true;
String depthHeader = req.getHeader("Depth");
@@ -1712,7 +1712,7 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
}
} else {
-Map errorList = new HashMap<>();
+Map errorList = new LinkedHashMap<>();
deleteCollection(req, path, errorList);
if (!resource.delete()) {
-
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 test failure on my local CI system
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 e62b277b9b Fix test failure on my local CI system
e62b277b9b is described below
commit e62b277b9bfb9cd5f2542281ab8808c5b88a1e57
Author: unknown
AuthorDate: Thu Oct 3 16:36:40 2024 +0100
Fix test failure on my local CI system
---
test/org/apache/catalina/manager/TestManagerWebapp.java | 8
1 file changed, 8 insertions(+)
diff --git a/test/org/apache/catalina/manager/TestManagerWebapp.java
b/test/org/apache/catalina/manager/TestManagerWebapp.java
index 5d37de9b49..0a5fe800d4 100644
--- a/test/org/apache/catalina/manager/TestManagerWebapp.java
+++ b/test/org/apache/catalina/manager/TestManagerWebapp.java
@@ -18,8 +18,10 @@ package org.apache.catalina.manager;
import java.io.File;
import java.io.FileReader;
+import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
+import java.net.UnknownHostException;
import java.nio.charset.StandardCharsets;
import javax.servlet.http.HttpServletResponse;
@@ -228,6 +230,12 @@ public class TestManagerWebapp extends TomcatBaseTest {
tomcat.start();
SimpleHttpClient client = new SimpleHttpClient() {
+// 10s default too low for some CI systems
+@Override
+public void connect() throws UnknownHostException, IOException {
+connect(3,3);
+}
+
@Override
public boolean isResponseBodyOK() {
return true;
-
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 test failure on my local CI system
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 b2f310a625 Fix test failure on my local CI system
b2f310a625 is described below
commit b2f310a625bc59eb1644d08156d1b02b9c058ff9
Author: unknown
AuthorDate: Thu Oct 3 16:36:40 2024 +0100
Fix test failure on my local CI system
---
test/org/apache/catalina/manager/TestManagerWebapp.java | 8
1 file changed, 8 insertions(+)
diff --git a/test/org/apache/catalina/manager/TestManagerWebapp.java
b/test/org/apache/catalina/manager/TestManagerWebapp.java
index 0d4324aa67..270ca63551 100644
--- a/test/org/apache/catalina/manager/TestManagerWebapp.java
+++ b/test/org/apache/catalina/manager/TestManagerWebapp.java
@@ -18,8 +18,10 @@ package org.apache.catalina.manager;
import java.io.File;
import java.io.FileReader;
+import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
+import java.net.UnknownHostException;
import java.nio.charset.StandardCharsets;
import jakarta.servlet.http.HttpServletResponse;
@@ -228,6 +230,12 @@ public class TestManagerWebapp extends TomcatBaseTest {
tomcat.start();
SimpleHttpClient client = new SimpleHttpClient() {
+// 10s default too low for some CI systems
+@Override
+public void connect() throws UnknownHostException, IOException {
+connect(3,3);
+}
+
@Override
public boolean isResponseBodyOK() {
return true;
-
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 test failure on my local CI system
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 abe2204dff Fix test failure on my local CI system
abe2204dff is described below
commit abe2204dffbf97b87ce1153565ba32a68a0ea533
Author: unknown
AuthorDate: Thu Oct 3 16:36:40 2024 +0100
Fix test failure on my local CI system
---
test/org/apache/catalina/manager/TestManagerWebapp.java | 8
1 file changed, 8 insertions(+)
diff --git a/test/org/apache/catalina/manager/TestManagerWebapp.java
b/test/org/apache/catalina/manager/TestManagerWebapp.java
index 0d4324aa67..270ca63551 100644
--- a/test/org/apache/catalina/manager/TestManagerWebapp.java
+++ b/test/org/apache/catalina/manager/TestManagerWebapp.java
@@ -18,8 +18,10 @@ package org.apache.catalina.manager;
import java.io.File;
import java.io.FileReader;
+import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
+import java.net.UnknownHostException;
import java.nio.charset.StandardCharsets;
import jakarta.servlet.http.HttpServletResponse;
@@ -228,6 +230,12 @@ public class TestManagerWebapp extends TomcatBaseTest {
tomcat.start();
SimpleHttpClient client = new SimpleHttpClient() {
+// 10s default too low for some CI systems
+@Override
+public void connect() throws UnknownHostException, IOException {
+connect(3,3);
+}
+
@Override
public boolean isResponseBodyOK() {
return true;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Fix test failure on my local CI system
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 300300748a Fix test failure on my local CI system
300300748a is described below
commit 300300748a7da80d56f139a6bd476dbf11dd6a55
Author: unknown
AuthorDate: Thu Oct 3 16:36:40 2024 +0100
Fix test failure on my local CI system
---
test/org/apache/catalina/manager/TestManagerWebapp.java | 8
1 file changed, 8 insertions(+)
diff --git a/test/org/apache/catalina/manager/TestManagerWebapp.java
b/test/org/apache/catalina/manager/TestManagerWebapp.java
index 0d4324aa67..270ca63551 100644
--- a/test/org/apache/catalina/manager/TestManagerWebapp.java
+++ b/test/org/apache/catalina/manager/TestManagerWebapp.java
@@ -18,8 +18,10 @@ package org.apache.catalina.manager;
import java.io.File;
import java.io.FileReader;
+import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
+import java.net.UnknownHostException;
import java.nio.charset.StandardCharsets;
import jakarta.servlet.http.HttpServletResponse;
@@ -228,6 +230,12 @@ public class TestManagerWebapp extends TomcatBaseTest {
tomcat.start();
SimpleHttpClient client = new SimpleHttpClient() {
+// 10s default too low for some CI systems
+@Override
+public void connect() throws UnknownHostException, IOException {
+connect(3,3);
+}
+
@Override
public boolean isResponseBodyOK() {
return true;
-
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: Use getPathPrefix() consistently
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 f86cb234c2 Use getPathPrefix() consistently
f86cb234c2 is described below
commit f86cb234c27b5985117aa08350cd250429340299
Author: Mark Thomas
AuthorDate: Thu Oct 3 14:36:47 2024 +0100
Use getPathPrefix() consistently
If WebDAV editing is enabled at a sepcific sub-path, getPathPrefix()
needs to be used to ensure paths are processed correctly.
---
java/org/apache/catalina/servlets/WebdavServlet.java | 8
webapps/docs/changelog.xml | 5 +
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index 13cfe8240f..c434b82277 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -1466,14 +1466,14 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
}
// Cross-context operations aren't supported
-String reqContextPath = req.getContextPath();
+String reqContextPath = getPathPrefix(req);
if (!destinationPath.startsWith(reqContextPath + "/")) {
resp.sendError(WebdavStatus.SC_FORBIDDEN);
return false;
}
// Remove context path & servlet path
-destinationPath = destinationPath.substring(reqContextPath.length() +
req.getServletPath().length());
+destinationPath = destinationPath.substring(reqContextPath.length());
if (debug > 0) {
log("Dest path: " + destinationPath);
@@ -1824,7 +1824,7 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
generatedXML.writeElement("D", "response", XMLWriter.OPENING);
generatedXML.writeElement("D", "href", XMLWriter.OPENING);
-generatedXML.writeText(req.getContextPath() + errorPath);
+generatedXML.writeText(getPathPrefix(req) + errorPath);
generatedXML.writeElement("D", "href", XMLWriter.CLOSING);
generatedXML.writeElement("D", "status", XMLWriter.OPENING);
@@ -1866,7 +1866,7 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
return;
}
-String href = req.getContextPath() + req.getServletPath();
+String href = getPathPrefix(req);
if ((href.endsWith("/")) && (path.startsWith("/"))) {
href += path.substring(1);
} else {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a2a5e2dd80..16e8fc3fe5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -160,6 +160,11 @@
collection via WebDAV fails. Empty directories that cannot be deleted
will now be included in the response. (markt)
+
+69363: Use getPathPrefix() consistently in the
+WebDAV servlet to ensure that the correct path is used when the WebDAV
+servlet is mounted at a sub-path within the web application. (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: Use getPathPrefix() consistently
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 9b433a9a8b Use getPathPrefix() consistently
9b433a9a8b is described below
commit 9b433a9a8b2d8ab87ddf0a1e1226d43e972aa1bf
Author: Mark Thomas
AuthorDate: Thu Oct 3 14:36:47 2024 +0100
Use getPathPrefix() consistently
If WebDAV editing is enabled at a sepcific sub-path, getPathPrefix()
needs to be used to ensure paths are processed correctly.
---
java/org/apache/catalina/servlets/WebdavServlet.java | 8
webapps/docs/changelog.xml | 5 +
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index 611a85c88c..b18953ba2a 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -1467,14 +1467,14 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
}
// Cross-context operations aren't supported
-String reqContextPath = req.getContextPath();
+String reqContextPath = getPathPrefix(req);
if (!destinationPath.startsWith(reqContextPath + "/")) {
resp.sendError(WebdavStatus.SC_FORBIDDEN);
return false;
}
// Remove context path & servlet path
-destinationPath = destinationPath.substring(reqContextPath.length() +
req.getServletPath().length());
+destinationPath = destinationPath.substring(reqContextPath.length());
if (debug > 0) {
log("Dest path: " + destinationPath);
@@ -1825,7 +1825,7 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
generatedXML.writeElement("D", "response", XMLWriter.OPENING);
generatedXML.writeElement("D", "href", XMLWriter.OPENING);
-generatedXML.writeText(req.getContextPath() + errorPath);
+generatedXML.writeText(getPathPrefix(req) + errorPath);
generatedXML.writeElement("D", "href", XMLWriter.CLOSING);
generatedXML.writeElement("D", "status", XMLWriter.OPENING);
@@ -1867,7 +1867,7 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
return;
}
-String href = req.getContextPath() + req.getServletPath();
+String href = getPathPrefix(req);
if ((href.endsWith("/")) && (path.startsWith("/"))) {
href += path.substring(1);
} else {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a71809810a..4a5167b7cf 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -165,6 +165,11 @@
collection via WebDAV fails. Empty directories that cannot be deleted
will now be included in the response. (markt)
+
+69363: Use getPathPrefix() consistently in the
+WebDAV servlet to ensure that the correct path is used when the WebDAV
+servlet is mounted at a sub-path within the web application. (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: Use getPathPrefix() consistently
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 dd145d2c6a Use getPathPrefix() consistently
dd145d2c6a is described below
commit dd145d2c6ac9622ece807ef302a394c12d8745e5
Author: Mark Thomas
AuthorDate: Thu Oct 3 14:36:47 2024 +0100
Use getPathPrefix() consistently
If WebDAV editing is enabled at a sepcific sub-path, getPathPrefix()
needs to be used to ensure paths are processed correctly.
---
java/org/apache/catalina/servlets/WebdavServlet.java | 8
webapps/docs/changelog.xml | 5 +
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index 611a85c88c..b18953ba2a 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -1467,14 +1467,14 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
}
// Cross-context operations aren't supported
-String reqContextPath = req.getContextPath();
+String reqContextPath = getPathPrefix(req);
if (!destinationPath.startsWith(reqContextPath + "/")) {
resp.sendError(WebdavStatus.SC_FORBIDDEN);
return false;
}
// Remove context path & servlet path
-destinationPath = destinationPath.substring(reqContextPath.length() +
req.getServletPath().length());
+destinationPath = destinationPath.substring(reqContextPath.length());
if (debug > 0) {
log("Dest path: " + destinationPath);
@@ -1825,7 +1825,7 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
generatedXML.writeElement("D", "response", XMLWriter.OPENING);
generatedXML.writeElement("D", "href", XMLWriter.OPENING);
-generatedXML.writeText(req.getContextPath() + errorPath);
+generatedXML.writeText(getPathPrefix(req) + errorPath);
generatedXML.writeElement("D", "href", XMLWriter.CLOSING);
generatedXML.writeElement("D", "status", XMLWriter.OPENING);
@@ -1867,7 +1867,7 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
return;
}
-String href = req.getContextPath() + req.getServletPath();
+String href = getPathPrefix(req);
if ((href.endsWith("/")) && (path.startsWith("/"))) {
href += path.substring(1);
} else {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7852df94dd..cbd6567244 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -165,6 +165,11 @@
collection via WebDAV fails. Empty directories that cannot be deleted
will now be included in the response. (markt)
+
+69363: Use getPathPrefix() consistently in the
+WebDAV servlet to ensure that the correct path is used when the WebDAV
+servlet is mounted at a sub-path within the web application. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Use getPathPrefix() consistently
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 1ee03e7632 Use getPathPrefix() consistently
1ee03e7632 is described below
commit 1ee03e7632233c2ce7d11fcc5287e0764d65ff14
Author: Mark Thomas
AuthorDate: Thu Oct 3 14:36:47 2024 +0100
Use getPathPrefix() consistently
If WebDAV editing is enabled at a sepcific sub-path, getPathPrefix()
needs to be used to ensure paths are processed correctly.
---
java/org/apache/catalina/servlets/WebdavServlet.java | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index 2065add225..62b588a789 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -1469,14 +1469,14 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
}
// Cross-context operations aren't supported
-String reqContextPath = req.getContextPath();
+String reqContextPath = getPathPrefix(req);
if (!destinationPath.startsWith(reqContextPath + "/")) {
resp.sendError(WebdavStatus.SC_FORBIDDEN);
return false;
}
// Remove context path & servlet path
-destinationPath = destinationPath.substring(reqContextPath.length() +
req.getServletPath().length());
+destinationPath = destinationPath.substring(reqContextPath.length());
if (debug > 0) {
log("Dest path: " + destinationPath);
@@ -1827,7 +1827,7 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
generatedXML.writeElement("D", "response", XMLWriter.OPENING);
generatedXML.writeElement("D", "href", XMLWriter.OPENING);
-generatedXML.writeText(req.getContextPath() + errorPath);
+generatedXML.writeText(getPathPrefix(req) + errorPath);
generatedXML.writeElement("D", "href", XMLWriter.CLOSING);
generatedXML.writeElement("D", "status", XMLWriter.OPENING);
@@ -1869,7 +1869,7 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
return;
}
-String href = req.getContextPath() + req.getServletPath();
+String href = getPathPrefix(req);
if ((href.endsWith("/")) && (path.startsWith("/"))) {
href += path.substring(1);
} else {
-
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 BZ 69362 - Better multi-status response for deletes
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 81fc839392 Fix BZ 69362 - Better multi-status response for deletes
81fc839392 is described below
commit 81fc839392f42fe211e823fe9e4a83c3905f1e71
Author: Mark Thomas
AuthorDate: Thu Oct 3 11:25:47 2024 +0100
Fix BZ 69362 - Better multi-status response for deletes
---
java/org/apache/catalina/servlets/WebdavServlet.java | 16 +---
webapps/docs/changelog.xml | 5 +
2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index bf338ef1d6..13cfe8240f 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -1777,9 +1777,19 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
}
if (!childResource.delete()) {
-if (!childResource.isDirectory()) {
-// If it's not a collection, then it's an unknown
-// error
+/*
+ * See RFC 4918, section 9.6.1, last paragraph.
+ *
+ * If a child resource can't be deleted then the parent
resource SHOULD NOT be included in the
+ * multi-status response since the notice of the failure
to delete the child implies that all
+ * parent resources could also not be deleted.
+ */
+if (!childResource.isDirectory() ||
resources.list(childName).length == 0) {
+/*
+ * The resource could not be deleted. If the resource
is not a directory or if the resource is a
+ * directory and it has no children (or all those
children have been successfully deleted) then
+ * it should be listed in the multi-status response.
+ */
errorList.put(childName,
Integer.valueOf(WebdavStatus.SC_METHOD_NOT_ALLOWED));
}
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cdc66eeea7..a2a5e2dd80 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -155,6 +155,11 @@
Add log warning if non wildcard mappings are used with the
WebdavServlet. (remm)
+
+69362: Provide a better multi-status response when deleting
a
+collection via WebDAV fails. Empty directories that cannot be deleted
+will now be included in the response. (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 BZ 69362 - Better multi-status response for deletes
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 589c12d536 Fix BZ 69362 - Better multi-status response for deletes
589c12d536 is described below
commit 589c12d536574e6a67391a00122b5b5442a1c236
Author: Mark Thomas
AuthorDate: Thu Oct 3 11:25:47 2024 +0100
Fix BZ 69362 - Better multi-status response for deletes
---
java/org/apache/catalina/servlets/WebdavServlet.java | 16 +---
webapps/docs/changelog.xml | 5 +
2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index e7383cb176..611a85c88c 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -1778,9 +1778,19 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
}
if (!childResource.delete()) {
-if (!childResource.isDirectory()) {
-// If it's not a collection, then it's an unknown
-// error
+/*
+ * See RFC 4918, section 9.6.1, last paragraph.
+ *
+ * If a child resource can't be deleted then the parent
resource SHOULD NOT be included in the
+ * multi-status response since the notice of the failure
to delete the child implies that all
+ * parent resources could also not be deleted.
+ */
+if (!childResource.isDirectory() ||
resources.list(childName).length == 0) {
+/*
+ * The resource could not be deleted. If the resource
is not a directory or if the resource is a
+ * directory and it has no children (or all those
children have been successfully deleted) then
+ * it should be listed in the multi-status response.
+ */
errorList.put(childName,
Integer.valueOf(WebdavStatus.SC_METHOD_NOT_ALLOWED));
}
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index bd0cb5127d..a71809810a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -160,6 +160,11 @@
Add log warning if non wildcard mappings are used with the
WebdavServlet. (remm)
+
+69362: Provide a better multi-status response when deleting
a
+collection via WebDAV fails. Empty directories that cannot be deleted
+will now be included in the response. (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 BZ 69362 - Better multi-status response for deletes
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 31672fe435 Fix BZ 69362 - Better multi-status response for deletes
31672fe435 is described below
commit 31672fe4356e30ffc1c1abc0258fefcbbbc0dc81
Author: Mark Thomas
AuthorDate: Thu Oct 3 11:25:47 2024 +0100
Fix BZ 69362 - Better multi-status response for deletes
---
java/org/apache/catalina/servlets/WebdavServlet.java | 16 +---
webapps/docs/changelog.xml | 5 +
2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index e7383cb176..611a85c88c 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -1778,9 +1778,19 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
}
if (!childResource.delete()) {
-if (!childResource.isDirectory()) {
-// If it's not a collection, then it's an unknown
-// error
+/*
+ * See RFC 4918, section 9.6.1, last paragraph.
+ *
+ * If a child resource can't be deleted then the parent
resource SHOULD NOT be included in the
+ * multi-status response since the notice of the failure
to delete the child implies that all
+ * parent resources could also not be deleted.
+ */
+if (!childResource.isDirectory() ||
resources.list(childName).length == 0) {
+/*
+ * The resource could not be deleted. If the resource
is not a directory or if the resource is a
+ * directory and it has no children (or all those
children have been successfully deleted) then
+ * it should be listed in the multi-status response.
+ */
errorList.put(childName,
Integer.valueOf(WebdavStatus.SC_METHOD_NOT_ALLOWED));
}
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 379c556720..7852df94dd 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -160,6 +160,11 @@
Add log warning if non wildcard mappings are used with the
WebdavServlet. (remm)
+
+69362: Provide a better multi-status response when deleting
a
+collection via WebDAV fails. Empty directories that cannot be deleted
+will now be included in the response. (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 BZ 69362 - Better multi-status response for deletes
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 1cb857d4f2 Fix BZ 69362 - Better multi-status response for deletes
1cb857d4f2 is described below
commit 1cb857d4f246e8245e52284b54a514cbdd3df51b
Author: Mark Thomas
AuthorDate: Thu Oct 3 11:25:47 2024 +0100
Fix BZ 69362 - Better multi-status response for deletes
---
java/org/apache/catalina/servlets/WebdavServlet.java | 16 +---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index c5ad3f8623..2065add225 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -1780,9 +1780,19 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
}
if (!childResource.delete()) {
-if (!childResource.isDirectory()) {
-// If it's not a collection, then it's an unknown
-// error
+/*
+ * See RFC 4918, section 9.6.1, last paragraph.
+ *
+ * If a child resource can't be deleted then the parent
resource SHOULD NOT be included in the
+ * multi-status response since the notice of the failure
to delete the child implies that all
+ * parent resources could also not be deleted.
+ */
+if (!childResource.isDirectory() ||
resources.list(childName).length == 0) {
+/*
+ * The resource could not be deleted. If the resource
is not a directory or if the resource is a
+ * directory and it has no children (or all those
children have been successfully deleted) then
+ * it should be listed in the multi-status response.
+ */
errorList.put(childName,
Integer.valueOf(WebdavStatus.SC_METHOD_NOT_ALLOWED));
}
}
-
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: Use lazy initialisation for lambdaArguments
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 f265740b6e Use lazy initialisation for lambdaArguments
f265740b6e is described below
commit f265740b6e79ca0410d8c34419a7fd1257a8c8df
Author: Mark Thomas
AuthorDate: Thu Oct 3 10:02:47 2024 +0100
Use lazy initialisation for lambdaArguments
This aligns with other fields in ELContext that already use lazy
initialisation
---
java/javax/el/ELContext.java | 17 -
webapps/docs/changelog.xml | 5 +
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/java/javax/el/ELContext.java b/java/javax/el/ELContext.java
index ac9d5fa2ea..98ec843253 100644
--- a/java/javax/el/ELContext.java
+++ b/java/javax/el/ELContext.java
@@ -38,12 +38,19 @@ public abstract class ELContext {
private List listeners;
-private Deque> lambdaArguments = new ArrayDeque<>();
+private Deque> lambdaArguments = null;
public ELContext() {
this.resolved = false;
}
+private Deque> getLambdaArguments() {
+if (lambdaArguments == null) {
+lambdaArguments = new ArrayDeque<>(4);
+}
+return lambdaArguments;
+}
+
public void setPropertyResolved(boolean resolved) {
this.resolved = resolved;
}
@@ -235,7 +242,7 @@ public abstract class ELContext {
* @since EL 3.0
*/
public boolean isLambdaArgument(String name) {
-for (Map arguments : lambdaArguments) {
+for (Map arguments : getLambdaArguments()) {
if (arguments.containsKey(name)) {
return true;
}
@@ -253,7 +260,7 @@ public abstract class ELContext {
* @since EL 3.0
*/
public Object getLambdaArgument(String name) {
-for (Map arguments : lambdaArguments) {
+for (Map arguments : getLambdaArguments()) {
Object result = arguments.get(name);
if (result != null) {
return result;
@@ -271,7 +278,7 @@ public abstract class ELContext {
* @since EL 3.0
*/
public void enterLambdaScope(Map arguments) {
-lambdaArguments.push(arguments);
+getLambdaArguments().push(arguments);
}
/**
@@ -280,7 +287,7 @@ public abstract class ELContext {
* @since EL 3.0
*/
public void exitLambdaScope() {
-lambdaArguments.pop();
+getLambdaArguments().pop();
}
/**
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 72406044b3..e32871c8be 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -196,6 +196,11 @@
include AND or OR operations with more than two operands and
expressions
that use not empty. (markt)
+
+69348: Reduce memory consumption in ELContext
by
+using lazy initialization for the data structure used to track lambda
+arguments. (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: Use lazy initialisation for lambdaArguments
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 05cb3beaf9 Use lazy initialisation for lambdaArguments
05cb3beaf9 is described below
commit 05cb3beaf99141e8be71b2b792dfec75200f3f8e
Author: Mark Thomas
AuthorDate: Thu Oct 3 10:02:47 2024 +0100
Use lazy initialisation for lambdaArguments
This aligns with other fields in ELContext that already use lazy
initialisation
---
java/jakarta/el/ELContext.java | 17 -
webapps/docs/changelog.xml | 5 +
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/java/jakarta/el/ELContext.java b/java/jakarta/el/ELContext.java
index 12840d1597..98f0856796 100644
--- a/java/jakarta/el/ELContext.java
+++ b/java/jakarta/el/ELContext.java
@@ -40,12 +40,19 @@ public abstract class ELContext {
private List listeners;
-private Deque> lambdaArguments = new ArrayDeque<>();
+private Deque> lambdaArguments = null;
public ELContext() {
this.resolved = false;
}
+private Deque> getLambdaArguments() {
+if (lambdaArguments == null) {
+lambdaArguments = new ArrayDeque<>(4);
+}
+return lambdaArguments;
+}
+
public void setPropertyResolved(boolean resolved) {
this.resolved = resolved;
}
@@ -235,7 +242,7 @@ public abstract class ELContext {
* @since EL 3.0
*/
public boolean isLambdaArgument(String name) {
-for (Map arguments : lambdaArguments) {
+for (Map arguments : getLambdaArguments()) {
if (arguments.containsKey(name)) {
return true;
}
@@ -253,7 +260,7 @@ public abstract class ELContext {
* @since EL 3.0
*/
public Object getLambdaArgument(String name) {
-for (Map arguments : lambdaArguments) {
+for (Map arguments : getLambdaArguments()) {
Object result = arguments.get(name);
if (result != null) {
return result;
@@ -271,7 +278,7 @@ public abstract class ELContext {
* @since EL 3.0
*/
public void enterLambdaScope(Map arguments) {
-lambdaArguments.push(arguments);
+getLambdaArguments().push(arguments);
}
/**
@@ -280,7 +287,7 @@ public abstract class ELContext {
* @since EL 3.0
*/
public void exitLambdaScope() {
-lambdaArguments.pop();
+getLambdaArguments().pop();
}
/**
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 23d4453e94..2a97289047 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -205,6 +205,11 @@
include AND or OR operations with more than two operands and
expressions
that use not empty. (markt)
+
+69348: Reduce memory consumption in ELContext
by
+using lazy initialization for the data structure used to track lambda
+arguments. (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: Use lazy initialisation for lambdaArguments
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 0341bf0cb5 Use lazy initialisation for lambdaArguments
0341bf0cb5 is described below
commit 0341bf0cb56eac6f8ed6a5ca76ca477d50129f03
Author: Mark Thomas
AuthorDate: Thu Oct 3 10:02:47 2024 +0100
Use lazy initialisation for lambdaArguments
This aligns with other fields in ELContext that already use lazy
initialisation
---
java/jakarta/el/ELContext.java | 17 -
webapps/docs/changelog.xml | 5 +
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/java/jakarta/el/ELContext.java b/java/jakarta/el/ELContext.java
index 12840d1597..98f0856796 100644
--- a/java/jakarta/el/ELContext.java
+++ b/java/jakarta/el/ELContext.java
@@ -40,12 +40,19 @@ public abstract class ELContext {
private List listeners;
-private Deque> lambdaArguments = new ArrayDeque<>();
+private Deque> lambdaArguments = null;
public ELContext() {
this.resolved = false;
}
+private Deque> getLambdaArguments() {
+if (lambdaArguments == null) {
+lambdaArguments = new ArrayDeque<>(4);
+}
+return lambdaArguments;
+}
+
public void setPropertyResolved(boolean resolved) {
this.resolved = resolved;
}
@@ -235,7 +242,7 @@ public abstract class ELContext {
* @since EL 3.0
*/
public boolean isLambdaArgument(String name) {
-for (Map arguments : lambdaArguments) {
+for (Map arguments : getLambdaArguments()) {
if (arguments.containsKey(name)) {
return true;
}
@@ -253,7 +260,7 @@ public abstract class ELContext {
* @since EL 3.0
*/
public Object getLambdaArgument(String name) {
-for (Map arguments : lambdaArguments) {
+for (Map arguments : getLambdaArguments()) {
Object result = arguments.get(name);
if (result != null) {
return result;
@@ -271,7 +278,7 @@ public abstract class ELContext {
* @since EL 3.0
*/
public void enterLambdaScope(Map arguments) {
-lambdaArguments.push(arguments);
+getLambdaArguments().push(arguments);
}
/**
@@ -280,7 +287,7 @@ public abstract class ELContext {
* @since EL 3.0
*/
public void exitLambdaScope() {
-lambdaArguments.pop();
+getLambdaArguments().pop();
}
/**
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d9a2af27b2..088221d442 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -205,6 +205,11 @@
include AND or OR operations with more than two operands and
expressions
that use not empty. (markt)
+
+69348: Reduce memory consumption in ELContext
by
+using lazy initialization for the data structure used to track lambda
+arguments. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Use lazy initialisation for lambdaArguments
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 f778219a6c Use lazy initialisation for lambdaArguments
f778219a6c is described below
commit f778219a6cfc53cbebcda0fd653bc622338415fd
Author: Mark Thomas
AuthorDate: Thu Oct 3 10:02:47 2024 +0100
Use lazy initialisation for lambdaArguments
This aligns with other fields in ELContext that already use lazy
initialisation
---
java/jakarta/el/ELContext.java | 17 -
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/java/jakarta/el/ELContext.java b/java/jakarta/el/ELContext.java
index 12840d1597..98f0856796 100644
--- a/java/jakarta/el/ELContext.java
+++ b/java/jakarta/el/ELContext.java
@@ -40,12 +40,19 @@ public abstract class ELContext {
private List listeners;
-private Deque> lambdaArguments = new ArrayDeque<>();
+private Deque> lambdaArguments = null;
public ELContext() {
this.resolved = false;
}
+private Deque> getLambdaArguments() {
+if (lambdaArguments == null) {
+lambdaArguments = new ArrayDeque<>(4);
+}
+return lambdaArguments;
+}
+
public void setPropertyResolved(boolean resolved) {
this.resolved = resolved;
}
@@ -235,7 +242,7 @@ public abstract class ELContext {
* @since EL 3.0
*/
public boolean isLambdaArgument(String name) {
-for (Map arguments : lambdaArguments) {
+for (Map arguments : getLambdaArguments()) {
if (arguments.containsKey(name)) {
return true;
}
@@ -253,7 +260,7 @@ public abstract class ELContext {
* @since EL 3.0
*/
public Object getLambdaArgument(String name) {
-for (Map arguments : lambdaArguments) {
+for (Map arguments : getLambdaArguments()) {
Object result = arguments.get(name);
if (result != null) {
return result;
@@ -271,7 +278,7 @@ public abstract class ELContext {
* @since EL 3.0
*/
public void enterLambdaScope(Map arguments) {
-lambdaArguments.push(arguments);
+getLambdaArguments().push(arguments);
}
/**
@@ -280,7 +287,7 @@ public abstract class ELContext {
* @since EL 3.0
*/
public void exitLambdaScope() {
-lambdaArguments.pop();
+getLambdaArguments().pop();
}
/**
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-training) 02/02: Clarify this plan was for Jakatrta EE 11
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-training.git commit aae58eb8616c60dc43d2a8f0a95bed56b356c82a Author: Mark Thomas AuthorDate: Wed Oct 2 16:41:23 2024 +0100 Clarify this plan was for Jakatrta EE 11 --- modules/tomcat-11-jakarta-ee-11.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/tomcat-11-jakarta-ee-11.html b/modules/tomcat-11-jakarta-ee-11.html index 1143404..7bca10e 100644 --- a/modules/tomcat-11-jakarta-ee-11.html +++ b/modules/tomcat-11-jakarta-ee-11.html @@ -40,7 +40,7 @@ Overview - Timing Jakarta EE 10 was released Q3 2022 - Originally planned for Q1 2024 + Jakarta EE 11 originally planned for Q1 2024 Testing and Compatibility Kits (TCKs) refactoring taking longer than expected Slipped to H1 2024 then H2 2024 Tomcat 11.0.0-M1 2022-12-05 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-training) 01/02: Add code example for HttpSession.getAccessor()
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-training.git
commit 1ad620eb298db6fc62d93fe3ec698d38cae20b8a
Author: Mark Thomas
AuthorDate: Wed Oct 2 16:40:18 2024 +0100
Add code example for HttpSession.getAccessor()
---
modules/tomcat-11-jakarta-ee-11.html | 15 +++
1 file changed, 15 insertions(+)
diff --git a/modules/tomcat-11-jakarta-ee-11.html
b/modules/tomcat-11-jakarta-ee-11.html
index 58cc048..1143404 100644
--- a/modules/tomcat-11-jakarta-ee-11.html
+++ b/modules/tomcat-11-jakarta-ee-11.html
@@ -54,6 +54,21 @@
Changes - Jakarta Servlet - 6.1
Safe HTTP session access for WebSocket
+
+
+public interface HttpSession {
+...
+Accessor getAccessor();
+
+interface Accessor {
+void access(Consumer sessionConsumer);
+}
+}
+
+
+
+
+ Changes - Jakarta Servlet - 6.1
Invalid request parameters will always trigger an exception
HTTP/2 server push is deprecated
Lots of clarifications
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-training) branch main updated (09558ba -> aae58eb)
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-training.git from 09558ba Updates after a couple of practice runs new 1ad620e Add code example for HttpSession.getAccessor() new aae58eb Clarify this plan was for Jakatrta EE 11 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: modules/tomcat-11-jakarta-ee-11.html | 17 - 1 file changed, 16 insertions(+), 1 deletion(-) - 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: Improvements to Chinese translations by Ch_jp
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 0de3537921 Improvements to Chinese translations by Ch_jp
0de3537921 is described below
commit 0de3537921eba6189ff4f1e7d2ec7567224c4f86
Author: Mark Thomas
AuthorDate: Wed Oct 2 15:28:13 2024 +0100
Improvements to Chinese translations by Ch_jp
---
java/javax/el/LocalStrings_zh_CN.properties| 6 +++---
java/javax/servlet/LocalStrings_zh_CN.properties | 2 +-
java/javax/servlet/http/LocalStrings_zh_CN.properties | 2 +-
java/org/apache/catalina/core/LocalStrings_zh_CN.properties| 10 +-
java/org/apache/catalina/deploy/LocalStrings_zh_CN.properties | 2 +-
java/org/apache/coyote/LocalStrings_zh_CN.properties | 5 ++---
.../apache/coyote/http11/filters/LocalStrings_zh_CN.properties | 10 +-
java/org/apache/coyote/http2/LocalStrings_zh_CN.properties | 1 -
webapps/docs/changelog.xml | 3 +++
9 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/java/javax/el/LocalStrings_zh_CN.properties
b/java/javax/el/LocalStrings_zh_CN.properties
index ebfd5c40d2..b9644e61ee 100644
--- a/java/javax/el/LocalStrings_zh_CN.properties
+++ b/java/javax/el/LocalStrings_zh_CN.properties
@@ -38,10 +38,10 @@ importHandler.invalidClassNameForStatic=为静态导入 [{1}] 指定的类
[{0}]
importHandler.invalidStaticName=要导入的静态方法或字段的名称 [{0}] 必须包含类
importHandler.staticNotFound=在导入 [{2}] 的类 [{1}] 中找不到静态导入 [{0}]
-lambdaExpression.tooFewArgs=对于至少需要 [{1}] 的 lambda 表达式，仅提供了 [{0}] 个自变量
+lambdaExpression.tooFewArgs=对于至少需要 [{1}] 个参数的 lambda 表达式，仅提供了 [{0}] 个参数
-objectNotAssignable=无法将类型为 [{0}] 的对象添加到类型为 [{1}] 的对象阵列
-propertyNotFound=在类型 [{0}] 上未找到属性 [{1}]
+objectNotAssignable=无法将类型为 [{0}] 的对象添加到类型为 [{1}] 的对象数组
+propertyNotFound=属性 [{1}] 在类型 [{0}] 上不存在
propertyNotReadable=属性 [{1}] 在类型 [{0}] 上不可读
propertyNotWritable=属性 [{1}] 在类型 [{0}] 上不可写
propertyReadError=在类型 [{0}] 上读取 [{1}] 时出错
diff --git a/java/javax/servlet/LocalStrings_zh_CN.properties
b/java/javax/servlet/LocalStrings_zh_CN.properties
index 6598f10035..32a05cd2cd 100644
--- a/java/javax/servlet/LocalStrings_zh_CN.properties
+++ b/java/javax/servlet/LocalStrings_zh_CN.properties
@@ -20,7 +20,7 @@ err.not_iso8859_1=不是ISO 8859-1字符：[{0}]
httpConstraintElement.invalidRolesDeny=使用 DENY 时可能未指定角色
-httpMethodConstraintElement.invalidMethod=无效的HTTP.方法
+httpMethodConstraintElement.invalidMethod=无效的HTTP方法
value.false=否
value.true=true
diff --git a/java/javax/servlet/http/LocalStrings_zh_CN.properties
b/java/javax/servlet/http/LocalStrings_zh_CN.properties
index 3c2342c60f..35267e7ff8 100644
--- a/java/javax/servlet/http/LocalStrings_zh_CN.properties
+++ b/java/javax/servlet/http/LocalStrings_zh_CN.properties
@@ -16,7 +16,7 @@
# Do not edit this file directly.
# To edit transaltions see:
https://tomcat.apache.org/getinvolved.html#Translations
-err.cookie_name_blank=Cookie名称不能为null或零长度
+err.cookie_name_blank=Cookie名称不能为空
err.cookie_name_is_token=Cookie name[{0}]是一个保留令牌
err.io.indexOutOfBounds=为大小为[{2}]的数组指定的偏移量[{0}]和/或长度[{1}]无效。
err.io.nullArray=Null在write方法中传递给字节数组
diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
index 9eb2915ad6..e7fb61381d 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -204,8 +204,8 @@ standardContext.filterStart=启动过滤器异常[{0}]
standardContext.invalidWrapperClass=[{0}] 不是StandardWrapper的子类
standardContext.isUnavailable=此应用程序目前不可用
standardContext.listenerFail=一个或多个listeners启动失败，更多详细信息查看对应的容器日志文件
-standardContext.listenerStart=异常将上下文初始化事件发送到类的侦听器实例.[{0}]
-standardContext.listenerStop=例外情况发送上下文删除事件[{0}]，以便列表实例
+standardContext.listenerStart=发送上下文初始化事件到类的侦听器实例 [{0}] 时出现异常
+standardContext.listenerStop=发送上下文销毁事件到类的侦听器实例 [{0}] 时出现异常
standardContext.loadOnStartup.loadException=web应用程序[{0}]中的Servlet[{1}]引发了load（）异常
standardContext.loginConfig.errorPage=表单错误页[{0}]必须以"/"开始
standardContext.loginConfig.errorWarning=警告：Servlet 2.4中，表单错误页[{0}]必须以"/"开始
@@ -270,9 +270,9 @@ standardHostValve.customStatusFailed=无法正确调度自定义错误页[{0}]
standardPipeline.basic.start=启动新基本阀时出错
standardPipeline.basic.stop=停止旧基本阀时出错
-standardPipeline.valve.destroy=破坏阀门错误
-standardPipeline.valve.start=错误启动阀
-standardPipeline.valve.stop=错误截止阀
+standardPipeline.valve.destroy=销毁阀时出错
+standardPipeline.valve.start=启动阀时出错
+standardPipeline.valve.stop=停止阀时出错
standardServer.accept.error=尝试在侦听shutdown命令的套接字上接受IO异常
standardServer.accept.readError=尝试读取关机命令时发生IO异常
diff --git a/java/org/apache/catalina/deploy/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/deploy/LocalStrings_zh_CN.properties
index 4964234a69..5daf387746 100644
-
(tomcat) branch 9.0.x updated: Remove unused translations
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 246abd207c Remove unused translations
246abd207c is described below
commit 246abd207c5d5b024cb7c7923e47c99f664ff663
Author: Mark Thomas
AuthorDate: Wed Oct 2 15:27:52 2024 +0100
Remove unused translations
---
java/org/apache/coyote/LocalStrings_ko.properties | 1 -
java/org/apache/coyote/http2/LocalStrings_ko.properties | 1 -
2 files changed, 2 deletions(-)
diff --git a/java/org/apache/coyote/LocalStrings_ko.properties
b/java/org/apache/coyote/LocalStrings_ko.properties
index 2e3d5be8cf..02ff5704a3 100644
--- a/java/org/apache/coyote/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/LocalStrings_ko.properties
@@ -42,7 +42,6 @@ abstractProtocol.mbeanDeregistrationFailed=MBean 서버
[{1}](으)로부터, [{0
abstractProtocol.processorRegisterError=RequestProcessor 구성요소를 등록하는 중 오류 발생
abstractProtocol.processorUnregisterError=RequestProcessor 구성요소를 등록 해제하는 중 오류
발생
abstractProtocol.waitingProcessor.add=대기 프로세서에 추가된 프로세서 [{0}]
-abstractProtocol.waitingProcessor.remove=대기 프로세서에서 제거된 프로세서 [{0}]
abstractProtocolHandler.asyncTimeoutError=비동기 제한 시간 초과를 처리하는 동안 오류 발생
abstractProtocolHandler.destroy=프로토콜 핸들러 [{0}]을(를) 소멸시킵니다.
diff --git a/java/org/apache/coyote/http2/LocalStrings_ko.properties
b/java/org/apache/coyote/http2/LocalStrings_ko.properties
index 007480e1d6..e89b06a6d4 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ko.properties
@@ -108,7 +108,6 @@ stream.inputBuffer.signal=읽기 쓰레드가 대기하는 동안 inBuffer에
stream.inputBuffer.swallowUnread=이전에 읽어 입력 스트림 버퍼에 넣어진 [{0}] 바이트들을 무시합니다.
stream.notWritable=연결 [{0}], 스트림 [{1}], 이 스트림은 쓰기 가능하지 않습니다.
stream.outputBuffer.flush.debug=연결 [{0}], 스트림 [{1}], 위치 [{2}]의 버퍼를 출력으로 배출합니다.
쓰기 진행 중 여부: [{3}],닫힘 여부: [{4}]
-stream.recycle=연결 [{0}], 스트림 [{1}]이(가) 참조 해제되었습니다.
stream.reset.fail=연결 [{0}], 스트림 [{1}], 스트림을 재설정(reset)하지 못했습니다.
stream.reset.receive=연결 [{0}], 스트림 [{1}], [{2}](으)로 인해 재설정(reset)을 받았습니다.
stream.reset.send=연결 [{0}], 스트림 [{1}], [{2}](으)로 인하여 재설정(reset)이 전송되었음.
-
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: Improvements to Japanese translations by tak7iji
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 eb98277a06 Improvements to Japanese translations by tak7iji
eb98277a06 is described below
commit eb98277a066afc938de6fc11e5d142a5ecd6e2e7
Author: Mark Thomas
AuthorDate: Wed Oct 2 15:27:35 2024 +0100
Improvements to Japanese translations by tak7iji
---
java/org/apache/coyote/LocalStrings_ja.properties | 1 -
java/org/apache/coyote/http2/LocalStrings_ja.properties | 1 -
java/org/apache/tomcat/util/http/LocalStrings_ja.properties | 2 ++
java/org/apache/tomcat/websocket/LocalStrings_ja.properties | 1 +
webapps/docs/changelog.xml | 3 +++
5 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/coyote/LocalStrings_ja.properties
b/java/org/apache/coyote/LocalStrings_ja.properties
index ac71d1988e..c59ccdb76d 100644
--- a/java/org/apache/coyote/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/LocalStrings_ja.properties
@@ -43,7 +43,6 @@
abstractProtocol.mbeanDeregistrationFailed=MBeanサーバー[{1}]から[{0}]と
abstractProtocol.processorRegisterError=リクエストプロセッサ登録中のエラー
abstractProtocol.processorUnregisterError=リクエストプロセッサ登録解除中のエラー
abstractProtocol.waitingProcessor.add=待機中のプロセッサに [{0}] を追加しました
-abstractProtocol.waitingProcessor.remove=待機中のプロセッサから [{0}] を除去しました
abstractProtocolHandler.asyncTimeoutError=非同期タイムアウト処理中のエラー
abstractProtocolHandler.destroy=ProtocolHandler [{0}] を破棄します。
diff --git a/java/org/apache/coyote/http2/LocalStrings_ja.properties
b/java/org/apache/coyote/http2/LocalStrings_ja.properties
index 0edcdb8e71..15741e4f18 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ja.properties
@@ -111,7 +111,6 @@ stream.inputBuffer.signal=読み込みスレッドが待機している間に in
stream.inputBuffer.swallowUnread=以前に入力ストリームバッファに読み込まれた [{0}] バイトを飲み込ます
stream.notWritable=コネクション [{0}]、ストリーム [{1}]、このストリームには書き込みできません。
stream.outputBuffer.flush.debug=コネクション [{0}]、ストリーム [{1}]、バッファポジション
[{2}]で出力をフラッシュ、writeInProgress [{3}]、クローズ [{4}]
-stream.recycle=Connection[{0}]、Stream[{1}]はリサイクルされました
stream.reset.fail=コネクション [{0}]、ストリーム [{1}]、ストリームをリセットできません。
stream.reset.receive=コネクション [{0}]、ストリーム [{1}]、[{2}] のために受信されたリセット
stream.reset.send=コネクション [{0}]、ストリーム [{1}]、[{2}] が原因で RESET を送信しました。
diff --git a/java/org/apache/tomcat/util/http/LocalStrings_ja.properties
b/java/org/apache/tomcat/util/http/LocalStrings_ja.properties
index 2628b2bd77..227e45c3d4 100644
--- a/java/org/apache/tomcat/util/http/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/http/LocalStrings_ja.properties
@@ -23,6 +23,8 @@ cookies.invalidSameSiteCookies=不明な設定 [{0}] は、次のうちのいず
cookies.invalidSpecial=Cookies: 不明な特別な Cookie
cookies.maxCountFail=最大数[{0}]以上のクッキーが検出されました。
+cookiesWithoutEquals.invalid=値 [{0}] は認識されません
+
headers.maxCountFail=検出したヘッダー数 [{0}] は上限値を越えています。
parameters.bytes=入力[{0}]で処理を開始します。
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_ja.properties
b/java/org/apache/tomcat/websocket/LocalStrings_ja.properties
index 3547cb5cc4..f6d08c9cd6 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_ja.properties
@@ -121,6 +121,7 @@ wsSession.instanceCreateFailed=エンドポイントインスタンスの作成
wsSession.instanceNew=エンドポイントインスタンスの登録に失敗しました。
wsSession.invalidHandlerTypePong=pongメッセージハンドラはMessageHandler.Wholeを実装する必要があります。
wsSession.messageFailed=WebSocket コネクションが切断されているため、完了メッセージを送信できません
+wsSession.onClose.entry=状態 [{2}] のWebSocketセッション [{1}] で理由 [{0}] のクローズ
メッセージを受信しました
wsSession.removeHandlerFailed=セッションに登録されていないためハンドラー [{0}] を解除できません。
wsSession.sendCloseFail=セッション [{0}] のクローズメッセージをリモートエンドポイントに送信できませんでした
wsSession.timeout=WebSocket セッション [{0}] タイムアウトが切れました
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 625504530c..8879042d9f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -217,6 +217,9 @@
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 9.0.x updated: Improvements to French translations. (remm)
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 bd42dfac62 Improvements to French translations. (remm)
bd42dfac62 is described below
commit bd42dfac62225ee5e5344b89dc9f1618952ddfec
Author: Mark Thomas
AuthorDate: Wed Oct 2 15:27:13 2024 +0100
Improvements to French translations. (remm)
---
.../catalina/manager/LocalStrings_fr.properties| 64 +++---
.../manager/host/LocalStrings_fr.properties| 50 -
java/org/apache/coyote/LocalStrings_fr.properties | 1 -
.../apache/coyote/http2/LocalStrings_fr.properties | 1 -
.../tomcat/websocket/LocalStrings_fr.properties| 1 +
webapps/docs/changelog.xml | 3 +
6 files changed, 61 insertions(+), 59 deletions(-)
diff --git a/java/org/apache/catalina/manager/LocalStrings_fr.properties
b/java/org/apache/catalina/manager/LocalStrings_fr.properties
index b77cd902c7..bf2afade83 100644
--- a/java/org/apache/catalina/manager/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_fr.properties
@@ -48,7 +48,7 @@ htmlManagerServlet.connectorStateTableTitleClientForw=Client
(Forwardé)
htmlManagerServlet.connectorStateTableTitleRequest=Requête
htmlManagerServlet.connectorStateTableTitleStage=Etape
htmlManagerServlet.connectorStateTableTitleTime=Temps
-htmlManagerServlet.connectorStateTableTitleVHost=Hôte virtuel (VHost)
+htmlManagerServlet.connectorStateTableTitleVHost=Hôte virtuel
htmlManagerServlet.connectorStateThreadBusy=Nombre de threads utilisés :
htmlManagerServlet.connectorStateThreadCount=Nombre de threads actuel :
htmlManagerServlet.deployButton=Deployer
@@ -57,12 +57,12 @@ htmlManagerServlet.deployPath=Chemin de context (requis) :
htmlManagerServlet.deployServer=Emplacement du répertoire ou fichier WAR de
déploiement sur le serveur
htmlManagerServlet.deployTitle=Deployer
htmlManagerServlet.deployUpload=Fichier WAR à déployer
-htmlManagerServlet.deployUploadFail=ECHEC - Téléversement pour déploiement a
échoué, exception : [{0}]
+htmlManagerServlet.deployUploadFail=FAIL - Téléversement pour déploiement a
échoué, exception : [{0}]
htmlManagerServlet.deployUploadFile=Choisir le fichier WAR à téléverser
-htmlManagerServlet.deployUploadInServerXml=ECHEC - Fichier WAR [{0}] ne peut
être téléversé lorsque le contexte est défini dans server.xml
-htmlManagerServlet.deployUploadNoFile=ECHEC - Téléversement a échoué, aucun
fichier
-htmlManagerServlet.deployUploadNotWar=ECHEC - Fichier à téléverser, [{0}],
doit être un .war
-htmlManagerServlet.deployUploadWarExists=ECHEC - Fichier War [{0}] déjà
existant sur le serveur
+htmlManagerServlet.deployUploadInServerXml=FAIL - Fichier WAR [{0}] ne peut
être envoyé lorsque le contexte est défini dans server.xml
+htmlManagerServlet.deployUploadNoFile=FAIL - L'envoi du fichier a échoué,
aucun fichier
+htmlManagerServlet.deployUploadNotWar=FAIL - Le fichier envoyé [{0}] doit être
un .war
+htmlManagerServlet.deployUploadWarExists=FAIL - Fichier War [{0}] déjà
existant sur le serveur
htmlManagerServlet.deployVersion=Version (pour les déploiements en parallèle) :
htmlManagerServlet.deployWar=URL vers WAR ou répertoire :
htmlManagerServlet.diagnosticsLeak=Vérifiez si une application web a causé une
fuite de mémoire lors de son arrêt, rechargement ou déchargement
@@ -121,13 +121,13 @@ htmlManagerServlet.title=Gestionnaire d'applications WEB
Tomcat
jmxProxyServlet.noBeanFound=Impossible de trouver de MBean avec le nom
d''objet [{0}]
jmxProxyServlet.noOperationOnBean=Impossible de trouver l''opération [{0}]
avec [{1}] arguments sur le nom d''objet [{2}], qui est un [{3}]
-managerServlet.alreadyContext=ECHEC - l''application existe déjà dans le
chemin [{0}]
+managerServlet.alreadyContext=FAIL - l''application existe déjà dans le chemin
[{0}]
managerServlet.certsNotAvailable=L'information sur les certificats ne peut pas
être obtenu de ce connecteur au cours de son exécution
managerServlet.copyError=Impossible de copier le fichier de configuration à
partir du chemin [{0}]
-managerServlet.deleteFail=ECHEC - Impossible de supprimer [{0}], ce qui
pourrait causer des problèmes
-managerServlet.deployFailed=ECHEC - Echec au déploiement de l''application
pour le chemin de contexte [{0}]
+managerServlet.deleteFail=FAIL - Impossible de supprimer [{0}], ce qui
pourrait causer des problèmes
+managerServlet.deployFailed=FAIL - Echec au déploiement de l''application pour
le chemin de contexte [{0}]
managerServlet.deployed=OK - Application déployée pour le chemin de contexte
[{0}]
-managerServlet.deployedButNotStarted=ECHEC - Application déployée pour le
chemin de contexte [{0}] mais le démarrage du contexte a échoué
+managerServ
(tomcat) branch 10.1.x updated: Improvements to Chinese translations by Ch_jp
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 bfd4f44abe Improvements to Chinese translations by Ch_jp
bfd4f44abe is described below
commit bfd4f44abeaaa42e7111b9497ebac40b6314d1f8
Author: Mark Thomas
AuthorDate: Wed Oct 2 15:24:59 2024 +0100
Improvements to Chinese translations by Ch_jp
---
java/jakarta/el/LocalStrings_zh_CN.properties | 8
java/jakarta/servlet/LocalStrings_zh_CN.properties | 2 +-
java/jakarta/servlet/http/LocalStrings_zh_CN.properties| 2 +-
java/org/apache/catalina/core/LocalStrings_zh_CN.properties| 10 +-
java/org/apache/catalina/deploy/LocalStrings_zh_CN.properties | 2 +-
java/org/apache/coyote/LocalStrings_zh_CN.properties | 5 ++---
.../apache/coyote/http11/filters/LocalStrings_zh_CN.properties | 10 +-
java/org/apache/coyote/http2/LocalStrings_zh_CN.properties | 1 -
webapps/docs/changelog.xml | 3 +++
9 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/java/jakarta/el/LocalStrings_zh_CN.properties
b/java/jakarta/el/LocalStrings_zh_CN.properties
index 3a12ce1b29..267a7e89cd 100644
--- a/java/jakarta/el/LocalStrings_zh_CN.properties
+++ b/java/jakarta/el/LocalStrings_zh_CN.properties
@@ -32,16 +32,16 @@ expressionFactory.readFailed=未能读取 [{0}]
importHandler.ambiguousImport=未能导入类 [{0}]，因为它和已导入的 [{1}] 冲突
importHandler.ambiguousStaticImport=未能处理静态导入 [{0}]，因为它和已导入的 [{1}] 冲突
importHandler.classNotFound=未能导入类 [{0}]，因为找不到该类
-importHandler.invalidClass=在导出的包中（对于 Java 9+），类 [{0}] 必须是公用的，非抽象并且非接口
+importHandler.invalidClass=类[{0}]必须是公共的、非抽象的、非接口，且在导出包中（对于Java 9+）
importHandler.invalidClassName=要导入的类的名称 [{0}] 必须包含软件包
importHandler.invalidClassNameForStatic=为静态导入 [{1}] 指定的类 [{0}] 无效
importHandler.invalidStaticName=要导入的静态方法或字段的名称 [{0}] 必须包含类
importHandler.staticNotFound=在导入 [{2}] 的类 [{1}] 中找不到静态导入 [{0}]
-lambdaExpression.tooFewArgs=对于至少需要 [{1}] 的 lambda 表达式，仅提供了 [{0}] 个自变量
+lambdaExpression.tooFewArgs=对于至少需要 [{1}] 个参数的 lambda 表达式，仅提供了 [{0}] 个参数
-objectNotAssignable=无法将类型为 [{0}] 的对象添加到类型为 [{1}] 的对象阵列
-propertyNotFound=在类型 [{0}] 上未找到属性 [{1}]
+objectNotAssignable=无法将类型为 [{0}] 的对象添加到类型为 [{1}] 的对象数组
+propertyNotFound=属性 [{1}] 在类型 [{0}] 上不存在
propertyNotReadable=属性 [{1}] 在类型 [{0}] 上不可读
propertyNotWritable=属性 [{1}] 在类型 [{0}] 上不可写
propertyReadError=在类型 [{0}] 上读取 [{1}] 时出错
diff --git a/java/jakarta/servlet/LocalStrings_zh_CN.properties
b/java/jakarta/servlet/LocalStrings_zh_CN.properties
index 6598f10035..32a05cd2cd 100644
--- a/java/jakarta/servlet/LocalStrings_zh_CN.properties
+++ b/java/jakarta/servlet/LocalStrings_zh_CN.properties
@@ -20,7 +20,7 @@ err.not_iso8859_1=不是ISO 8859-1字符：[{0}]
httpConstraintElement.invalidRolesDeny=使用 DENY 时可能未指定角色
-httpMethodConstraintElement.invalidMethod=无效的HTTP.方法
+httpMethodConstraintElement.invalidMethod=无效的HTTP方法
value.false=否
value.true=true
diff --git a/java/jakarta/servlet/http/LocalStrings_zh_CN.properties
b/java/jakarta/servlet/http/LocalStrings_zh_CN.properties
index 37816e218a..24cbc164a8 100644
--- a/java/jakarta/servlet/http/LocalStrings_zh_CN.properties
+++ b/java/jakarta/servlet/http/LocalStrings_zh_CN.properties
@@ -19,7 +19,7 @@
cookie.attribute.invalidName.notToken=Cookie属性名[{0}]无效,因为它不是令牌
cookie.attribute.invalidName.null=Cookie属性名称不能为空
-err.cookie_name_blank=Cookie名称不能为null或零长度
+err.cookie_name_blank=Cookie名称不能为空
err.cookie_name_is_token=Cookie name[{0}]是一个保留令牌
err.io.indexOutOfBounds=为大小为[{2}]的数组指定的偏移量[{0}]和/或长度[{1}]无效。
err.io.nullArray=Null在write方法中传递给字节数组
diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
index 9df85fd59e..fb4b8cfc28 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -197,8 +197,8 @@ standardContext.filterStart=启动过滤器异常[{0}]
standardContext.invalidWrapperClass=[{0}] 不是StandardWrapper的子类
standardContext.isUnavailable=此应用程序目前不可用
standardContext.listenerFail=一个或多个listeners启动失败，更多详细信息查看对应的容器日志文件
-standardContext.listenerStart=异常将上下文初始化事件发送到类的侦听器实例.[{0}]
-standardContext.listenerStop=例外情况发送上下文删除事件[{0}]，以便列表实例
+standardContext.listenerStart=发送上下文初始化事件到类的侦听器实例 [{0}] 时出现异常
+standardContext.listenerStop=发送上下文销毁事件到类的侦听器实例 [{0}] 时出现异常
standardContext.loadOnStartup.loadException=web应用程序[{0}]中的Servlet[{1}]引发了load（）异常
standardContext.loginConfig.errorPage=表单错误页[{0}]必须以"/"开始
standardContext.loginConfig.errorWarning=警告：Servlet 2.4中，表单错误页[{0}]必须以"/"开始
@@ -263,9 +263,9 @@ standardHostValve.customStatusFailed=无法正确调度自定义错误页[{0}]
standardPipeline.basic.start=启动新基本阀时出错
standardPipeline.basic.stop=停止旧基本阀时出错
-standardPipeline.valve.destroy=破坏阀门错误
-standardPipeli
(tomcat) branch 10.1.x updated: Remove unused translations
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 4a448ee606 Remove unused translations
4a448ee606 is described below
commit 4a448ee6060e33209caaecab878324933d1216e5
Author: Mark Thomas
AuthorDate: Wed Oct 2 15:24:33 2024 +0100
Remove unused translations
---
java/org/apache/coyote/LocalStrings_ko.properties | 1 -
java/org/apache/coyote/http2/LocalStrings_ko.properties | 1 -
2 files changed, 2 deletions(-)
diff --git a/java/org/apache/coyote/LocalStrings_ko.properties
b/java/org/apache/coyote/LocalStrings_ko.properties
index 2e3d5be8cf..02ff5704a3 100644
--- a/java/org/apache/coyote/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/LocalStrings_ko.properties
@@ -42,7 +42,6 @@ abstractProtocol.mbeanDeregistrationFailed=MBean 서버
[{1}](으)로부터, [{0
abstractProtocol.processorRegisterError=RequestProcessor 구성요소를 등록하는 중 오류 발생
abstractProtocol.processorUnregisterError=RequestProcessor 구성요소를 등록 해제하는 중 오류
발생
abstractProtocol.waitingProcessor.add=대기 프로세서에 추가된 프로세서 [{0}]
-abstractProtocol.waitingProcessor.remove=대기 프로세서에서 제거된 프로세서 [{0}]
abstractProtocolHandler.asyncTimeoutError=비동기 제한 시간 초과를 처리하는 동안 오류 발생
abstractProtocolHandler.destroy=프로토콜 핸들러 [{0}]을(를) 소멸시킵니다.
diff --git a/java/org/apache/coyote/http2/LocalStrings_ko.properties
b/java/org/apache/coyote/http2/LocalStrings_ko.properties
index 007480e1d6..e89b06a6d4 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ko.properties
@@ -108,7 +108,6 @@ stream.inputBuffer.signal=읽기 쓰레드가 대기하는 동안 inBuffer에
stream.inputBuffer.swallowUnread=이전에 읽어 입력 스트림 버퍼에 넣어진 [{0}] 바이트들을 무시합니다.
stream.notWritable=연결 [{0}], 스트림 [{1}], 이 스트림은 쓰기 가능하지 않습니다.
stream.outputBuffer.flush.debug=연결 [{0}], 스트림 [{1}], 위치 [{2}]의 버퍼를 출력으로 배출합니다.
쓰기 진행 중 여부: [{3}],닫힘 여부: [{4}]
-stream.recycle=연결 [{0}], 스트림 [{1}]이(가) 참조 해제되었습니다.
stream.reset.fail=연결 [{0}], 스트림 [{1}], 스트림을 재설정(reset)하지 못했습니다.
stream.reset.receive=연결 [{0}], 스트림 [{1}], [{2}](으)로 인해 재설정(reset)을 받았습니다.
stream.reset.send=연결 [{0}], 스트림 [{1}], [{2}](으)로 인하여 재설정(reset)이 전송되었음.
-
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: Improvements to Japanese translations by tak7iji
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 c759a7cca7 Improvements to Japanese translations by tak7iji
c759a7cca7 is described below
commit c759a7cca75d7f037f3ad5692322596c9090f983
Author: Mark Thomas
AuthorDate: Wed Oct 2 15:24:07 2024 +0100
Improvements to Japanese translations by tak7iji
---
java/org/apache/coyote/LocalStrings_ja.properties | 1 -
java/org/apache/coyote/http2/LocalStrings_ja.properties | 1 -
java/org/apache/tomcat/util/http/LocalStrings_ja.properties | 2 ++
java/org/apache/tomcat/websocket/LocalStrings_ja.properties | 1 +
webapps/docs/changelog.xml | 3 +++
5 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/coyote/LocalStrings_ja.properties
b/java/org/apache/coyote/LocalStrings_ja.properties
index ac71d1988e..c59ccdb76d 100644
--- a/java/org/apache/coyote/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/LocalStrings_ja.properties
@@ -43,7 +43,6 @@
abstractProtocol.mbeanDeregistrationFailed=MBeanサーバー[{1}]から[{0}]と
abstractProtocol.processorRegisterError=リクエストプロセッサ登録中のエラー
abstractProtocol.processorUnregisterError=リクエストプロセッサ登録解除中のエラー
abstractProtocol.waitingProcessor.add=待機中のプロセッサに [{0}] を追加しました
-abstractProtocol.waitingProcessor.remove=待機中のプロセッサから [{0}] を除去しました
abstractProtocolHandler.asyncTimeoutError=非同期タイムアウト処理中のエラー
abstractProtocolHandler.destroy=ProtocolHandler [{0}] を破棄します。
diff --git a/java/org/apache/coyote/http2/LocalStrings_ja.properties
b/java/org/apache/coyote/http2/LocalStrings_ja.properties
index 0edcdb8e71..15741e4f18 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ja.properties
@@ -111,7 +111,6 @@ stream.inputBuffer.signal=読み込みスレッドが待機している間に in
stream.inputBuffer.swallowUnread=以前に入力ストリームバッファに読み込まれた [{0}] バイトを飲み込ます
stream.notWritable=コネクション [{0}]、ストリーム [{1}]、このストリームには書き込みできません。
stream.outputBuffer.flush.debug=コネクション [{0}]、ストリーム [{1}]、バッファポジション
[{2}]で出力をフラッシュ、writeInProgress [{3}]、クローズ [{4}]
-stream.recycle=Connection[{0}]、Stream[{1}]はリサイクルされました
stream.reset.fail=コネクション [{0}]、ストリーム [{1}]、ストリームをリセットできません。
stream.reset.receive=コネクション [{0}]、ストリーム [{1}]、[{2}] のために受信されたリセット
stream.reset.send=コネクション [{0}]、ストリーム [{1}]、[{2}] が原因で RESET を送信しました。
diff --git a/java/org/apache/tomcat/util/http/LocalStrings_ja.properties
b/java/org/apache/tomcat/util/http/LocalStrings_ja.properties
index 6b7c72f56d..9cbcd1e844 100644
--- a/java/org/apache/tomcat/util/http/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/http/LocalStrings_ja.properties
@@ -23,6 +23,8 @@ cookies.invalidSameSiteCookies=不明な設定 [{0}] は、次のうちのいず
cookies.invalidSpecial=Cookies: 不明な特別な Cookie
cookies.maxCountFail=最大数[{0}]以上のクッキーが検出されました。
+cookiesWithoutEquals.invalid=値 [{0}] は認識されません
+
headers.maxCountFail=検出したヘッダー数 [{0}] は上限値を越えています。
parameters.bytes=入力[{0}]で処理を開始します。
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_ja.properties
b/java/org/apache/tomcat/websocket/LocalStrings_ja.properties
index c2b534eab4..00b13cb9a8 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_ja.properties
@@ -119,6 +119,7 @@ wsSession.instanceCreateFailed=エンドポイントインスタンスの作成
wsSession.instanceNew=エンドポイントインスタンスの登録に失敗しました。
wsSession.invalidHandlerTypePong=pongメッセージハンドラはMessageHandler.Wholeを実装する必要があります。
wsSession.messageFailed=WebSocket コネクションが切断されているため、完了メッセージを送信できません
+wsSession.onClose.entry=状態 [{2}] のWebSocketセッション [{1}] で理由 [{0}] のクローズ
メッセージを受信しました
wsSession.removeHandlerFailed=セッションに登録されていないためハンドラー [{0}] を解除できません。
wsSession.sendCloseFail=セッション [{0}] のクローズメッセージをリモートエンドポイントに送信できませんでした
wsSession.timeout=WebSocket セッション [{0}] タイムアウトが切れました
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8bb2a57aeb..e25cf8cf53 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -226,6 +226,9 @@
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 10.1.x updated: Improvements to French translations. (remm)
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 206518f9a1 Improvements to French translations. (remm)
206518f9a1 is described below
commit 206518f9a1db2b188526694417d4eab7a0b142fd
Author: Mark Thomas
AuthorDate: Wed Oct 2 15:23:45 2024 +0100
Improvements to French translations. (remm)
---
.../catalina/manager/LocalStrings_fr.properties| 64 +++---
.../manager/host/LocalStrings_fr.properties| 50 -
java/org/apache/coyote/LocalStrings_fr.properties | 1 -
.../apache/coyote/http2/LocalStrings_fr.properties | 1 -
.../tomcat/websocket/LocalStrings_fr.properties| 1 +
webapps/docs/changelog.xml | 3 +
6 files changed, 61 insertions(+), 59 deletions(-)
diff --git a/java/org/apache/catalina/manager/LocalStrings_fr.properties
b/java/org/apache/catalina/manager/LocalStrings_fr.properties
index b77cd902c7..bf2afade83 100644
--- a/java/org/apache/catalina/manager/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_fr.properties
@@ -48,7 +48,7 @@ htmlManagerServlet.connectorStateTableTitleClientForw=Client
(Forwardé)
htmlManagerServlet.connectorStateTableTitleRequest=Requête
htmlManagerServlet.connectorStateTableTitleStage=Etape
htmlManagerServlet.connectorStateTableTitleTime=Temps
-htmlManagerServlet.connectorStateTableTitleVHost=Hôte virtuel (VHost)
+htmlManagerServlet.connectorStateTableTitleVHost=Hôte virtuel
htmlManagerServlet.connectorStateThreadBusy=Nombre de threads utilisés :
htmlManagerServlet.connectorStateThreadCount=Nombre de threads actuel :
htmlManagerServlet.deployButton=Deployer
@@ -57,12 +57,12 @@ htmlManagerServlet.deployPath=Chemin de context (requis) :
htmlManagerServlet.deployServer=Emplacement du répertoire ou fichier WAR de
déploiement sur le serveur
htmlManagerServlet.deployTitle=Deployer
htmlManagerServlet.deployUpload=Fichier WAR à déployer
-htmlManagerServlet.deployUploadFail=ECHEC - Téléversement pour déploiement a
échoué, exception : [{0}]
+htmlManagerServlet.deployUploadFail=FAIL - Téléversement pour déploiement a
échoué, exception : [{0}]
htmlManagerServlet.deployUploadFile=Choisir le fichier WAR à téléverser
-htmlManagerServlet.deployUploadInServerXml=ECHEC - Fichier WAR [{0}] ne peut
être téléversé lorsque le contexte est défini dans server.xml
-htmlManagerServlet.deployUploadNoFile=ECHEC - Téléversement a échoué, aucun
fichier
-htmlManagerServlet.deployUploadNotWar=ECHEC - Fichier à téléverser, [{0}],
doit être un .war
-htmlManagerServlet.deployUploadWarExists=ECHEC - Fichier War [{0}] déjà
existant sur le serveur
+htmlManagerServlet.deployUploadInServerXml=FAIL - Fichier WAR [{0}] ne peut
être envoyé lorsque le contexte est défini dans server.xml
+htmlManagerServlet.deployUploadNoFile=FAIL - L'envoi du fichier a échoué,
aucun fichier
+htmlManagerServlet.deployUploadNotWar=FAIL - Le fichier envoyé [{0}] doit être
un .war
+htmlManagerServlet.deployUploadWarExists=FAIL - Fichier War [{0}] déjà
existant sur le serveur
htmlManagerServlet.deployVersion=Version (pour les déploiements en parallèle) :
htmlManagerServlet.deployWar=URL vers WAR ou répertoire :
htmlManagerServlet.diagnosticsLeak=Vérifiez si une application web a causé une
fuite de mémoire lors de son arrêt, rechargement ou déchargement
@@ -121,13 +121,13 @@ htmlManagerServlet.title=Gestionnaire d'applications WEB
Tomcat
jmxProxyServlet.noBeanFound=Impossible de trouver de MBean avec le nom
d''objet [{0}]
jmxProxyServlet.noOperationOnBean=Impossible de trouver l''opération [{0}]
avec [{1}] arguments sur le nom d''objet [{2}], qui est un [{3}]
-managerServlet.alreadyContext=ECHEC - l''application existe déjà dans le
chemin [{0}]
+managerServlet.alreadyContext=FAIL - l''application existe déjà dans le chemin
[{0}]
managerServlet.certsNotAvailable=L'information sur les certificats ne peut pas
être obtenu de ce connecteur au cours de son exécution
managerServlet.copyError=Impossible de copier le fichier de configuration à
partir du chemin [{0}]
-managerServlet.deleteFail=ECHEC - Impossible de supprimer [{0}], ce qui
pourrait causer des problèmes
-managerServlet.deployFailed=ECHEC - Echec au déploiement de l''application
pour le chemin de contexte [{0}]
+managerServlet.deleteFail=FAIL - Impossible de supprimer [{0}], ce qui
pourrait causer des problèmes
+managerServlet.deployFailed=FAIL - Echec au déploiement de l''application pour
le chemin de contexte [{0}]
managerServlet.deployed=OK - Application déployée pour le chemin de contexte
[{0}]
-managerServlet.deployedButNotStarted=ECHEC - Application déployée pour le
chemin de contexte [{0}] mais le démarrage du contexte a échoué
+managerServ
(tomcat) branch 11.0.x updated: Improvements to Chinese translations by Ch_jp
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 7b01ab71c4 Improvements to Chinese translations by Ch_jp
7b01ab71c4 is described below
commit 7b01ab71c4ea2b59885ff4f5fd00d5b17dce302a
Author: Mark Thomas
AuthorDate: Wed Oct 2 15:11:47 2024 +0100
Improvements to Chinese translations by Ch_jp
---
java/jakarta/el/LocalStrings_zh_CN.properties | 8
java/jakarta/servlet/LocalStrings_zh_CN.properties | 2 +-
java/jakarta/servlet/http/LocalStrings_zh_CN.properties| 2 +-
java/org/apache/catalina/core/LocalStrings_zh_CN.properties| 10 +-
java/org/apache/catalina/deploy/LocalStrings_zh_CN.properties | 2 +-
java/org/apache/coyote/LocalStrings_zh_CN.properties | 4 ++--
.../apache/coyote/http11/filters/LocalStrings_zh_CN.properties | 10 +-
java/org/apache/coyote/http2/LocalStrings_zh_CN.properties | 1 -
webapps/docs/changelog.xml | 6 +-
9 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/java/jakarta/el/LocalStrings_zh_CN.properties
b/java/jakarta/el/LocalStrings_zh_CN.properties
index 3a12ce1b29..267a7e89cd 100644
--- a/java/jakarta/el/LocalStrings_zh_CN.properties
+++ b/java/jakarta/el/LocalStrings_zh_CN.properties
@@ -32,16 +32,16 @@ expressionFactory.readFailed=未能读取 [{0}]
importHandler.ambiguousImport=未能导入类 [{0}]，因为它和已导入的 [{1}] 冲突
importHandler.ambiguousStaticImport=未能处理静态导入 [{0}]，因为它和已导入的 [{1}] 冲突
importHandler.classNotFound=未能导入类 [{0}]，因为找不到该类
-importHandler.invalidClass=在导出的包中（对于 Java 9+），类 [{0}] 必须是公用的，非抽象并且非接口
+importHandler.invalidClass=类[{0}]必须是公共的、非抽象的、非接口，且在导出包中（对于Java 9+）
importHandler.invalidClassName=要导入的类的名称 [{0}] 必须包含软件包
importHandler.invalidClassNameForStatic=为静态导入 [{1}] 指定的类 [{0}] 无效
importHandler.invalidStaticName=要导入的静态方法或字段的名称 [{0}] 必须包含类
importHandler.staticNotFound=在导入 [{2}] 的类 [{1}] 中找不到静态导入 [{0}]
-lambdaExpression.tooFewArgs=对于至少需要 [{1}] 的 lambda 表达式，仅提供了 [{0}] 个自变量
+lambdaExpression.tooFewArgs=对于至少需要 [{1}] 个参数的 lambda 表达式，仅提供了 [{0}] 个参数
-objectNotAssignable=无法将类型为 [{0}] 的对象添加到类型为 [{1}] 的对象阵列
-propertyNotFound=在类型 [{0}] 上未找到属性 [{1}]
+objectNotAssignable=无法将类型为 [{0}] 的对象添加到类型为 [{1}] 的对象数组
+propertyNotFound=属性 [{1}] 在类型 [{0}] 上不存在
propertyNotReadable=属性 [{1}] 在类型 [{0}] 上不可读
propertyNotWritable=属性 [{1}] 在类型 [{0}] 上不可写
propertyReadError=在类型 [{0}] 上读取 [{1}] 时出错
diff --git a/java/jakarta/servlet/LocalStrings_zh_CN.properties
b/java/jakarta/servlet/LocalStrings_zh_CN.properties
index 6598f10035..32a05cd2cd 100644
--- a/java/jakarta/servlet/LocalStrings_zh_CN.properties
+++ b/java/jakarta/servlet/LocalStrings_zh_CN.properties
@@ -20,7 +20,7 @@ err.not_iso8859_1=不是ISO 8859-1字符：[{0}]
httpConstraintElement.invalidRolesDeny=使用 DENY 时可能未指定角色
-httpMethodConstraintElement.invalidMethod=无效的HTTP.方法
+httpMethodConstraintElement.invalidMethod=无效的HTTP方法
value.false=否
value.true=true
diff --git a/java/jakarta/servlet/http/LocalStrings_zh_CN.properties
b/java/jakarta/servlet/http/LocalStrings_zh_CN.properties
index 7492ccd46a..f98ead3878 100644
--- a/java/jakarta/servlet/http/LocalStrings_zh_CN.properties
+++ b/java/jakarta/servlet/http/LocalStrings_zh_CN.properties
@@ -19,7 +19,7 @@
cookie.attribute.invalidName.notToken=Cookie属性名[{0}]无效,因为它不是令牌
cookie.attribute.invalidName.null=Cookie属性名称不能为空
-err.cookie_name_blank=Cookie名称不能为null或零长度
+err.cookie_name_blank=Cookie名称不能为空
err.cookie_name_is_token=Cookie name[{0}]是一个保留令牌
err.io.indexOutOfBounds=为大小为[{2}]的数组指定的偏移量[{0}]和/或长度[{1}]无效。
err.io.nullArray=Null在write方法中传递给字节数组
diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
index 69e59a73b0..c6d9077aa5 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -192,8 +192,8 @@ standardContext.filterStart=启动过滤器异常[{0}]
standardContext.invalidWrapperClass=[{0}] 不是StandardWrapper的子类
standardContext.isUnavailable=此应用程序目前不可用
standardContext.listenerFail=一个或多个listeners启动失败，更多详细信息查看对应的容器日志文件
-standardContext.listenerStart=异常将上下文初始化事件发送到类的侦听器实例.[{0}]
-standardContext.listenerStop=例外情况发送上下文删除事件[{0}]，以便列表实例
+standardContext.listenerStart=发送上下文初始化事件到类的侦听器实例 [{0}] 时出现异常
+standardContext.listenerStop=发送上下文销毁事件到类的侦听器实例 [{0}] 时出现异常
standardContext.loadOnStartup.loadException=web应用程序[{0}]中的Servlet[{1}]引发了load（）异常
standardContext.loginConfig.errorPage=表单错误页[{0}]必须以"/"开始
standardContext.loginConfig.errorWarning=警告：Servlet 2.4中，表单错误页[{0}]必须以"/"开始
@@ -256,9 +256,9 @@ standardHostValve.customStatusFailed=无法正确调度自定义错误页[{0}]
standardPipeline.basic.start=启动新基本阀时出错
standardPipeline.basic.stop=停止旧基本阀时出错
-standardPipeline.valve.destroy=破坏阀门错误
-standardPipeli
(tomcat) branch 11.0.x updated: Removed unused translation
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 7354ed05d8 Removed unused translation
7354ed05d8 is described below
commit 7354ed05d8f74c28cb53345f9590b920593126bd
Author: Mark Thomas
AuthorDate: Wed Oct 2 15:10:50 2024 +0100
Removed unused translation
---
java/org/apache/coyote/http2/LocalStrings_ko.properties | 1 -
1 file changed, 1 deletion(-)
diff --git a/java/org/apache/coyote/http2/LocalStrings_ko.properties
b/java/org/apache/coyote/http2/LocalStrings_ko.properties
index 56f8b900e5..f7f08c550a 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ko.properties
@@ -108,7 +108,6 @@ stream.inputBuffer.signal=읽기 쓰레드가 대기하는 동안 inBuffer에
stream.inputBuffer.swallowUnread=이전에 읽어 입력 스트림 버퍼에 넣어진 [{0}] 바이트들을 무시합니다.
stream.notWritable=연결 [{0}], 스트림 [{1}], 이 스트림은 쓰기 가능하지 않습니다.
stream.outputBuffer.flush.debug=연결 [{0}], 스트림 [{1}], 위치 [{2}]의 버퍼를 출력으로 배출합니다.
쓰기 진행 중 여부: [{3}],닫힘 여부: [{4}]
-stream.recycle=연결 [{0}], 스트림 [{1}]이(가) 참조 해제되었습니다.
stream.reset.fail=연결 [{0}], 스트림 [{1}], 스트림을 재설정(reset)하지 못했습니다.
stream.reset.receive=연결 [{0}], 스트림 [{1}], [{2}](으)로 인해 재설정(reset)을 받았습니다.
stream.reset.send=연결 [{0}], 스트림 [{1}], [{2}](으)로 인하여 재설정(reset)이 전송되었음.
-
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: Improvements to Japanese translations by tak7iji
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 595753a482 Improvements to Japanese translations by tak7iji
595753a482 is described below
commit 595753a4823f8741565ea7bf94321bfa5a8308ad
Author: Mark Thomas
AuthorDate: Wed Oct 2 15:10:33 2024 +0100
Improvements to Japanese translations by tak7iji
---
java/org/apache/catalina/connector/LocalStrings_ja.properties| 1 +
java/org/apache/coyote/http2/LocalStrings_ja.properties | 1 -
java/org/apache/tomcat/util/http/LocalStrings_ja.properties | 2 ++
java/org/apache/tomcat/websocket/LocalStrings_ja.properties | 1 +
java/org/apache/tomcat/websocket/pojo/LocalStrings_ja.properties | 2 ++
webapps/docs/changelog.xml | 4 +++-
6 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/connector/LocalStrings_ja.properties
b/java/org/apache/catalina/connector/LocalStrings_ja.properties
index eaaec4430d..9e15531e5d 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_ja.properties
@@ -86,6 +86,7 @@ coyoteResponse.setBufferSize.ise=データが既に書き込まれた後でバ
inputBuffer.requiresNonBlocking=ノンブロッキングモードでは利用できません。
inputBuffer.streamClosed=ストリームはクローズしています
+outputBuffer.closed=レスポンスが閉じられた後は書き込めません
outputBuffer.writeNull=write(String, int, int) メソッドの String 型の引数に null
を指定できません。
request.asyncNotSupported=現在のチェーンのフィルタまたはサーブレットは非同期操作をサポートしていません。
diff --git a/java/org/apache/coyote/http2/LocalStrings_ja.properties
b/java/org/apache/coyote/http2/LocalStrings_ja.properties
index d27d89586c..5a48dc9015 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ja.properties
@@ -111,7 +111,6 @@ stream.inputBuffer.signal=読み込みスレッドが待機している間に in
stream.inputBuffer.swallowUnread=以前に入力ストリームバッファに読み込まれた [{0}] バイトを飲み込ます
stream.notWritable=コネクション [{0}]、ストリーム [{1}]、このストリームには書き込みできません。
stream.outputBuffer.flush.debug=コネクション [{0}]、ストリーム [{1}]、バッファポジション
[{2}]で出力をフラッシュ、writeInProgress [{3}]、クローズ [{4}]
-stream.recycle=Connection[{0}]、Stream[{1}]はリサイクルされました
stream.reset.fail=コネクション [{0}]、ストリーム [{1}]、ストリームをリセットできません。
stream.reset.receive=コネクション [{0}]、ストリーム [{1}]、[{2}] のために受信されたリセット
stream.reset.send=コネクション [{0}]、ストリーム [{1}]、[{2}] が原因で RESET を送信しました。
diff --git a/java/org/apache/tomcat/util/http/LocalStrings_ja.properties
b/java/org/apache/tomcat/util/http/LocalStrings_ja.properties
index f5b6e8c01e..2341f842d7 100644
--- a/java/org/apache/tomcat/util/http/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/http/LocalStrings_ja.properties
@@ -23,6 +23,8 @@ cookies.invalidSameSiteCookies=不明な設定 [{0}] は、次のうちのいず
cookies.invalidSpecial=Cookies: 不明な特別な Cookie
cookies.maxCountFail=最大数[{0}]以上のクッキーが検出されました。
+cookiesWithoutEquals.invalid=値 [{0}] は認識されません
+
headers.maxCountFail=検出したヘッダー数 [{0}] は上限値を越えています。
parameters.bytes=入力[{0}]で処理を開始します。
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_ja.properties
b/java/org/apache/tomcat/websocket/LocalStrings_ja.properties
index 9504636ff5..56c76c1880 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_ja.properties
@@ -121,6 +121,7 @@ wsSession.instanceCreateFailed=エンドポイントインスタンスの作成
wsSession.instanceNew=エンドポイントインスタンスの登録に失敗しました。
wsSession.invalidHandlerTypePong=pongメッセージハンドラはMessageHandler.Wholeを実装する必要があります。
wsSession.messageFailed=WebSocket コネクションが切断されているため、完了メッセージを送信できません
+wsSession.onClose.entry=状態 [{2}] のWebSocketセッション [{1}] で理由 [{0}] のクローズ
メッセージを受信しました
wsSession.removeHandlerFailed=セッションに登録されていないためハンドラー [{0}] を解除できません。
wsSession.sendCloseFail=セッション [{0}] のクローズメッセージをリモートエンドポイントに送信できませんでした
wsSession.timeout=WebSocket セッション [{0}] タイムアウトが切れました
diff --git a/java/org/apache/tomcat/websocket/pojo/LocalStrings_ja.properties
b/java/org/apache/tomcat/websocket/pojo/LocalStrings_ja.properties
index 17e7e33e52..d520e8c436 100644
--- a/java/org/apache/tomcat/websocket/pojo/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/websocket/pojo/LocalStrings_ja.properties
@@ -22,6 +22,8 @@ pojoEndpointBase.onError=[{0}]に対してエラー処理が構成されてお
pojoEndpointBase.onErrorFail=タイプ [{0}]
のPOJOのPOJOエンドポイントのonErrorメソッドの呼び出しに失敗しました
pojoEndpointBase.onOpenFail=タイプ [{0}] のPOJOのPOJOエンドポイントのonOpenメソッドの呼び出しに失敗しました
+pojoMessageHandlerBase.onMessafeFail=WebSocketセッション [{1}] に含まれるタイプ [{0}] の
POJO に対する onMessage 呼び出し中に例外が発生しました
+
pojoMessageHandlerWhole.decodeIoFail=メッセージの復号中に入出力エラーが発生しました。
pojoMessageHandlerWhole.maxBufferSize=この実装で対応可能なメッセージサイズの上限値は
Integer.MAX_VALUE です。
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f2623312b5..43cb5141bf 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -228,7
(tomcat) branch 11.0.x updated: Update French translations (remm)
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 ab64878f20 Update French translations (remm)
ab64878f20 is described below
commit ab64878f20beea24c239e70948c8bbcebd7a48cf
Author: Mark Thomas
AuthorDate: Wed Oct 2 15:10:05 2024 +0100
Update French translations (remm)
---
.../catalina/connector/LocalStrings_fr.properties | 1 +
.../catalina/manager/LocalStrings_fr.properties| 64 +++---
.../manager/host/LocalStrings_fr.properties| 50 -
.../apache/coyote/http2/LocalStrings_fr.properties | 1 -
.../tomcat/websocket/LocalStrings_fr.properties| 1 +
.../websocket/pojo/LocalStrings_fr.properties | 2 +
webapps/docs/changelog.xml | 5 +-
7 files changed, 65 insertions(+), 59 deletions(-)
diff --git a/java/org/apache/catalina/connector/LocalStrings_fr.properties
b/java/org/apache/catalina/connector/LocalStrings_fr.properties
index 1d080d4ec9..ac71a6156c 100644
--- a/java/org/apache/catalina/connector/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_fr.properties
@@ -86,6 +86,7 @@ coyoteResponse.setBufferSize.ise=Impossible de changer la
taille du tampon aprè
inputBuffer.requiresNonBlocking=Pas disponible en mode non bloquant
inputBuffer.streamClosed=Le flux a été fermé
+outputBuffer.closed=La réponse ne peut pas être écrite après qu'elle ait été
fermée
outputBuffer.writeNull=L'argument String dans write(String, int, int) ne doit
pas être null
request.asyncNotSupported=Un filtre ou un Servlet de la chaîne actuelle ne
supporte pas le mode asynchrone
diff --git a/java/org/apache/catalina/manager/LocalStrings_fr.properties
b/java/org/apache/catalina/manager/LocalStrings_fr.properties
index b77cd902c7..bf2afade83 100644
--- a/java/org/apache/catalina/manager/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_fr.properties
@@ -48,7 +48,7 @@ htmlManagerServlet.connectorStateTableTitleClientForw=Client
(Forwardé)
htmlManagerServlet.connectorStateTableTitleRequest=Requête
htmlManagerServlet.connectorStateTableTitleStage=Etape
htmlManagerServlet.connectorStateTableTitleTime=Temps
-htmlManagerServlet.connectorStateTableTitleVHost=Hôte virtuel (VHost)
+htmlManagerServlet.connectorStateTableTitleVHost=Hôte virtuel
htmlManagerServlet.connectorStateThreadBusy=Nombre de threads utilisés :
htmlManagerServlet.connectorStateThreadCount=Nombre de threads actuel :
htmlManagerServlet.deployButton=Deployer
@@ -57,12 +57,12 @@ htmlManagerServlet.deployPath=Chemin de context (requis) :
htmlManagerServlet.deployServer=Emplacement du répertoire ou fichier WAR de
déploiement sur le serveur
htmlManagerServlet.deployTitle=Deployer
htmlManagerServlet.deployUpload=Fichier WAR à déployer
-htmlManagerServlet.deployUploadFail=ECHEC - Téléversement pour déploiement a
échoué, exception : [{0}]
+htmlManagerServlet.deployUploadFail=FAIL - Téléversement pour déploiement a
échoué, exception : [{0}]
htmlManagerServlet.deployUploadFile=Choisir le fichier WAR à téléverser
-htmlManagerServlet.deployUploadInServerXml=ECHEC - Fichier WAR [{0}] ne peut
être téléversé lorsque le contexte est défini dans server.xml
-htmlManagerServlet.deployUploadNoFile=ECHEC - Téléversement a échoué, aucun
fichier
-htmlManagerServlet.deployUploadNotWar=ECHEC - Fichier à téléverser, [{0}],
doit être un .war
-htmlManagerServlet.deployUploadWarExists=ECHEC - Fichier War [{0}] déjà
existant sur le serveur
+htmlManagerServlet.deployUploadInServerXml=FAIL - Fichier WAR [{0}] ne peut
être envoyé lorsque le contexte est défini dans server.xml
+htmlManagerServlet.deployUploadNoFile=FAIL - L'envoi du fichier a échoué,
aucun fichier
+htmlManagerServlet.deployUploadNotWar=FAIL - Le fichier envoyé [{0}] doit être
un .war
+htmlManagerServlet.deployUploadWarExists=FAIL - Fichier War [{0}] déjà
existant sur le serveur
htmlManagerServlet.deployVersion=Version (pour les déploiements en parallèle) :
htmlManagerServlet.deployWar=URL vers WAR ou répertoire :
htmlManagerServlet.diagnosticsLeak=Vérifiez si une application web a causé une
fuite de mémoire lors de son arrêt, rechargement ou déchargement
@@ -121,13 +121,13 @@ htmlManagerServlet.title=Gestionnaire d'applications WEB
Tomcat
jmxProxyServlet.noBeanFound=Impossible de trouver de MBean avec le nom
d''objet [{0}]
jmxProxyServlet.noOperationOnBean=Impossible de trouver l''opération [{0}]
avec [{1}] arguments sur le nom d''objet [{2}], qui est un [{3}]
-managerServlet.alreadyContext=ECHEC - l''application existe déjà dans le
chemin [{0}]
+managerServlet.alreadyContext=FAIL - l''application existe déjà dans le chemin
[{0}]
managerServlet.certsNotAvailable=L'information su
(tomcat) branch 11.0.x updated: Remove. Only need Export in main.
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 73924b9937 Remove. Only need Export in main.
73924b9937 is described below
commit 73924b9937ce1f9daf2bed1a4ea83db35d39e498
Author: Mark Thomas
AuthorDate: Wed Oct 2 15:08:58 2024 +0100
Remove. Only need Export in main.
---
.../apache/tomcat/buildutil/translate/Export.java | 56 --
1 file changed, 56 deletions(-)
diff --git a/java/org/apache/tomcat/buildutil/translate/Export.java
b/java/org/apache/tomcat/buildutil/translate/Export.java
deleted file mode 100644
index 9c137490e6..00
--- a/java/org/apache/tomcat/buildutil/translate/Export.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.tomcat.buildutil.translate;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-/**
- * Generates a single properties file per language for import into a
translation
- * tool.
- */
-public class Export {
-
-private static final Map translations = new HashMap<>();
-
-public static void main(String... args) throws IOException {
-File root = new File(".");
-for (String dir : Constants.SEARCH_DIRS) {
-File directory = new File(dir);
-Utils.processDirectory(root, directory, translations);
-}
-
-outputTranslations();
-}
-
-
-private static void outputTranslations() {
-
-File storageDir = new File(Constants.STORAGE_DIR);
-if (!storageDir.exists()) {
-storageDir.mkdirs();
-}
-
-for (Map.Entry translationEntry :
translations.entrySet()) {
- Utils.export(translationEntry.getKey(),
translationEntry.getValue(), storageDir);
-}
-}
-}
-
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 03/03: Update Chinese translations (Ch_jp)
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 b446e2b121151b3889fcbf0d8c16a92282b117ce
Author: Mark Thomas
AuthorDate: Wed Oct 2 14:58:30 2024 +0100
Update Chinese translations (Ch_jp)
---
java/jakarta/el/LocalStrings_zh_CN.properties | 8
java/jakarta/servlet/LocalStrings_zh_CN.properties | 2 +-
java/jakarta/servlet/http/LocalStrings_zh_CN.properties| 2 +-
java/org/apache/catalina/core/LocalStrings_zh_CN.properties| 10 +-
java/org/apache/catalina/deploy/LocalStrings_zh_CN.properties | 2 +-
java/org/apache/coyote/LocalStrings_zh_CN.properties | 4 ++--
.../apache/coyote/http11/filters/LocalStrings_zh_CN.properties | 10 +-
java/org/apache/coyote/http2/LocalStrings_zh_CN.properties | 1 -
8 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/java/jakarta/el/LocalStrings_zh_CN.properties
b/java/jakarta/el/LocalStrings_zh_CN.properties
index 3a12ce1b29..267a7e89cd 100644
--- a/java/jakarta/el/LocalStrings_zh_CN.properties
+++ b/java/jakarta/el/LocalStrings_zh_CN.properties
@@ -32,16 +32,16 @@ expressionFactory.readFailed=未能读取 [{0}]
importHandler.ambiguousImport=未能导入类 [{0}]，因为它和已导入的 [{1}] 冲突
importHandler.ambiguousStaticImport=未能处理静态导入 [{0}]，因为它和已导入的 [{1}] 冲突
importHandler.classNotFound=未能导入类 [{0}]，因为找不到该类
-importHandler.invalidClass=在导出的包中（对于 Java 9+），类 [{0}] 必须是公用的，非抽象并且非接口
+importHandler.invalidClass=类[{0}]必须是公共的、非抽象的、非接口，且在导出包中（对于Java 9+）
importHandler.invalidClassName=要导入的类的名称 [{0}] 必须包含软件包
importHandler.invalidClassNameForStatic=为静态导入 [{1}] 指定的类 [{0}] 无效
importHandler.invalidStaticName=要导入的静态方法或字段的名称 [{0}] 必须包含类
importHandler.staticNotFound=在导入 [{2}] 的类 [{1}] 中找不到静态导入 [{0}]
-lambdaExpression.tooFewArgs=对于至少需要 [{1}] 的 lambda 表达式，仅提供了 [{0}] 个自变量
+lambdaExpression.tooFewArgs=对于至少需要 [{1}] 个参数的 lambda 表达式，仅提供了 [{0}] 个参数
-objectNotAssignable=无法将类型为 [{0}] 的对象添加到类型为 [{1}] 的对象阵列
-propertyNotFound=在类型 [{0}] 上未找到属性 [{1}]
+objectNotAssignable=无法将类型为 [{0}] 的对象添加到类型为 [{1}] 的对象数组
+propertyNotFound=属性 [{1}] 在类型 [{0}] 上不存在
propertyNotReadable=属性 [{1}] 在类型 [{0}] 上不可读
propertyNotWritable=属性 [{1}] 在类型 [{0}] 上不可写
propertyReadError=在类型 [{0}] 上读取 [{1}] 时出错
diff --git a/java/jakarta/servlet/LocalStrings_zh_CN.properties
b/java/jakarta/servlet/LocalStrings_zh_CN.properties
index 6598f10035..32a05cd2cd 100644
--- a/java/jakarta/servlet/LocalStrings_zh_CN.properties
+++ b/java/jakarta/servlet/LocalStrings_zh_CN.properties
@@ -20,7 +20,7 @@ err.not_iso8859_1=不是ISO 8859-1字符：[{0}]
httpConstraintElement.invalidRolesDeny=使用 DENY 时可能未指定角色
-httpMethodConstraintElement.invalidMethod=无效的HTTP.方法
+httpMethodConstraintElement.invalidMethod=无效的HTTP方法
value.false=否
value.true=true
diff --git a/java/jakarta/servlet/http/LocalStrings_zh_CN.properties
b/java/jakarta/servlet/http/LocalStrings_zh_CN.properties
index 7492ccd46a..f98ead3878 100644
--- a/java/jakarta/servlet/http/LocalStrings_zh_CN.properties
+++ b/java/jakarta/servlet/http/LocalStrings_zh_CN.properties
@@ -19,7 +19,7 @@
cookie.attribute.invalidName.notToken=Cookie属性名[{0}]无效,因为它不是令牌
cookie.attribute.invalidName.null=Cookie属性名称不能为空
-err.cookie_name_blank=Cookie名称不能为null或零长度
+err.cookie_name_blank=Cookie名称不能为空
err.cookie_name_is_token=Cookie name[{0}]是一个保留令牌
err.io.indexOutOfBounds=为大小为[{2}]的数组指定的偏移量[{0}]和/或长度[{1}]无效。
err.io.nullArray=Null在write方法中传递给字节数组
diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
index 69e59a73b0..c6d9077aa5 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -192,8 +192,8 @@ standardContext.filterStart=启动过滤器异常[{0}]
standardContext.invalidWrapperClass=[{0}] 不是StandardWrapper的子类
standardContext.isUnavailable=此应用程序目前不可用
standardContext.listenerFail=一个或多个listeners启动失败，更多详细信息查看对应的容器日志文件
-standardContext.listenerStart=异常将上下文初始化事件发送到类的侦听器实例.[{0}]
-standardContext.listenerStop=例外情况发送上下文删除事件[{0}]，以便列表实例
+standardContext.listenerStart=发送上下文初始化事件到类的侦听器实例 [{0}] 时出现异常
+standardContext.listenerStop=发送上下文销毁事件到类的侦听器实例 [{0}] 时出现异常
standardContext.loadOnStartup.loadException=web应用程序[{0}]中的Servlet[{1}]引发了load（）异常
standardContext.loginConfig.errorPage=表单错误页[{0}]必须以"/"开始
standardContext.loginConfig.errorWarning=警告：Servlet 2.4中，表单错误页[{0}]必须以"/"开始
@@ -256,9 +256,9 @@ standardHostValve.customStatusFailed=无法正确调度自定义错误页[{0}]
standardPipeline.basic.start=启动新基本阀时出错
standardPipeline.basic.stop=停止旧基本阀时出错
-standardPipeline.valve.destroy=破坏阀门错误
-standardPipeline.valve.start=错误启动阀
-standardPipeline.valve.stop=错误截止阀
+standardPipeline.valve.destroy=销毁阀时出错
+standardPipeline.valve.start=启动阀时出错
+standardPipeline.valve.stop=停止阀时出错
standardServer.accept.error=尝试在侦听shutdown命令的套接字上接受IO异常
standardServer.accept.readError=尝试读取关机命令
(tomcat) 01/03: Update Japanese translations (tak7iji)
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 07e85517c675d4129689bc170001efa8fde3ed5a
Author: Mark Thomas
AuthorDate: Wed Oct 2 14:57:17 2024 +0100
Update Japanese translations (tak7iji)
---
java/org/apache/catalina/connector/LocalStrings_ja.properties| 1 +
java/org/apache/coyote/http2/LocalStrings_ja.properties | 1 -
java/org/apache/tomcat/util/http/LocalStrings_ja.properties | 2 ++
java/org/apache/tomcat/websocket/LocalStrings_ja.properties | 1 +
java/org/apache/tomcat/websocket/pojo/LocalStrings_ja.properties | 2 ++
5 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/connector/LocalStrings_ja.properties
b/java/org/apache/catalina/connector/LocalStrings_ja.properties
index eaaec4430d..9e15531e5d 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_ja.properties
@@ -86,6 +86,7 @@ coyoteResponse.setBufferSize.ise=データが既に書き込まれた後でバ
inputBuffer.requiresNonBlocking=ノンブロッキングモードでは利用できません。
inputBuffer.streamClosed=ストリームはクローズしています
+outputBuffer.closed=レスポンスが閉じられた後は書き込めません
outputBuffer.writeNull=write(String, int, int) メソッドの String 型の引数に null
を指定できません。
request.asyncNotSupported=現在のチェーンのフィルタまたはサーブレットは非同期操作をサポートしていません。
diff --git a/java/org/apache/coyote/http2/LocalStrings_ja.properties
b/java/org/apache/coyote/http2/LocalStrings_ja.properties
index d27d89586c..5a48dc9015 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ja.properties
@@ -111,7 +111,6 @@ stream.inputBuffer.signal=読み込みスレッドが待機している間に in
stream.inputBuffer.swallowUnread=以前に入力ストリームバッファに読み込まれた [{0}] バイトを飲み込ます
stream.notWritable=コネクション [{0}]、ストリーム [{1}]、このストリームには書き込みできません。
stream.outputBuffer.flush.debug=コネクション [{0}]、ストリーム [{1}]、バッファポジション
[{2}]で出力をフラッシュ、writeInProgress [{3}]、クローズ [{4}]
-stream.recycle=Connection[{0}]、Stream[{1}]はリサイクルされました
stream.reset.fail=コネクション [{0}]、ストリーム [{1}]、ストリームをリセットできません。
stream.reset.receive=コネクション [{0}]、ストリーム [{1}]、[{2}] のために受信されたリセット
stream.reset.send=コネクション [{0}]、ストリーム [{1}]、[{2}] が原因で RESET を送信しました。
diff --git a/java/org/apache/tomcat/util/http/LocalStrings_ja.properties
b/java/org/apache/tomcat/util/http/LocalStrings_ja.properties
index f5b6e8c01e..2341f842d7 100644
--- a/java/org/apache/tomcat/util/http/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/http/LocalStrings_ja.properties
@@ -23,6 +23,8 @@ cookies.invalidSameSiteCookies=不明な設定 [{0}] は、次のうちのいず
cookies.invalidSpecial=Cookies: 不明な特別な Cookie
cookies.maxCountFail=最大数[{0}]以上のクッキーが検出されました。
+cookiesWithoutEquals.invalid=値 [{0}] は認識されません
+
headers.maxCountFail=検出したヘッダー数 [{0}] は上限値を越えています。
parameters.bytes=入力[{0}]で処理を開始します。
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_ja.properties
b/java/org/apache/tomcat/websocket/LocalStrings_ja.properties
index 9504636ff5..56c76c1880 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_ja.properties
@@ -121,6 +121,7 @@ wsSession.instanceCreateFailed=エンドポイントインスタンスの作成
wsSession.instanceNew=エンドポイントインスタンスの登録に失敗しました。
wsSession.invalidHandlerTypePong=pongメッセージハンドラはMessageHandler.Wholeを実装する必要があります。
wsSession.messageFailed=WebSocket コネクションが切断されているため、完了メッセージを送信できません
+wsSession.onClose.entry=状態 [{2}] のWebSocketセッション [{1}] で理由 [{0}] のクローズ
メッセージを受信しました
wsSession.removeHandlerFailed=セッションに登録されていないためハンドラー [{0}] を解除できません。
wsSession.sendCloseFail=セッション [{0}] のクローズメッセージをリモートエンドポイントに送信できませんでした
wsSession.timeout=WebSocket セッション [{0}] タイムアウトが切れました
diff --git a/java/org/apache/tomcat/websocket/pojo/LocalStrings_ja.properties
b/java/org/apache/tomcat/websocket/pojo/LocalStrings_ja.properties
index 17e7e33e52..d520e8c436 100644
--- a/java/org/apache/tomcat/websocket/pojo/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/websocket/pojo/LocalStrings_ja.properties
@@ -22,6 +22,8 @@ pojoEndpointBase.onError=[{0}]に対してエラー処理が構成されてお
pojoEndpointBase.onErrorFail=タイプ [{0}]
のPOJOのPOJOエンドポイントのonErrorメソッドの呼び出しに失敗しました
pojoEndpointBase.onOpenFail=タイプ [{0}] のPOJOのPOJOエンドポイントのonOpenメソッドの呼び出しに失敗しました
+pojoMessageHandlerBase.onMessafeFail=WebSocketセッション [{1}] に含まれるタイプ [{0}] の
POJO に対する onMessage 呼び出し中に例外が発生しました
+
pojoMessageHandlerWhole.decodeIoFail=メッセージの復号中に入出力エラーが発生しました。
pojoMessageHandlerWhole.maxBufferSize=この実装で対応可能なメッセージサイズの上限値は
Integer.MAX_VALUE です。
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/03: Remove unused translation
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 27fc32d89904232ab9cf03fecd9648d63312000c
Author: Mark Thomas
AuthorDate: Wed Oct 2 14:57:43 2024 +0100
Remove unused translation
---
java/org/apache/coyote/http2/LocalStrings_ko.properties | 1 -
1 file changed, 1 deletion(-)
diff --git a/java/org/apache/coyote/http2/LocalStrings_ko.properties
b/java/org/apache/coyote/http2/LocalStrings_ko.properties
index 56f8b900e5..f7f08c550a 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ko.properties
@@ -108,7 +108,6 @@ stream.inputBuffer.signal=읽기 쓰레드가 대기하는 동안 inBuffer에
stream.inputBuffer.swallowUnread=이전에 읽어 입력 스트림 버퍼에 넣어진 [{0}] 바이트들을 무시합니다.
stream.notWritable=연결 [{0}], 스트림 [{1}], 이 스트림은 쓰기 가능하지 않습니다.
stream.outputBuffer.flush.debug=연결 [{0}], 스트림 [{1}], 위치 [{2}]의 버퍼를 출력으로 배출합니다.
쓰기 진행 중 여부: [{3}],닫힘 여부: [{4}]
-stream.recycle=연결 [{0}], 스트림 [{1}]이(가) 참조 해제되었습니다.
stream.reset.fail=연결 [{0}], 스트림 [{1}], 스트림을 재설정(reset)하지 못했습니다.
stream.reset.receive=연결 [{0}], 스트림 [{1}], [{2}](으)로 인해 재설정(reset)을 받았습니다.
stream.reset.send=연결 [{0}], 스트림 [{1}], [{2}](으)로 인하여 재설정(reset)이 전송되었음.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated (859bdd6a07 -> b446e2b121)
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 859bdd6a07 Updates to French translations (remm) new 07e85517c6 Update Japanese translations (tak7iji) new 27fc32d899 Remove unused translation new b446e2b121 Update Chinese translations (Ch_jp) The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: java/jakarta/el/LocalStrings_zh_CN.properties | 8 java/jakarta/servlet/LocalStrings_zh_CN.properties | 2 +- java/jakarta/servlet/http/LocalStrings_zh_CN.properties| 2 +- java/org/apache/catalina/connector/LocalStrings_ja.properties | 1 + java/org/apache/catalina/core/LocalStrings_zh_CN.properties| 10 +- java/org/apache/catalina/deploy/LocalStrings_zh_CN.properties | 2 +- java/org/apache/coyote/LocalStrings_zh_CN.properties | 4 ++-- .../apache/coyote/http11/filters/LocalStrings_zh_CN.properties | 10 +- java/org/apache/coyote/http2/LocalStrings_ja.properties| 1 - java/org/apache/coyote/http2/LocalStrings_ko.properties| 1 - java/org/apache/coyote/http2/LocalStrings_zh_CN.properties | 1 - java/org/apache/tomcat/util/http/LocalStrings_ja.properties| 2 ++ java/org/apache/tomcat/websocket/LocalStrings_ja.properties| 1 + .../apache/tomcat/websocket/pojo/LocalStrings_ja.properties| 2 ++ 14 files changed, 25 insertions(+), 22 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Updates to French translations (remm)
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 859bdd6a07 Updates to French translations (remm)
859bdd6a07 is described below
commit 859bdd6a072e8de0a590943aa4b5aaabc9aa526e
Author: Mark Thomas
AuthorDate: Wed Oct 2 14:53:54 2024 +0100
Updates to French translations (remm)
---
.../catalina/connector/LocalStrings_fr.properties | 1 +
.../catalina/manager/LocalStrings_fr.properties| 64 +++---
.../manager/host/LocalStrings_fr.properties| 50 -
.../apache/coyote/http2/LocalStrings_fr.properties | 1 -
.../tomcat/websocket/LocalStrings_fr.properties| 1 +
.../websocket/pojo/LocalStrings_fr.properties | 2 +
6 files changed, 61 insertions(+), 58 deletions(-)
diff --git a/java/org/apache/catalina/connector/LocalStrings_fr.properties
b/java/org/apache/catalina/connector/LocalStrings_fr.properties
index 1d080d4ec9..ac71a6156c 100644
--- a/java/org/apache/catalina/connector/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_fr.properties
@@ -86,6 +86,7 @@ coyoteResponse.setBufferSize.ise=Impossible de changer la
taille du tampon aprè
inputBuffer.requiresNonBlocking=Pas disponible en mode non bloquant
inputBuffer.streamClosed=Le flux a été fermé
+outputBuffer.closed=La réponse ne peut pas être écrite après qu'elle ait été
fermée
outputBuffer.writeNull=L'argument String dans write(String, int, int) ne doit
pas être null
request.asyncNotSupported=Un filtre ou un Servlet de la chaîne actuelle ne
supporte pas le mode asynchrone
diff --git a/java/org/apache/catalina/manager/LocalStrings_fr.properties
b/java/org/apache/catalina/manager/LocalStrings_fr.properties
index b77cd902c7..bf2afade83 100644
--- a/java/org/apache/catalina/manager/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_fr.properties
@@ -48,7 +48,7 @@ htmlManagerServlet.connectorStateTableTitleClientForw=Client
(Forwardé)
htmlManagerServlet.connectorStateTableTitleRequest=Requête
htmlManagerServlet.connectorStateTableTitleStage=Etape
htmlManagerServlet.connectorStateTableTitleTime=Temps
-htmlManagerServlet.connectorStateTableTitleVHost=Hôte virtuel (VHost)
+htmlManagerServlet.connectorStateTableTitleVHost=Hôte virtuel
htmlManagerServlet.connectorStateThreadBusy=Nombre de threads utilisés :
htmlManagerServlet.connectorStateThreadCount=Nombre de threads actuel :
htmlManagerServlet.deployButton=Deployer
@@ -57,12 +57,12 @@ htmlManagerServlet.deployPath=Chemin de context (requis) :
htmlManagerServlet.deployServer=Emplacement du répertoire ou fichier WAR de
déploiement sur le serveur
htmlManagerServlet.deployTitle=Deployer
htmlManagerServlet.deployUpload=Fichier WAR à déployer
-htmlManagerServlet.deployUploadFail=ECHEC - Téléversement pour déploiement a
échoué, exception : [{0}]
+htmlManagerServlet.deployUploadFail=FAIL - Téléversement pour déploiement a
échoué, exception : [{0}]
htmlManagerServlet.deployUploadFile=Choisir le fichier WAR à téléverser
-htmlManagerServlet.deployUploadInServerXml=ECHEC - Fichier WAR [{0}] ne peut
être téléversé lorsque le contexte est défini dans server.xml
-htmlManagerServlet.deployUploadNoFile=ECHEC - Téléversement a échoué, aucun
fichier
-htmlManagerServlet.deployUploadNotWar=ECHEC - Fichier à téléverser, [{0}],
doit être un .war
-htmlManagerServlet.deployUploadWarExists=ECHEC - Fichier War [{0}] déjà
existant sur le serveur
+htmlManagerServlet.deployUploadInServerXml=FAIL - Fichier WAR [{0}] ne peut
être envoyé lorsque le contexte est défini dans server.xml
+htmlManagerServlet.deployUploadNoFile=FAIL - L'envoi du fichier a échoué,
aucun fichier
+htmlManagerServlet.deployUploadNotWar=FAIL - Le fichier envoyé [{0}] doit être
un .war
+htmlManagerServlet.deployUploadWarExists=FAIL - Fichier War [{0}] déjà
existant sur le serveur
htmlManagerServlet.deployVersion=Version (pour les déploiements en parallèle) :
htmlManagerServlet.deployWar=URL vers WAR ou répertoire :
htmlManagerServlet.diagnosticsLeak=Vérifiez si une application web a causé une
fuite de mémoire lors de son arrêt, rechargement ou déchargement
@@ -121,13 +121,13 @@ htmlManagerServlet.title=Gestionnaire d'applications WEB
Tomcat
jmxProxyServlet.noBeanFound=Impossible de trouver de MBean avec le nom
d''objet [{0}]
jmxProxyServlet.noOperationOnBean=Impossible de trouver l''opération [{0}]
avec [{1}] arguments sur le nom d''objet [{2}], qui est un [{3}]
-managerServlet.alreadyContext=ECHEC - l''application existe déjà dans le
chemin [{0}]
+managerServlet.alreadyContext=FAIL - l''application existe déjà dans le chemin
[{0}]
managerServlet.certsNotAvailable=L'information sur les certificats ne peut pas
être obtenu de ce connecteur
(tomcat) branch main updated (b03fde0383 -> 5b0b742e1a)
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 b03fde0383 Make WebdavServlet properly return the Allow header on NOT_ALLOWED status add 5b0b742e1a Add comment not to edit file directly No new revisions were added by this update. Summary of changes: java/jakarta/el/LocalStrings_cs.properties | 3 +++ java/jakarta/el/LocalStrings_de.properties | 3 +++ java/jakarta/el/LocalStrings_es.properties | 3 +++ java/jakarta/el/LocalStrings_fr.properties | 3 +++ java/jakarta/el/LocalStrings_ja.properties | 3 +++ java/jakarta/el/LocalStrings_ko.properties | 3 +++ java/jakarta/el/LocalStrings_pt_BR.properties | 3 +++ java/jakarta/el/LocalStrings_ru.properties | 3 +++ java/jakarta/el/LocalStrings_zh_CN.properties | 3 +++ java/jakarta/servlet/LocalStrings_cs.properties| 3 +++ java/jakarta/servlet/LocalStrings_de.properties| 3 +++ java/jakarta/servlet/LocalStrings_es.properties| 3 +++ java/jakarta/servlet/LocalStrings_fr.properties| 3 +++ java/jakarta/servlet/LocalStrings_ja.properties| 3 +++ java/jakarta/servlet/LocalStrings_ko.properties| 3 +++ java/jakarta/servlet/LocalStrings_ru.properties| 3 +++ java/jakarta/servlet/LocalStrings_zh_CN.properties | 3 +++ java/jakarta/servlet/http/LocalStrings_de.properties | 3 +++ java/jakarta/servlet/http/LocalStrings_es.properties | 3 +++ java/jakarta/servlet/http/LocalStrings_fr.properties | 3 +++ java/jakarta/servlet/http/LocalStrings_ja.properties | 3 +++ java/jakarta/servlet/http/LocalStrings_ko.properties | 3 +++ java/jakarta/servlet/http/LocalStrings_zh_CN.properties| 3 +++ java/jakarta/servlet/jsp/LocalStrings_de.properties| 3 +++ java/jakarta/servlet/jsp/LocalStrings_es.properties| 3 +++ java/jakarta/servlet/jsp/LocalStrings_fr.properties| 3 +++ java/jakarta/servlet/jsp/LocalStrings_ja.properties| 3 +++ java/jakarta/servlet/jsp/LocalStrings_ko.properties| 3 +++ java/jakarta/servlet/jsp/LocalStrings_zh_CN.properties | 3 +++ java/org/apache/catalina/authenticator/LocalStrings_cs.properties | 3 +++ java/org/apache/catalina/authenticator/LocalStrings_de.properties | 3 +++ java/org/apache/catalina/authenticator/LocalStrings_es.properties | 3 +++ java/org/apache/catalina/authenticator/LocalStrings_fr.properties | 3 +++ java/org/apache/catalina/authenticator/LocalStrings_ja.properties | 3 +++ java/org/apache/catalina/authenticator/LocalStrings_ko.properties | 3 +++ java/org/apache/catalina/authenticator/LocalStrings_pt_BR.properties | 3 +++ java/org/apache/catalina/authenticator/LocalStrings_ru.properties | 3 +++ java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties | 3 +++ .../apache/catalina/authenticator/jaspic/LocalStrings_cs.properties| 3 +++ .../apache/catalina/authenticator/jaspic/LocalStrings_de.properties| 3 +++ .../apache/catalina/authenticator/jaspic/LocalStrings_es.properties| 3 +++ .../apache/catalina/authenticator/jaspic/LocalStrings_fr.properties| 3 +++ .../apache/catalina/authenticator/jaspic/LocalStrings_ja.properties| 3 +++ .../apache/catalina/authenticator/jaspic/LocalStrings_ko.properties| 3 +++ .../apache/catalina/authenticator/jaspic/LocalStrings_pt_BR.properties | 3 +++ .../apache/catalina/authenticator/jaspic/LocalStrings_ru.properties| 3 +++ .../apache/catalina/authenticator/jaspic/LocalStrings_zh_CN.properties | 3 +++ java/org/apache/catalina/connector/LocalStrings_cs.properties | 3 +++ java/org/apache/catalina/connector/LocalStrings_de.properties | 3 +++ java/org/apache/catalina/connector/LocalStrings_es.properties | 3 +++ java/org/apache/catalina/connector/LocalStrings_fr.properties | 3 +++ java/org/apache/catalina/connector/LocalStrings_ja.properties | 3 +++ java/org/apache/catalina/connector/LocalStrings_ko.properties | 3 +++ java/org/apache/catalina/connector/LocalStrings_pt_BR.properties | 3 +++ java/org/apache/catalina/connector/LocalStrings_ru.properties | 3 +++ java/org/apache/catalina/connector/LocalStrings_zh_CN.properties | 3 +++ java/org/apache/catalina/core/LocalStrings_cs.properties | 3 +++ java/org/apache/catalina/core
(tomcat) branch 9.0.x updated (ab0cd03763 -> 2de1db532d)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from ab0cd03763 Improve debug log in DefaultServlet/WebdavServlet new 3ae984c224 Updates prior to applying automated code formatting new 1b7f7cf931 Code clean-up - formatting. No functional change. new 85cd50ceb1 Simplest way to retain formatting new 2de1db532d Re-apply code formatting - no functional change 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: .DS_Store | Bin 0 -> 6148 bytes .../authenticator/DigestAuthenticator.java | 2 + .../authenticator/SpnegoAuthenticator.java | 4 +- .../jaspic/PersistentProviderRegistrations.java| 4 +- java/org/apache/catalina/connector/Connector.java | 4 +- .../catalina/core/ApplicationFilterFactory.java| 2 +- .../apache/catalina/core/AprLifecycleListener.java | 2 +- .../apache/catalina/filters/WebdavFixFilter.java | 2 +- .../apache/catalina/manager/StatusTransformer.java | 2 + java/org/apache/catalina/realm/JAASRealm.java | 3 +- java/org/apache/catalina/realm/RealmBase.java | 6 +- .../apache/catalina/servlets/WebdavServlet.java| 1 - java/org/apache/catalina/tribes/ByteMessage.java | 41 +- java/org/apache/catalina/tribes/Channel.java | 387 + .../apache/catalina/tribes/ChannelException.java | 62 +- .../apache/catalina/tribes/ChannelInterceptor.java | 137 ++-- .../apache/catalina/tribes/ChannelListener.java| 19 +- .../org/apache/catalina/tribes/ChannelMessage.java | 32 +- .../apache/catalina/tribes/ChannelReceiver.java| 21 +- java/org/apache/catalina/tribes/ChannelSender.java | 32 +- java/org/apache/catalina/tribes/ErrorHandler.java | 11 +- java/org/apache/catalina/tribes/Heartbeat.java | 4 +- java/org/apache/catalina/tribes/JmxChannel.java| 6 + .../org/apache/catalina/tribes/ManagedChannel.java | 19 +- java/org/apache/catalina/tribes/Member.java| 79 +- .../apache/catalina/tribes/MembershipListener.java | 8 +- .../apache/catalina/tribes/MembershipProvider.java | 32 +- .../apache/catalina/tribes/MembershipService.java | 64 +- .../apache/catalina/tribes/MessageListener.java| 6 +- .../catalina/tribes/RemoteProcessException.java| 6 +- java/org/apache/catalina/tribes/UniqueId.java | 20 +- .../catalina/tribes/util/ExecutorFactory.java | 4 +- .../apache/catalina/tribes/util/StringManager.java | 8 +- java/org/apache/coyote/AbstractProtocol.java | 4 +- .../coyote/http11/filters/ChunkedInputFilter.java | 4 +- .../apache/coyote/http2/Http2UpgradeHandler.java | 4 +- java/org/apache/coyote/http2/Stream.java | 3 + java/org/apache/el/parser/ELParser.java| 869 ++--- .../org/apache/el/parser/ELParserTokenManager.java | 701 +++-- 39 files changed, 1665 insertions(+), 950 deletions(-) create mode 100644 .DS_Store - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/04: Updates prior to applying automated code formatting
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
commit 3ae984c224e38ad8eae28ba6e3ffd53da95c2a35
Author: Mark Thomas
AuthorDate: Wed Oct 2 10:57:22 2024 +0100
Updates prior to applying automated code formatting
---
java/org/apache/catalina/tribes/ByteMessage.java | 14 +-
java/org/apache/catalina/tribes/Channel.java | 194 -
.../apache/catalina/tribes/ChannelException.java | 3 +-
.../apache/catalina/tribes/ChannelInterceptor.java | 59 ---
.../apache/catalina/tribes/ChannelListener.java| 4 +-
.../org/apache/catalina/tribes/ChannelMessage.java | 4 +-
.../apache/catalina/tribes/ChannelReceiver.java| 3 +-
java/org/apache/catalina/tribes/ChannelSender.java | 5 +-
.../org/apache/catalina/tribes/ManagedChannel.java | 1 -
java/org/apache/catalina/tribes/Member.java| 19 +-
.../apache/catalina/tribes/MembershipProvider.java | 20 ++-
.../apache/catalina/tribes/MembershipService.java | 3 +-
.../catalina/tribes/RemoteProcessException.java| 2 +-
13 files changed, 189 insertions(+), 142 deletions(-)
diff --git a/java/org/apache/catalina/tribes/ByteMessage.java
b/java/org/apache/catalina/tribes/ByteMessage.java
index e6f4b5736b..bf3c4269a3 100644
--- a/java/org/apache/catalina/tribes/ByteMessage.java
+++ b/java/org/apache/catalina/tribes/ByteMessage.java
@@ -23,15 +23,17 @@ import java.io.ObjectOutput;
/**
* A byte message is not serialized and deserialized by the channel
- * instead it is sent as a byte array
+ * instead it is sent as a byte array.
+ *
* By default Tribes uses java serialization when it receives an object
* to be sent over the wire. Java serialization is not the most
* efficient of serializing data, and Tribes might not even
* have access to the correct class loaders to deserialize the object properly.
- *
+ *
* The ByteMessage class is a class where the channel when it receives it will
* not attempt to perform serialization, instead it will simply stream the
getMessage()
- * bytes.
+ * bytes.
+ *
* If you are using multiple applications on top of Tribes you should add some
sort of header
* so that you can decide with the ChannelListener.accept()
whether this message was intended
* for you.
@@ -44,8 +46,9 @@ public class ByteMessage implements Externalizable {
/**
- * Creates an empty byte message
- * Constructor also for deserialization
+ * Creates an empty byte message.
+ *
+ * Constructor also for deserialization.
*/
public ByteMessage() {
}
@@ -88,5 +91,4 @@ public class ByteMessage implements Externalizable {
out.write(message,0,message.length);
}
}
-
}
diff --git a/java/org/apache/catalina/tribes/Channel.java
b/java/org/apache/catalina/tribes/Channel.java
index 73534d22b2..52d4c398db 100644
--- a/java/org/apache/catalina/tribes/Channel.java
+++ b/java/org/apache/catalina/tribes/Channel.java
@@ -25,23 +25,26 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
/**
- * Channel interface
* A channel is a representation of a group of nodes all participating in some
sort of
- * communication with each other.
+ * communication with each other.
+ *
* The channel is the main API class for Tribes, this is essentially the only
class
- * that an application needs to be aware of. Through the channel the
application can:
- * 1. send messages
- * 2. receive message (by registering a ChannelListener
- * 3. get all members of the group getMembers()
- * 4. receive notifications of members added and members disappeared by
- *registering a MembershipListener
- *
- * The channel has 5 major components:
- * 1. Data receiver, with a built in thread pool to receive messages from
other peers
- * 2. Data sender, an implementation for sending data using NIO or java.io
- * 3. Membership listener,listens for membership broadcasts
- * 4. Membership broadcaster, broadcasts membership pings.
- * 5. Channel interceptors, the ability to manipulate messages as they are
sent or arrive
+ * that an application needs to be aware of. Through the channel the
application can:
+ *
+ * send messages
+ * receive message (by registering a ChannelListener
+ * get all members of the group getMembers()
+ * receive notifications of members added and members disappeared by
+ *registering a MembershipListener
+ *
+ * The channel has 5 major components:
+ *
+ * Data receiver, with a built in thread pool to receive messages from
other peers
+ * Data sender, an implementation for sending data using NIO or
java.io
+ * Membership listener,listens for membership broadcasts
+ * Membership broadcaster, broadcasts membership pings.
+ * Channel interceptors, the ability to manipulate messages as they are
sent or arrive
+ *
* The channel layout is:
*
* ChannelListener_1
(tomcat) 02/04: Code clean-up - formatting. No functional change.
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
commit 1b7f7cf931ae551ce096cba4150111b123096d40
Author: Mark Thomas
AuthorDate: Wed Oct 2 11:00:34 2024 +0100
Code clean-up - formatting. No functional change.
---
.DS_Store | Bin 0 -> 6148 bytes
java/org/apache/catalina/tribes/ByteMessage.java | 31 +-
java/org/apache/catalina/tribes/Channel.java | 311 -
.../apache/catalina/tribes/ChannelException.java | 59 ++--
.../apache/catalina/tribes/ChannelInterceptor.java | 130 +
.../apache/catalina/tribes/ChannelListener.java| 15 +-
.../org/apache/catalina/tribes/ChannelMessage.java | 32 ++-
.../apache/catalina/tribes/ChannelReceiver.java| 20 +-
java/org/apache/catalina/tribes/ChannelSender.java | 31 +-
java/org/apache/catalina/tribes/ErrorHandler.java | 11 +-
java/org/apache/catalina/tribes/Heartbeat.java | 4 +-
java/org/apache/catalina/tribes/JmxChannel.java| 6 +
.../org/apache/catalina/tribes/ManagedChannel.java | 18 +-
java/org/apache/catalina/tribes/Member.java| 66 +++--
.../apache/catalina/tribes/MembershipListener.java | 8 +-
.../apache/catalina/tribes/MembershipProvider.java | 32 ++-
.../apache/catalina/tribes/MembershipService.java | 63 +++--
.../apache/catalina/tribes/MessageListener.java| 6 +-
.../catalina/tribes/RemoteProcessException.java| 4 +-
java/org/apache/catalina/tribes/UniqueId.java | 20 +-
20 files changed, 525 insertions(+), 342 deletions(-)
diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 00..1b83a3bed8
Binary files /dev/null and b/.DS_Store differ
diff --git a/java/org/apache/catalina/tribes/ByteMessage.java
b/java/org/apache/catalina/tribes/ByteMessage.java
index bf3c4269a3..5afa7da900 100644
--- a/java/org/apache/catalina/tribes/ByteMessage.java
+++ b/java/org/apache/catalina/tribes/ByteMessage.java
@@ -22,21 +22,17 @@ import java.io.ObjectInput;
import java.io.ObjectOutput;
/**
- * A byte message is not serialized and deserialized by the channel
- * instead it is sent as a byte array.
+ * A byte message is not serialized and deserialized by the channel instead it
is sent as a byte array.
*
- * By default Tribes uses java serialization when it receives an object
- * to be sent over the wire. Java serialization is not the most
- * efficient of serializing data, and Tribes might not even
- * have access to the correct class loaders to deserialize the object properly.
+ * By default Tribes uses java serialization when it receives an object to be
sent over the wire. Java serialization is
+ * not the most efficient of serializing data, and Tribes might not even have
access to the correct class loaders to
+ * deserialize the object properly.
*
- * The ByteMessage class is a class where the channel when it receives it will
- * not attempt to perform serialization, instead it will simply stream the
getMessage()
- * bytes.
+ * The ByteMessage class is a class where the channel when it receives it will
not attempt to perform serialization,
+ * instead it will simply stream the getMessage() bytes.
*
- * If you are using multiple applications on top of Tribes you should add some
sort of header
- * so that you can decide with the ChannelListener.accept()
whether this message was intended
- * for you.
+ * If you are using multiple applications on top of Tribes you should add some
sort of header so that you can decide
+ * with the ChannelListener.accept() whether this message was
intended for you.
*/
public class ByteMessage implements Externalizable {
/**
@@ -55,6 +51,7 @@ public class ByteMessage implements Externalizable {
/**
* Creates a byte message with
+ *
* @param data byte[] - the message contents
*/
public ByteMessage(byte[] data) {
@@ -63,6 +60,7 @@ public class ByteMessage implements Externalizable {
/**
* Returns the message contents of this byte message
+ *
* @return byte[] - message contents, can be null
*/
public byte[] getMessage() {
@@ -71,6 +69,7 @@ public class ByteMessage implements Externalizable {
/**
* Sets the message contents of this byte message
+ *
* @param message byte[]
*/
public void setMessage(byte[] message) {
@@ -78,7 +77,7 @@ public class ByteMessage implements Externalizable {
}
@Override
-public void readExternal(ObjectInput in ) throws IOException {
+public void readExternal(ObjectInput in) throws IOException {
int length = in.readInt();
message = new byte[length];
in.readFully(message);
@@ -86,9 +85,9 @@ public class ByteMessage implements Externalizable {
@Override
public void writeExternal(ObjectOutput out) throws IOException {
-out.writeInt(message!=n
(tomcat) 03/04: Simplest way to retain formatting
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
commit 85cd50ceb16a4d6c7d9cf6105604d477c480f68f
Author: Mark Thomas
AuthorDate: Wed Oct 2 11:46:51 2024 +0100
Simplest way to retain formatting
---
java/org/apache/coyote/http2/Stream.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index 0384c513fe..c543ecd127 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -817,8 +817,11 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
*
* It is important that this method is not called until any concurrent
processing for the stream has completed. This
* is currently achieved by:
+ *
* - only the StreamProcessor calls this method
+ *
* - the Http2UpgradeHandler does not call this method
+ *
* - this method is called once the StreamProcessor considers the Stream
closed
*
* In theory, the protection against duplicate calls is not required in
this method (the code in StreamProcessor
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/04: Updates prior to applying automated code formatting
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
commit 565b21dba656a519f99db3f58cc50b130fa49e3f
Author: Mark Thomas
AuthorDate: Wed Oct 2 10:57:22 2024 +0100
Updates prior to applying automated code formatting
---
java/org/apache/catalina/tribes/ByteMessage.java | 14 +-
java/org/apache/catalina/tribes/Channel.java | 194 -
.../apache/catalina/tribes/ChannelException.java | 3 +-
.../apache/catalina/tribes/ChannelInterceptor.java | 59 ---
.../apache/catalina/tribes/ChannelListener.java| 4 +-
.../org/apache/catalina/tribes/ChannelMessage.java | 4 +-
.../apache/catalina/tribes/ChannelReceiver.java| 3 +-
java/org/apache/catalina/tribes/ChannelSender.java | 5 +-
.../org/apache/catalina/tribes/ManagedChannel.java | 1 -
java/org/apache/catalina/tribes/Member.java| 19 +-
.../apache/catalina/tribes/MembershipProvider.java | 20 ++-
.../apache/catalina/tribes/MembershipService.java | 3 +-
.../catalina/tribes/RemoteProcessException.java| 2 +-
13 files changed, 189 insertions(+), 142 deletions(-)
diff --git a/java/org/apache/catalina/tribes/ByteMessage.java
b/java/org/apache/catalina/tribes/ByteMessage.java
index e6f4b5736b..bf3c4269a3 100644
--- a/java/org/apache/catalina/tribes/ByteMessage.java
+++ b/java/org/apache/catalina/tribes/ByteMessage.java
@@ -23,15 +23,17 @@ import java.io.ObjectOutput;
/**
* A byte message is not serialized and deserialized by the channel
- * instead it is sent as a byte array
+ * instead it is sent as a byte array.
+ *
* By default Tribes uses java serialization when it receives an object
* to be sent over the wire. Java serialization is not the most
* efficient of serializing data, and Tribes might not even
* have access to the correct class loaders to deserialize the object properly.
- *
+ *
* The ByteMessage class is a class where the channel when it receives it will
* not attempt to perform serialization, instead it will simply stream the
getMessage()
- * bytes.
+ * bytes.
+ *
* If you are using multiple applications on top of Tribes you should add some
sort of header
* so that you can decide with the ChannelListener.accept()
whether this message was intended
* for you.
@@ -44,8 +46,9 @@ public class ByteMessage implements Externalizable {
/**
- * Creates an empty byte message
- * Constructor also for deserialization
+ * Creates an empty byte message.
+ *
+ * Constructor also for deserialization.
*/
public ByteMessage() {
}
@@ -88,5 +91,4 @@ public class ByteMessage implements Externalizable {
out.write(message,0,message.length);
}
}
-
}
diff --git a/java/org/apache/catalina/tribes/Channel.java
b/java/org/apache/catalina/tribes/Channel.java
index 73534d22b2..52d4c398db 100644
--- a/java/org/apache/catalina/tribes/Channel.java
+++ b/java/org/apache/catalina/tribes/Channel.java
@@ -25,23 +25,26 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
/**
- * Channel interface
* A channel is a representation of a group of nodes all participating in some
sort of
- * communication with each other.
+ * communication with each other.
+ *
* The channel is the main API class for Tribes, this is essentially the only
class
- * that an application needs to be aware of. Through the channel the
application can:
- * 1. send messages
- * 2. receive message (by registering a ChannelListener
- * 3. get all members of the group getMembers()
- * 4. receive notifications of members added and members disappeared by
- *registering a MembershipListener
- *
- * The channel has 5 major components:
- * 1. Data receiver, with a built in thread pool to receive messages from
other peers
- * 2. Data sender, an implementation for sending data using NIO or java.io
- * 3. Membership listener,listens for membership broadcasts
- * 4. Membership broadcaster, broadcasts membership pings.
- * 5. Channel interceptors, the ability to manipulate messages as they are
sent or arrive
+ * that an application needs to be aware of. Through the channel the
application can:
+ *
+ * send messages
+ * receive message (by registering a ChannelListener
+ * get all members of the group getMembers()
+ * receive notifications of members added and members disappeared by
+ *registering a MembershipListener
+ *
+ * The channel has 5 major components:
+ *
+ * Data receiver, with a built in thread pool to receive messages from
other peers
+ * Data sender, an implementation for sending data using NIO or
java.io
+ * Membership listener,listens for membership broadcasts
+ * Membership broadcaster, broadcasts membership pings.
+ * Channel interceptors, the ability to manipulate messages as they are
sent or arrive
+ *
* The channel layout is:
*
* ChannelListener_1
(tomcat) 03/04: Simplest way to retain formatting
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
commit 754d07ebdbeeabebab800b5b469227f9e5e013e4
Author: Mark Thomas
AuthorDate: Wed Oct 2 11:46:51 2024 +0100
Simplest way to retain formatting
---
java/org/apache/coyote/http2/Stream.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index c8596933be..233293c7b7 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -817,8 +817,11 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
*
* It is important that this method is not called until any concurrent
processing for the stream has completed. This
* is currently achieved by:
+ *
* - only the StreamProcessor calls this method
+ *
* - the Http2UpgradeHandler does not call this method
+ *
* - this method is called once the StreamProcessor considers the Stream
closed
*
* In theory, the protection against duplicate calls is not required in
this method (the code in StreamProcessor
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/04: Code clean-up - formatting. No functional change.
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
commit 9faa87378cb08943a56c255571823c1a3424196b
Author: Mark Thomas
AuthorDate: Wed Oct 2 11:00:34 2024 +0100
Code clean-up - formatting. No functional change.
---
.DS_Store | Bin 0 -> 6148 bytes
java/org/apache/catalina/tribes/ByteMessage.java | 31 +-
java/org/apache/catalina/tribes/Channel.java | 311 -
.../apache/catalina/tribes/ChannelException.java | 59 ++--
.../apache/catalina/tribes/ChannelInterceptor.java | 130 +
.../apache/catalina/tribes/ChannelListener.java| 15 +-
.../org/apache/catalina/tribes/ChannelMessage.java | 32 ++-
.../apache/catalina/tribes/ChannelReceiver.java| 20 +-
java/org/apache/catalina/tribes/ChannelSender.java | 31 +-
java/org/apache/catalina/tribes/ErrorHandler.java | 11 +-
java/org/apache/catalina/tribes/Heartbeat.java | 4 +-
java/org/apache/catalina/tribes/JmxChannel.java| 6 +
.../org/apache/catalina/tribes/ManagedChannel.java | 18 +-
java/org/apache/catalina/tribes/Member.java| 66 +++--
.../apache/catalina/tribes/MembershipListener.java | 8 +-
.../apache/catalina/tribes/MembershipProvider.java | 32 ++-
.../apache/catalina/tribes/MembershipService.java | 63 +++--
.../apache/catalina/tribes/MessageListener.java| 6 +-
.../catalina/tribes/RemoteProcessException.java| 4 +-
java/org/apache/catalina/tribes/UniqueId.java | 20 +-
20 files changed, 525 insertions(+), 342 deletions(-)
diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 00..1b83a3bed8
Binary files /dev/null and b/.DS_Store differ
diff --git a/java/org/apache/catalina/tribes/ByteMessage.java
b/java/org/apache/catalina/tribes/ByteMessage.java
index bf3c4269a3..5afa7da900 100644
--- a/java/org/apache/catalina/tribes/ByteMessage.java
+++ b/java/org/apache/catalina/tribes/ByteMessage.java
@@ -22,21 +22,17 @@ import java.io.ObjectInput;
import java.io.ObjectOutput;
/**
- * A byte message is not serialized and deserialized by the channel
- * instead it is sent as a byte array.
+ * A byte message is not serialized and deserialized by the channel instead it
is sent as a byte array.
*
- * By default Tribes uses java serialization when it receives an object
- * to be sent over the wire. Java serialization is not the most
- * efficient of serializing data, and Tribes might not even
- * have access to the correct class loaders to deserialize the object properly.
+ * By default Tribes uses java serialization when it receives an object to be
sent over the wire. Java serialization is
+ * not the most efficient of serializing data, and Tribes might not even have
access to the correct class loaders to
+ * deserialize the object properly.
*
- * The ByteMessage class is a class where the channel when it receives it will
- * not attempt to perform serialization, instead it will simply stream the
getMessage()
- * bytes.
+ * The ByteMessage class is a class where the channel when it receives it will
not attempt to perform serialization,
+ * instead it will simply stream the getMessage() bytes.
*
- * If you are using multiple applications on top of Tribes you should add some
sort of header
- * so that you can decide with the ChannelListener.accept()
whether this message was intended
- * for you.
+ * If you are using multiple applications on top of Tribes you should add some
sort of header so that you can decide
+ * with the ChannelListener.accept() whether this message was
intended for you.
*/
public class ByteMessage implements Externalizable {
/**
@@ -55,6 +51,7 @@ public class ByteMessage implements Externalizable {
/**
* Creates a byte message with
+ *
* @param data byte[] - the message contents
*/
public ByteMessage(byte[] data) {
@@ -63,6 +60,7 @@ public class ByteMessage implements Externalizable {
/**
* Returns the message contents of this byte message
+ *
* @return byte[] - message contents, can be null
*/
public byte[] getMessage() {
@@ -71,6 +69,7 @@ public class ByteMessage implements Externalizable {
/**
* Sets the message contents of this byte message
+ *
* @param message byte[]
*/
public void setMessage(byte[] message) {
@@ -78,7 +77,7 @@ public class ByteMessage implements Externalizable {
}
@Override
-public void readExternal(ObjectInput in ) throws IOException {
+public void readExternal(ObjectInput in) throws IOException {
int length = in.readInt();
message = new byte[length];
in.readFully(message);
@@ -86,9 +85,9 @@ public class ByteMessage implements Externalizable {
@Override
public void writeExternal(ObjectOutput out) throws IOException {
-out.writeInt(message!=n
(tomcat) branch 10.1.x updated (02dd078f1c -> 2b7c1cf8da)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 02dd078f1c Improve debug log in DefaultServlet/WebdavServlet new 565b21dba6 Updates prior to applying automated code formatting new 9faa87378c Code clean-up - formatting. No functional change. new 754d07ebdb Simplest way to retain formatting new 2b7c1cf8da Re-apply code formatting - no functional change 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: .DS_Store | Bin 0 -> 6148 bytes .../authenticator/DigestAuthenticator.java | 2 + .../authenticator/SpnegoAuthenticator.java | 4 +- .../jaspic/AuthConfigFactoryImpl.java | 3 +- .../jaspic/PersistentProviderRegistrations.java| 4 +- .../catalina/core/ApplicationFilterFactory.java| 2 +- .../apache/catalina/core/AprLifecycleListener.java | 2 +- .../apache/catalina/filters/WebdavFixFilter.java | 2 +- .../apache/catalina/manager/StatusTransformer.java | 2 + java/org/apache/catalina/realm/JAASRealm.java | 3 +- java/org/apache/catalina/realm/RealmBase.java | 6 +- .../apache/catalina/servlets/WebdavServlet.java| 1 - java/org/apache/catalina/tribes/ByteMessage.java | 41 +- java/org/apache/catalina/tribes/Channel.java | 387 + .../apache/catalina/tribes/ChannelException.java | 62 +- .../apache/catalina/tribes/ChannelInterceptor.java | 137 ++-- .../apache/catalina/tribes/ChannelListener.java| 19 +- .../org/apache/catalina/tribes/ChannelMessage.java | 32 +- .../apache/catalina/tribes/ChannelReceiver.java| 21 +- java/org/apache/catalina/tribes/ChannelSender.java | 32 +- java/org/apache/catalina/tribes/ErrorHandler.java | 11 +- java/org/apache/catalina/tribes/Heartbeat.java | 4 +- java/org/apache/catalina/tribes/JmxChannel.java| 6 + .../org/apache/catalina/tribes/ManagedChannel.java | 19 +- java/org/apache/catalina/tribes/Member.java| 79 +- .../apache/catalina/tribes/MembershipListener.java | 8 +- .../apache/catalina/tribes/MembershipProvider.java | 32 +- .../apache/catalina/tribes/MembershipService.java | 64 +- .../apache/catalina/tribes/MessageListener.java| 6 +- .../catalina/tribes/RemoteProcessException.java| 6 +- java/org/apache/catalina/tribes/UniqueId.java | 20 +- .../catalina/tribes/util/ExecutorFactory.java | 4 +- .../apache/catalina/tribes/util/StringManager.java | 6 +- java/org/apache/coyote/AbstractProtocol.java | 4 +- .../coyote/http11/filters/ChunkedInputFilter.java | 4 +- .../apache/coyote/http2/Http2UpgradeHandler.java | 4 +- java/org/apache/coyote/http2/Stream.java | 3 + java/org/apache/el/parser/ELParser.java| 869 ++--- .../org/apache/el/parser/ELParserTokenManager.java | 701 +++-- 39 files changed, 1664 insertions(+), 948 deletions(-) create mode 100644 .DS_Store - 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 (1ecf6870a5 -> 352efca575)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 11.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 1ecf6870a5 Improve debug log in DefaultServlet/WebdavServlet new ee15e7567e Updates prior to applying automated code formatting new 51b9cd00e6 Code clean-up - formatting. No functional change. new 492dd4b7fc Simplest way to retain formatting new 352efca575 Re-apply code formatting - no functional change 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: .DS_Store | Bin 0 -> 6148 bytes .../authenticator/SpnegoAuthenticator.java | 4 +- .../jaspic/AuthConfigFactoryImpl.java | 3 +- .../jaspic/PersistentProviderRegistrations.java| 4 +- .../catalina/core/ApplicationFilterFactory.java| 2 +- .../apache/catalina/core/AprLifecycleListener.java | 2 +- .../apache/catalina/manager/StatusTransformer.java | 2 + java/org/apache/catalina/realm/JAASRealm.java | 3 +- java/org/apache/catalina/realm/RealmBase.java | 6 +- .../apache/catalina/servlets/WebdavServlet.java| 1 - java/org/apache/catalina/tribes/ByteMessage.java | 41 +-- java/org/apache/catalina/tribes/Channel.java | 387 - .../apache/catalina/tribes/ChannelException.java | 62 ++-- .../apache/catalina/tribes/ChannelInterceptor.java | 137 +--- .../apache/catalina/tribes/ChannelListener.java| 19 +- .../org/apache/catalina/tribes/ChannelMessage.java | 32 +- .../apache/catalina/tribes/ChannelReceiver.java| 21 +- java/org/apache/catalina/tribes/ChannelSender.java | 32 +- java/org/apache/catalina/tribes/ErrorHandler.java | 11 +- java/org/apache/catalina/tribes/Heartbeat.java | 4 +- java/org/apache/catalina/tribes/JmxChannel.java| 6 + .../org/apache/catalina/tribes/ManagedChannel.java | 19 +- java/org/apache/catalina/tribes/Member.java| 79 +++-- .../apache/catalina/tribes/MembershipListener.java | 8 +- .../apache/catalina/tribes/MembershipProvider.java | 32 +- .../apache/catalina/tribes/MembershipService.java | 64 ++-- .../apache/catalina/tribes/MessageListener.java| 6 +- .../catalina/tribes/RemoteProcessException.java| 6 +- java/org/apache/catalina/tribes/UniqueId.java | 20 +- .../catalina/tribes/util/ExecutorFactory.java | 4 +- .../apache/catalina/tribes/util/StringManager.java | 6 +- java/org/apache/coyote/AbstractProtocol.java | 4 +- .../coyote/http11/filters/ChunkedInputFilter.java | 4 +- .../apache/coyote/http2/Http2UpgradeHandler.java | 4 +- java/org/apache/coyote/http2/Stream.java | 3 + 35 files changed, 637 insertions(+), 401 deletions(-) create mode 100644 .DS_Store - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 03/04: Simplest way to retain formatting
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
commit 492dd4b7fc95fce0e91a043d41049960cf2c6369
Author: Mark Thomas
AuthorDate: Wed Oct 2 11:46:51 2024 +0100
Simplest way to retain formatting
---
java/org/apache/coyote/http2/Stream.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index d0257ab17e..7d959e321e 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -805,8 +805,11 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
*
* It is important that this method is not called until any concurrent
processing for the stream has completed. This
* is currently achieved by:
+ *
* - only the StreamProcessor calls this method
+ *
* - the Http2UpgradeHandler does not call this method
+ *
* - this method is called once the StreamProcessor considers the Stream
closed
*
* In theory, the protection against duplicate calls is not required in
this method (the code in StreamProcessor
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/04: Code clean-up - formatting. No functional change.
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
commit 51b9cd00e692f74767d7b98be1978a79b3545f6b
Author: Mark Thomas
AuthorDate: Wed Oct 2 11:00:34 2024 +0100
Code clean-up - formatting. No functional change.
---
.DS_Store | Bin 0 -> 6148 bytes
java/org/apache/catalina/tribes/ByteMessage.java | 31 +-
java/org/apache/catalina/tribes/Channel.java | 311 -
.../apache/catalina/tribes/ChannelException.java | 59 ++--
.../apache/catalina/tribes/ChannelInterceptor.java | 130 +
.../apache/catalina/tribes/ChannelListener.java| 15 +-
.../org/apache/catalina/tribes/ChannelMessage.java | 32 ++-
.../apache/catalina/tribes/ChannelReceiver.java| 20 +-
java/org/apache/catalina/tribes/ChannelSender.java | 31 +-
java/org/apache/catalina/tribes/ErrorHandler.java | 11 +-
java/org/apache/catalina/tribes/Heartbeat.java | 4 +-
java/org/apache/catalina/tribes/JmxChannel.java| 6 +
.../org/apache/catalina/tribes/ManagedChannel.java | 18 +-
java/org/apache/catalina/tribes/Member.java| 66 +++--
.../apache/catalina/tribes/MembershipListener.java | 8 +-
.../apache/catalina/tribes/MembershipProvider.java | 32 ++-
.../apache/catalina/tribes/MembershipService.java | 63 +++--
.../apache/catalina/tribes/MessageListener.java| 6 +-
.../catalina/tribes/RemoteProcessException.java| 4 +-
java/org/apache/catalina/tribes/UniqueId.java | 20 +-
20 files changed, 525 insertions(+), 342 deletions(-)
diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 00..1b83a3bed8
Binary files /dev/null and b/.DS_Store differ
diff --git a/java/org/apache/catalina/tribes/ByteMessage.java
b/java/org/apache/catalina/tribes/ByteMessage.java
index bf3c4269a3..5afa7da900 100644
--- a/java/org/apache/catalina/tribes/ByteMessage.java
+++ b/java/org/apache/catalina/tribes/ByteMessage.java
@@ -22,21 +22,17 @@ import java.io.ObjectInput;
import java.io.ObjectOutput;
/**
- * A byte message is not serialized and deserialized by the channel
- * instead it is sent as a byte array.
+ * A byte message is not serialized and deserialized by the channel instead it
is sent as a byte array.
*
- * By default Tribes uses java serialization when it receives an object
- * to be sent over the wire. Java serialization is not the most
- * efficient of serializing data, and Tribes might not even
- * have access to the correct class loaders to deserialize the object properly.
+ * By default Tribes uses java serialization when it receives an object to be
sent over the wire. Java serialization is
+ * not the most efficient of serializing data, and Tribes might not even have
access to the correct class loaders to
+ * deserialize the object properly.
*
- * The ByteMessage class is a class where the channel when it receives it will
- * not attempt to perform serialization, instead it will simply stream the
getMessage()
- * bytes.
+ * The ByteMessage class is a class where the channel when it receives it will
not attempt to perform serialization,
+ * instead it will simply stream the getMessage() bytes.
*
- * If you are using multiple applications on top of Tribes you should add some
sort of header
- * so that you can decide with the ChannelListener.accept()
whether this message was intended
- * for you.
+ * If you are using multiple applications on top of Tribes you should add some
sort of header so that you can decide
+ * with the ChannelListener.accept() whether this message was
intended for you.
*/
public class ByteMessage implements Externalizable {
/**
@@ -55,6 +51,7 @@ public class ByteMessage implements Externalizable {
/**
* Creates a byte message with
+ *
* @param data byte[] - the message contents
*/
public ByteMessage(byte[] data) {
@@ -63,6 +60,7 @@ public class ByteMessage implements Externalizable {
/**
* Returns the message contents of this byte message
+ *
* @return byte[] - message contents, can be null
*/
public byte[] getMessage() {
@@ -71,6 +69,7 @@ public class ByteMessage implements Externalizable {
/**
* Sets the message contents of this byte message
+ *
* @param message byte[]
*/
public void setMessage(byte[] message) {
@@ -78,7 +77,7 @@ public class ByteMessage implements Externalizable {
}
@Override
-public void readExternal(ObjectInput in ) throws IOException {
+public void readExternal(ObjectInput in) throws IOException {
int length = in.readInt();
message = new byte[length];
in.readFully(message);
@@ -86,9 +85,9 @@ public class ByteMessage implements Externalizable {
@Override
public void writeExternal(ObjectOutput out) throws IOException {
-out.writeInt(message!=n
(tomcat) 04/04: Re-apply code formatting - no functional change
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
commit 352efca5757ede5cdc28975cdc5be640cf6d3735
Author: Mark Thomas
AuthorDate: Wed Oct 2 11:54:13 2024 +0100
Re-apply code formatting - no functional change
---
java/org/apache/catalina/authenticator/SpnegoAuthenticator.java | 4 ++--
.../apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java | 3 ++-
.../authenticator/jaspic/PersistentProviderRegistrations.java | 4 ++--
java/org/apache/catalina/core/ApplicationFilterFactory.java | 2 +-
java/org/apache/catalina/core/AprLifecycleListener.java | 2 +-
java/org/apache/catalina/manager/StatusTransformer.java | 2 ++
java/org/apache/catalina/realm/JAASRealm.java | 3 ++-
java/org/apache/catalina/realm/RealmBase.java | 6 +++---
java/org/apache/catalina/servlets/WebdavServlet.java| 1 -
java/org/apache/catalina/tribes/util/ExecutorFactory.java | 4 ++--
java/org/apache/catalina/tribes/util/StringManager.java | 6 +++---
java/org/apache/coyote/AbstractProtocol.java| 4 ++--
java/org/apache/coyote/http11/filters/ChunkedInputFilter.java | 4 ++--
java/org/apache/coyote/http2/Http2UpgradeHandler.java | 4 ++--
14 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
b/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
index 570ce65413..9227238198 100644
--- a/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
@@ -165,8 +165,8 @@ public class SpnegoAuthenticator extends AuthenticatorBase {
authorizationBC.setStart(authorizationBC.getStart() + 10);
byte[] encoded = new byte[authorizationBC.getLength()];
-System.arraycopy(authorizationBC.getBuffer(),
authorizationBC.getStart(),
-encoded, 0, authorizationBC.getLength());
+System.arraycopy(authorizationBC.getBuffer(),
authorizationBC.getStart(), encoded, 0,
+authorizationBC.getLength());
byte[] decoded = Base64.getDecoder().decode(encoded);
if (getApplyJava8u40Fix()) {
diff --git
a/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
b/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
index 73d95329f6..81acb0c4e2 100644
--- a/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
+++ b/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
@@ -658,7 +658,8 @@ public class AuthConfigFactoryImpl extends
AuthConfigFactory {
if (serverAuthConfig == null) {
synchronized (serverAuthConfigLock) {
if (serverAuthConfig == null) {
-serverAuthConfig = new
SingleContextServerAuthConfig(serverAuthModule, this.appContext, handler);
+serverAuthConfig =
+new
SingleContextServerAuthConfig(serverAuthModule, this.appContext, handler);
}
}
}
diff --git
a/java/org/apache/catalina/authenticator/jaspic/PersistentProviderRegistrations.java
b/java/org/apache/catalina/authenticator/jaspic/PersistentProviderRegistrations.java
index 875ab1cff0..9295eb81bf 100644
---
a/java/org/apache/catalina/authenticator/jaspic/PersistentProviderRegistrations.java
+++
b/java/org/apache/catalina/authenticator/jaspic/PersistentProviderRegistrations.java
@@ -111,8 +111,8 @@ public final class PersistentProviderRegistrations {
}
if (!configParent.exists()) {
if (!configParent.mkdirs()) {
-throw new
SecurityException(sm.getString("persistentProviderRegistrations.mkdirsFail",
-configParent.getAbsolutePath()));
+throw new SecurityException(
+
sm.getString("persistentProviderRegistrations.mkdirsFail",
configParent.getAbsolutePath()));
}
}
diff --git a/java/org/apache/catalina/core/ApplicationFilterFactory.java
b/java/org/apache/catalina/core/ApplicationFilterFactory.java
index fe5851bf90..052717e4e1 100644
--- a/java/org/apache/catalina/core/ApplicationFilterFactory.java
+++ b/java/org/apache/catalina/core/ApplicationFilterFactory.java
@@ -91,7 +91,7 @@ public final class ApplicationFilterFactory {
// Acquire the information we will need to match filter mappings
DispatcherType dispatcher = (DispatcherType)
request.getAttribute(Globals.DISPATCHER_TYPE_ATTR);
-String requestPath = FilterUtil.getRequestPath(request) ;
+String requestPath = FilterUtil.getRequestPath(request);
String servletNa
(tomcat) 01/04: Updates prior to applying automated code formatting
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
commit ee15e7567e15d82d04d220ce643d7a955f0e9534
Author: Mark Thomas
AuthorDate: Wed Oct 2 10:57:22 2024 +0100
Updates prior to applying automated code formatting
---
java/org/apache/catalina/tribes/ByteMessage.java | 14 +-
java/org/apache/catalina/tribes/Channel.java | 194 -
.../apache/catalina/tribes/ChannelException.java | 3 +-
.../apache/catalina/tribes/ChannelInterceptor.java | 59 ---
.../apache/catalina/tribes/ChannelListener.java| 4 +-
.../org/apache/catalina/tribes/ChannelMessage.java | 4 +-
.../apache/catalina/tribes/ChannelReceiver.java| 3 +-
java/org/apache/catalina/tribes/ChannelSender.java | 5 +-
.../org/apache/catalina/tribes/ManagedChannel.java | 1 -
java/org/apache/catalina/tribes/Member.java| 19 +-
.../apache/catalina/tribes/MembershipProvider.java | 20 ++-
.../apache/catalina/tribes/MembershipService.java | 3 +-
.../catalina/tribes/RemoteProcessException.java| 2 +-
13 files changed, 189 insertions(+), 142 deletions(-)
diff --git a/java/org/apache/catalina/tribes/ByteMessage.java
b/java/org/apache/catalina/tribes/ByteMessage.java
index e6f4b5736b..bf3c4269a3 100644
--- a/java/org/apache/catalina/tribes/ByteMessage.java
+++ b/java/org/apache/catalina/tribes/ByteMessage.java
@@ -23,15 +23,17 @@ import java.io.ObjectOutput;
/**
* A byte message is not serialized and deserialized by the channel
- * instead it is sent as a byte array
+ * instead it is sent as a byte array.
+ *
* By default Tribes uses java serialization when it receives an object
* to be sent over the wire. Java serialization is not the most
* efficient of serializing data, and Tribes might not even
* have access to the correct class loaders to deserialize the object properly.
- *
+ *
* The ByteMessage class is a class where the channel when it receives it will
* not attempt to perform serialization, instead it will simply stream the
getMessage()
- * bytes.
+ * bytes.
+ *
* If you are using multiple applications on top of Tribes you should add some
sort of header
* so that you can decide with the ChannelListener.accept()
whether this message was intended
* for you.
@@ -44,8 +46,9 @@ public class ByteMessage implements Externalizable {
/**
- * Creates an empty byte message
- * Constructor also for deserialization
+ * Creates an empty byte message.
+ *
+ * Constructor also for deserialization.
*/
public ByteMessage() {
}
@@ -88,5 +91,4 @@ public class ByteMessage implements Externalizable {
out.write(message,0,message.length);
}
}
-
}
diff --git a/java/org/apache/catalina/tribes/Channel.java
b/java/org/apache/catalina/tribes/Channel.java
index 73534d22b2..52d4c398db 100644
--- a/java/org/apache/catalina/tribes/Channel.java
+++ b/java/org/apache/catalina/tribes/Channel.java
@@ -25,23 +25,26 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
/**
- * Channel interface
* A channel is a representation of a group of nodes all participating in some
sort of
- * communication with each other.
+ * communication with each other.
+ *
* The channel is the main API class for Tribes, this is essentially the only
class
- * that an application needs to be aware of. Through the channel the
application can:
- * 1. send messages
- * 2. receive message (by registering a ChannelListener
- * 3. get all members of the group getMembers()
- * 4. receive notifications of members added and members disappeared by
- *registering a MembershipListener
- *
- * The channel has 5 major components:
- * 1. Data receiver, with a built in thread pool to receive messages from
other peers
- * 2. Data sender, an implementation for sending data using NIO or java.io
- * 3. Membership listener,listens for membership broadcasts
- * 4. Membership broadcaster, broadcasts membership pings.
- * 5. Channel interceptors, the ability to manipulate messages as they are
sent or arrive
+ * that an application needs to be aware of. Through the channel the
application can:
+ *
+ * send messages
+ * receive message (by registering a ChannelListener
+ * get all members of the group getMembers()
+ * receive notifications of members added and members disappeared by
+ *registering a MembershipListener
+ *
+ * The channel has 5 major components:
+ *
+ * Data receiver, with a built in thread pool to receive messages from
other peers
+ * Data sender, an implementation for sending data using NIO or
java.io
+ * Membership listener,listens for membership broadcasts
+ * Membership broadcaster, broadcasts membership pings.
+ * Channel interceptors, the ability to manipulate messages as they are
sent or arrive
+ *
* The channel layout is:
*
* ChannelListener_1
(tomcat) branch main updated (eed64ff580 -> d605c66e90)
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 eed64ff580 Code clean-up - formatting. No functional change. new e0d8de393c Simplest way to retain formatting new d605c66e90 Re-apply code formatting - no functional change The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: java/org/apache/catalina/authenticator/SpnegoAuthenticator.java | 4 ++-- .../apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java | 3 ++- .../authenticator/jaspic/PersistentProviderRegistrations.java | 4 ++-- java/org/apache/catalina/core/ApplicationFilterFactory.java | 2 +- java/org/apache/catalina/core/AprLifecycleListener.java | 2 +- java/org/apache/catalina/manager/StatusTransformer.java | 2 ++ java/org/apache/catalina/realm/JAASRealm.java | 3 ++- java/org/apache/catalina/realm/RealmBase.java | 6 +++--- java/org/apache/catalina/servlets/WebdavServlet.java| 1 - java/org/apache/coyote/AbstractProtocol.java| 4 ++-- java/org/apache/coyote/http11/filters/ChunkedInputFilter.java | 4 ++-- java/org/apache/coyote/http2/Http2UpgradeHandler.java | 4 ++-- java/org/apache/coyote/http2/Stream.java| 3 +++ 13 files changed, 24 insertions(+), 18 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/02: Re-apply code formatting - no functional change
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 d605c66e907b2e2c1a30669af40f0ed1bf725af5
Author: Mark Thomas
AuthorDate: Wed Oct 2 11:47:53 2024 +0100
Re-apply code formatting - no functional change
---
java/org/apache/catalina/authenticator/SpnegoAuthenticator.java | 4 ++--
.../apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java | 3 ++-
.../authenticator/jaspic/PersistentProviderRegistrations.java | 4 ++--
java/org/apache/catalina/core/ApplicationFilterFactory.java | 2 +-
java/org/apache/catalina/core/AprLifecycleListener.java | 2 +-
java/org/apache/catalina/manager/StatusTransformer.java | 2 ++
java/org/apache/catalina/realm/JAASRealm.java | 3 ++-
java/org/apache/catalina/realm/RealmBase.java | 6 +++---
java/org/apache/catalina/servlets/WebdavServlet.java| 1 -
java/org/apache/coyote/AbstractProtocol.java| 4 ++--
java/org/apache/coyote/http11/filters/ChunkedInputFilter.java | 4 ++--
java/org/apache/coyote/http2/Http2UpgradeHandler.java | 4 ++--
12 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
b/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
index 570ce65413..9227238198 100644
--- a/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
@@ -165,8 +165,8 @@ public class SpnegoAuthenticator extends AuthenticatorBase {
authorizationBC.setStart(authorizationBC.getStart() + 10);
byte[] encoded = new byte[authorizationBC.getLength()];
-System.arraycopy(authorizationBC.getBuffer(),
authorizationBC.getStart(),
-encoded, 0, authorizationBC.getLength());
+System.arraycopy(authorizationBC.getBuffer(),
authorizationBC.getStart(), encoded, 0,
+authorizationBC.getLength());
byte[] decoded = Base64.getDecoder().decode(encoded);
if (getApplyJava8u40Fix()) {
diff --git
a/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
b/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
index 73d95329f6..81acb0c4e2 100644
--- a/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
+++ b/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
@@ -658,7 +658,8 @@ public class AuthConfigFactoryImpl extends
AuthConfigFactory {
if (serverAuthConfig == null) {
synchronized (serverAuthConfigLock) {
if (serverAuthConfig == null) {
-serverAuthConfig = new
SingleContextServerAuthConfig(serverAuthModule, this.appContext, handler);
+serverAuthConfig =
+new
SingleContextServerAuthConfig(serverAuthModule, this.appContext, handler);
}
}
}
diff --git
a/java/org/apache/catalina/authenticator/jaspic/PersistentProviderRegistrations.java
b/java/org/apache/catalina/authenticator/jaspic/PersistentProviderRegistrations.java
index 875ab1cff0..9295eb81bf 100644
---
a/java/org/apache/catalina/authenticator/jaspic/PersistentProviderRegistrations.java
+++
b/java/org/apache/catalina/authenticator/jaspic/PersistentProviderRegistrations.java
@@ -111,8 +111,8 @@ public final class PersistentProviderRegistrations {
}
if (!configParent.exists()) {
if (!configParent.mkdirs()) {
-throw new
SecurityException(sm.getString("persistentProviderRegistrations.mkdirsFail",
-configParent.getAbsolutePath()));
+throw new SecurityException(
+
sm.getString("persistentProviderRegistrations.mkdirsFail",
configParent.getAbsolutePath()));
}
}
diff --git a/java/org/apache/catalina/core/ApplicationFilterFactory.java
b/java/org/apache/catalina/core/ApplicationFilterFactory.java
index fe5851bf90..052717e4e1 100644
--- a/java/org/apache/catalina/core/ApplicationFilterFactory.java
+++ b/java/org/apache/catalina/core/ApplicationFilterFactory.java
@@ -91,7 +91,7 @@ public final class ApplicationFilterFactory {
// Acquire the information we will need to match filter mappings
DispatcherType dispatcher = (DispatcherType)
request.getAttribute(Globals.DISPATCHER_TYPE_ATTR);
-String requestPath = FilterUtil.getRequestPath(request) ;
+String requestPath = FilterUtil.getRequestPath(request);
String servletName = wrapper.getName();
diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java
b/java/org/apache/catalina/core/AprLifecycleListener.java
index 2502e1132
(tomcat) 01/02: Simplest way to retain formatting
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 e0d8de393c1aace3f8c0de353030a61862bfaf5e
Author: Mark Thomas
AuthorDate: Wed Oct 2 11:46:51 2024 +0100
Simplest way to retain formatting
---
java/org/apache/coyote/http2/Stream.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index d0257ab17e..7d959e321e 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -805,8 +805,11 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
*
* It is important that this method is not called until any concurrent
processing for the stream has completed. This
* is currently achieved by:
+ *
* - only the StreamProcessor calls this method
+ *
* - the Http2UpgradeHandler does not call this method
+ *
* - this method is called once the StreamProcessor considers the Stream
closed
*
* In theory, the protection against duplicate calls is not required in
this method (the code in StreamProcessor
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/02: Code clean-up - formatting. No functional change.
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 eed64ff5806705ae5779e225d8242be35a1812c5
Author: Mark Thomas
AuthorDate: Wed Oct 2 11:00:34 2024 +0100
Code clean-up - formatting. No functional change.
---
.DS_Store | Bin 0 -> 6148 bytes
java/org/apache/catalina/tribes/ByteMessage.java | 31 +-
java/org/apache/catalina/tribes/Channel.java | 311 -
.../apache/catalina/tribes/ChannelException.java | 59 ++--
.../apache/catalina/tribes/ChannelInterceptor.java | 130 +
.../apache/catalina/tribes/ChannelListener.java| 15 +-
.../org/apache/catalina/tribes/ChannelMessage.java | 32 ++-
.../apache/catalina/tribes/ChannelReceiver.java| 20 +-
java/org/apache/catalina/tribes/ChannelSender.java | 31 +-
java/org/apache/catalina/tribes/ErrorHandler.java | 11 +-
java/org/apache/catalina/tribes/Heartbeat.java | 4 +-
java/org/apache/catalina/tribes/JmxChannel.java| 6 +
.../org/apache/catalina/tribes/ManagedChannel.java | 18 +-
java/org/apache/catalina/tribes/Member.java| 66 +++--
.../apache/catalina/tribes/MembershipListener.java | 8 +-
.../apache/catalina/tribes/MembershipProvider.java | 32 ++-
.../apache/catalina/tribes/MembershipService.java | 63 +++--
.../apache/catalina/tribes/MessageListener.java| 6 +-
.../catalina/tribes/RemoteProcessException.java| 4 +-
java/org/apache/catalina/tribes/UniqueId.java | 20 +-
20 files changed, 525 insertions(+), 342 deletions(-)
diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 00..1b83a3bed8
Binary files /dev/null and b/.DS_Store differ
diff --git a/java/org/apache/catalina/tribes/ByteMessage.java
b/java/org/apache/catalina/tribes/ByteMessage.java
index bf3c4269a3..5afa7da900 100644
--- a/java/org/apache/catalina/tribes/ByteMessage.java
+++ b/java/org/apache/catalina/tribes/ByteMessage.java
@@ -22,21 +22,17 @@ import java.io.ObjectInput;
import java.io.ObjectOutput;
/**
- * A byte message is not serialized and deserialized by the channel
- * instead it is sent as a byte array.
+ * A byte message is not serialized and deserialized by the channel instead it
is sent as a byte array.
*
- * By default Tribes uses java serialization when it receives an object
- * to be sent over the wire. Java serialization is not the most
- * efficient of serializing data, and Tribes might not even
- * have access to the correct class loaders to deserialize the object properly.
+ * By default Tribes uses java serialization when it receives an object to be
sent over the wire. Java serialization is
+ * not the most efficient of serializing data, and Tribes might not even have
access to the correct class loaders to
+ * deserialize the object properly.
*
- * The ByteMessage class is a class where the channel when it receives it will
- * not attempt to perform serialization, instead it will simply stream the
getMessage()
- * bytes.
+ * The ByteMessage class is a class where the channel when it receives it will
not attempt to perform serialization,
+ * instead it will simply stream the getMessage() bytes.
*
- * If you are using multiple applications on top of Tribes you should add some
sort of header
- * so that you can decide with the ChannelListener.accept()
whether this message was intended
- * for you.
+ * If you are using multiple applications on top of Tribes you should add some
sort of header so that you can decide
+ * with the ChannelListener.accept() whether this message was
intended for you.
*/
public class ByteMessage implements Externalizable {
/**
@@ -55,6 +51,7 @@ public class ByteMessage implements Externalizable {
/**
* Creates a byte message with
+ *
* @param data byte[] - the message contents
*/
public ByteMessage(byte[] data) {
@@ -63,6 +60,7 @@ public class ByteMessage implements Externalizable {
/**
* Returns the message contents of this byte message
+ *
* @return byte[] - message contents, can be null
*/
public byte[] getMessage() {
@@ -71,6 +69,7 @@ public class ByteMessage implements Externalizable {
/**
* Sets the message contents of this byte message
+ *
* @param message byte[]
*/
public void setMessage(byte[] message) {
@@ -78,7 +77,7 @@ public class ByteMessage implements Externalizable {
}
@Override
-public void readExternal(ObjectInput in ) throws IOException {
+public void readExternal(ObjectInput in) throws IOException {
int length = in.readInt();
message = new byte[length];
in.readFully(message);
@@ -86,9 +85,9 @@ public class ByteMessage implements Externalizable {
@Override
public void writeExternal(ObjectOutput out) throws IOException {
-out.writeInt(message!=n
(tomcat) 01/02: Updates prior to applying automated code formatting
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 79234b2bb8cd9e1730b9ffac5183b69bcf7ce4ba
Author: Mark Thomas
AuthorDate: Wed Oct 2 10:57:22 2024 +0100
Updates prior to applying automated code formatting
---
java/org/apache/catalina/tribes/ByteMessage.java | 14 +-
java/org/apache/catalina/tribes/Channel.java | 194 -
.../apache/catalina/tribes/ChannelException.java | 3 +-
.../apache/catalina/tribes/ChannelInterceptor.java | 59 ---
.../apache/catalina/tribes/ChannelListener.java| 4 +-
.../org/apache/catalina/tribes/ChannelMessage.java | 4 +-
.../apache/catalina/tribes/ChannelReceiver.java| 3 +-
java/org/apache/catalina/tribes/ChannelSender.java | 5 +-
.../org/apache/catalina/tribes/ManagedChannel.java | 1 -
java/org/apache/catalina/tribes/Member.java| 19 +-
.../apache/catalina/tribes/MembershipProvider.java | 20 ++-
.../apache/catalina/tribes/MembershipService.java | 3 +-
.../catalina/tribes/RemoteProcessException.java| 2 +-
13 files changed, 189 insertions(+), 142 deletions(-)
diff --git a/java/org/apache/catalina/tribes/ByteMessage.java
b/java/org/apache/catalina/tribes/ByteMessage.java
index e6f4b5736b..bf3c4269a3 100644
--- a/java/org/apache/catalina/tribes/ByteMessage.java
+++ b/java/org/apache/catalina/tribes/ByteMessage.java
@@ -23,15 +23,17 @@ import java.io.ObjectOutput;
/**
* A byte message is not serialized and deserialized by the channel
- * instead it is sent as a byte array
+ * instead it is sent as a byte array.
+ *
* By default Tribes uses java serialization when it receives an object
* to be sent over the wire. Java serialization is not the most
* efficient of serializing data, and Tribes might not even
* have access to the correct class loaders to deserialize the object properly.
- *
+ *
* The ByteMessage class is a class where the channel when it receives it will
* not attempt to perform serialization, instead it will simply stream the
getMessage()
- * bytes.
+ * bytes.
+ *
* If you are using multiple applications on top of Tribes you should add some
sort of header
* so that you can decide with the ChannelListener.accept()
whether this message was intended
* for you.
@@ -44,8 +46,9 @@ public class ByteMessage implements Externalizable {
/**
- * Creates an empty byte message
- * Constructor also for deserialization
+ * Creates an empty byte message.
+ *
+ * Constructor also for deserialization.
*/
public ByteMessage() {
}
@@ -88,5 +91,4 @@ public class ByteMessage implements Externalizable {
out.write(message,0,message.length);
}
}
-
}
diff --git a/java/org/apache/catalina/tribes/Channel.java
b/java/org/apache/catalina/tribes/Channel.java
index 73534d22b2..52d4c398db 100644
--- a/java/org/apache/catalina/tribes/Channel.java
+++ b/java/org/apache/catalina/tribes/Channel.java
@@ -25,23 +25,26 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
/**
- * Channel interface
* A channel is a representation of a group of nodes all participating in some
sort of
- * communication with each other.
+ * communication with each other.
+ *
* The channel is the main API class for Tribes, this is essentially the only
class
- * that an application needs to be aware of. Through the channel the
application can:
- * 1. send messages
- * 2. receive message (by registering a ChannelListener
- * 3. get all members of the group getMembers()
- * 4. receive notifications of members added and members disappeared by
- *registering a MembershipListener
- *
- * The channel has 5 major components:
- * 1. Data receiver, with a built in thread pool to receive messages from
other peers
- * 2. Data sender, an implementation for sending data using NIO or java.io
- * 3. Membership listener,listens for membership broadcasts
- * 4. Membership broadcaster, broadcasts membership pings.
- * 5. Channel interceptors, the ability to manipulate messages as they are
sent or arrive
+ * that an application needs to be aware of. Through the channel the
application can:
+ *
+ * send messages
+ * receive message (by registering a ChannelListener
+ * get all members of the group getMembers()
+ * receive notifications of members added and members disappeared by
+ *registering a MembershipListener
+ *
+ * The channel has 5 major components:
+ *
+ * Data receiver, with a built in thread pool to receive messages from
other peers
+ * Data sender, an implementation for sending data using NIO or
java.io
+ * Membership listener,listens for membership broadcasts
+ * Membership broadcaster, broadcasts membership pings.
+ * Channel interceptors, the ability to manipulate messages as they are
sent or arrive
+ *
* The channel layout is:
*
* ChannelListener_1
(tomcat) branch main updated (6dfefeefbe -> eed64ff580)
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 6dfefeefbe Improve debug log in DefaultServlet/WebdavServlet new 79234b2bb8 Updates prior to applying automated code formatting new eed64ff580 Code clean-up - formatting. No functional change. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .DS_Store | Bin 0 -> 6148 bytes java/org/apache/catalina/tribes/ByteMessage.java | 41 +-- java/org/apache/catalina/tribes/Channel.java | 387 - .../apache/catalina/tribes/ChannelException.java | 62 ++-- .../apache/catalina/tribes/ChannelInterceptor.java | 137 +--- .../apache/catalina/tribes/ChannelListener.java| 19 +- .../org/apache/catalina/tribes/ChannelMessage.java | 32 +- .../apache/catalina/tribes/ChannelReceiver.java| 21 +- java/org/apache/catalina/tribes/ChannelSender.java | 32 +- java/org/apache/catalina/tribes/ErrorHandler.java | 11 +- java/org/apache/catalina/tribes/Heartbeat.java | 4 +- java/org/apache/catalina/tribes/JmxChannel.java| 6 + .../org/apache/catalina/tribes/ManagedChannel.java | 19 +- java/org/apache/catalina/tribes/Member.java| 79 +++-- .../apache/catalina/tribes/MembershipListener.java | 8 +- .../apache/catalina/tribes/MembershipProvider.java | 32 +- .../apache/catalina/tribes/MembershipService.java | 64 ++-- .../apache/catalina/tribes/MessageListener.java| 6 +- .../catalina/tribes/RemoteProcessException.java| 6 +- java/org/apache/catalina/tribes/UniqueId.java | 20 +- 20 files changed, 608 insertions(+), 378 deletions(-) create mode 100644 .DS_Store - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/02: Update CheckStyle to 10.18.2
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
commit 0e23b8ad714e2ed12efac0de8fb429b5dbbaa24a
Author: Mark Thomas
AuthorDate: Wed Oct 2 09:01:31 2024 +0100
Update CheckStyle to 10.18.2
---
build.properties.default | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 4bbb959eee..2a528a7d8b 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -283,10 +283,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.18.0
+checkstyle.version=10.18.2
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=4942c46443773ec31b2816249820e6825991f3ef0f7339e3f432692338cea4634811dc631c0d4b4c8d44205c7344603dab43e1196b50e9ab25206cda1921e1b4
+checkstyle.checksum.value=9c2be68e423fbbc301272c4a96824f84b8ccae23103e9653af3cea8546bc87695f17491a95daf66c19bfb1597cc3113e2656a5eb8256b0f5468d3cef56cc0e66
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
-
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 (36834949cc -> 50099e6a9a)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 36834949cc Update ByteBuddy to 1.15.3 new 0e23b8ad71 Update CheckStyle to 10.18.2 new 50099e6a9a Update to CheckStyle 10.18.2 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: build.properties.default | 4 ++-- webapps/docs/changelog.xml | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/02: Update to CheckStyle 10.18.2
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 commit 50099e6a9aa9e92144a4f9a6bc32aa7b239d2105 Author: Mark Thomas AuthorDate: Wed Oct 2 09:04:48 2024 +0100 Update to CheckStyle 10.18.2 --- webapps/docs/changelog.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index c4750d38e9..4d9b158c2a 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -197,6 +197,9 @@ Update Byte Buddy to 1.15.3. (markt) + +Update CheckStyle to 10.18.2. (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 to CheckStyle 10.18.2
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 15a63b962d Update to CheckStyle 10.18.2
15a63b962d is described below
commit 15a63b962d11bea114091b578798b44d0f95722b
Author: Mark Thomas
AuthorDate: Wed Oct 2 09:04:48 2024 +0100
Update to CheckStyle 10.18.2
---
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 8b69bee5bf..b91df9a6a5 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -281,10 +281,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.18.0
+checkstyle.version=10.18.2
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=4942c46443773ec31b2816249820e6825991f3ef0f7339e3f432692338cea4634811dc631c0d4b4c8d44205c7344603dab43e1196b50e9ab25206cda1921e1b4
+checkstyle.checksum.value=9c2be68e423fbbc301272c4a96824f84b8ccae23103e9653af3cea8546bc87695f17491a95daf66c19bfb1597cc3113e2656a5eb8256b0f5468d3cef56cc0e66
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 23212e7cd1..cdec618a5d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -206,6 +206,9 @@
Update Byte Buddy to 1.15.3. (markt)
+
+Update CheckStyle to 10.18.2. (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 to CheckStyle 10.18.2
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 e4aafbd525 Update to CheckStyle 10.18.2
e4aafbd525 is described below
commit e4aafbd5251498bceaada4336a233136afc328ed
Author: Mark Thomas
AuthorDate: Wed Oct 2 09:04:48 2024 +0100
Update to CheckStyle 10.18.2
---
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 48c0ddc63c..9027b22629 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -260,10 +260,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.18.0
+checkstyle.version=10.18.2
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=4942c46443773ec31b2816249820e6825991f3ef0f7339e3f432692338cea4634811dc631c0d4b4c8d44205c7344603dab43e1196b50e9ab25206cda1921e1b4
+checkstyle.checksum.value=9c2be68e423fbbc301272c4a96824f84b8ccae23103e9653af3cea8546bc87695f17491a95daf66c19bfb1597cc3113e2656a5eb8256b0f5468d3cef56cc0e66
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 bfbad742a9..574c237583 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -209,6 +209,9 @@
Update Byte Buddy to 1.15.3. (markt)
+
+Update CheckStyle to 10.18.2. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Update to CheckStyle 10.18.2
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 d70b3c8cd8 Update to CheckStyle 10.18.2
d70b3c8cd8 is described below
commit d70b3c8cd8e4ac3c440799342c82c84a1f454ea4
Author: Mark Thomas
AuthorDate: Wed Oct 2 09:04:48 2024 +0100
Update to CheckStyle 10.18.2
---
build.properties.default | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 3874c0445d..e053d77440 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -260,10 +260,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.18.0
+checkstyle.version=10.18.2
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=4942c46443773ec31b2816249820e6825991f3ef0f7339e3f432692338cea4634811dc631c0d4b4c8d44205c7344603dab43e1196b50e9ab25206cda1921e1b4
+checkstyle.checksum.value=9c2be68e423fbbc301272c4a96824f84b8ccae23103e9653af3cea8546bc87695f17491a95daf66c19bfb1597cc3113e2656a5eb8256b0f5468d3cef56cc0e66
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
-
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 copy/paste error
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 a7a371e028 Fix copy/paste error a7a371e028 is described below commit a7a371e028db7386a2256e45916c94dde39a9675 Author: Mark Thomas AuthorDate: Wed Oct 2 08:59:13 2024 +0100 Fix copy/paste error --- 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 2e27db58ca..bfbad742a9 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -207,7 +207,7 @@ Update to the Eclipse JDT compiler 4.33. (markt) -Update Byte Buddy to 1.15.0. (markt) +Update Byte Buddy to 1.15.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: Update ByteBuddy to 1.15.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 36834949cc Update ByteBuddy to 1.15.3
36834949cc is described below
commit 36834949cc3f596a78dc2ee6989dec67f6975146
Author: Mark Thomas
AuthorDate: Wed Oct 2 08:55:41 2024 +0100
Update ByteBuddy to 1.15.3
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 7 +++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 96eec0f208..4bbb959eee 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -265,10 +265,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.15.0
+bytebuddy.version=1.15.3
bytebuddy.checksum.enabled=true
bytebuddy.checksum.algorithm=MD5|SHA-1
-bytebuddy.checksum.value=e830b0eae8ae0e4b7df4f4ddba23fbe1|a5b1159b91c5334015de0f22ab4b1188cd42bbff
+bytebuddy.checksum.value=3406712dd496bcda0136945c6e77711c|01b3069696cd9ed55d90b9114ffe3429035ff924
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 5e72d13411..c4750d38e9 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -192,6 +192,13 @@
+
+
+
+Update Byte Buddy to 1.15.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 ByteBuddy to 1.15.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 ca9e688046 Update ByteBuddy to 1.15.3
ca9e688046 is described below
commit ca9e68804611199f9fa8b231e6dd5d2b41e8c472
Author: Mark Thomas
AuthorDate: Wed Oct 2 08:55:41 2024 +0100
Update ByteBuddy to 1.15.3
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 7 +++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 82c3b1995a..8b69bee5bf 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -263,10 +263,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.15.0
+bytebuddy.version=1.15.3
bytebuddy.checksum.enabled=true
bytebuddy.checksum.algorithm=MD5|SHA-1
-bytebuddy.checksum.value=e830b0eae8ae0e4b7df4f4ddba23fbe1|a5b1159b91c5334015de0f22ab4b1188cd42bbff
+bytebuddy.checksum.value=3406712dd496bcda0136945c6e77711c|01b3069696cd9ed55d90b9114ffe3429035ff924
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 a2b6ee452f..23212e7cd1 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -201,6 +201,13 @@
+
+
+
+Update Byte Buddy to 1.15.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 ByteBuddy to 1.15.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 fe33f2bf00 Update ByteBuddy to 1.15.3
fe33f2bf00 is described below
commit fe33f2bf009f11aa4b55c5dad4af3d7aa51dd09c
Author: Mark Thomas
AuthorDate: Wed Oct 2 08:55:41 2024 +0100
Update ByteBuddy to 1.15.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 5ebf038414..48c0ddc63c 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -242,10 +242,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.15.0
+bytebuddy.version=1.15.3
bytebuddy.checksum.enabled=true
bytebuddy.checksum.algorithm=MD5|SHA-1
-bytebuddy.checksum.value=e830b0eae8ae0e4b7df4f4ddba23fbe1|a5b1159b91c5334015de0f22ab4b1188cd42bbff
+bytebuddy.checksum.value=3406712dd496bcda0136945c6e77711c|01b3069696cd9ed55d90b9114ffe3429035ff924
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 56f40e2c02..2e27db58ca 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -206,6 +206,9 @@
Update to the Eclipse JDT compiler 4.33. (markt)
+
+Update Byte Buddy to 1.15.0. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Update ByteBuddy to 1.15.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
The following commit(s) were added to refs/heads/main by this push:
new 52226a73d7 Update ByteBuddy to 1.15.3
52226a73d7 is described below
commit 52226a73d7c3db494ebe148a0c5c571859625700
Author: Mark Thomas
AuthorDate: Wed Oct 2 08:55:41 2024 +0100
Update ByteBuddy to 1.15.3
---
build.properties.default | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index e1896d7533..3874c0445d 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -242,10 +242,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.15.0
+bytebuddy.version=1.15.3
bytebuddy.checksum.enabled=true
bytebuddy.checksum.algorithm=MD5|SHA-1
-bytebuddy.checksum.value=e830b0eae8ae0e4b7df4f4ddba23fbe1|a5b1159b91c5334015de0f22ab4b1188cd42bbff
+bytebuddy.checksum.value=3406712dd496bcda0136945c6e77711c|01b3069696cd9ed55d90b9114ffe3429035ff924
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
-
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 ECJ to 4.44 / 3.39.0
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 825d2982a9 Update ECJ to 4.44 / 3.39.0
825d2982a9 is described below
commit 825d2982a97291214386ea380dcd6767190e9f4d
Author: Mark Thomas
AuthorDate: Wed Oct 2 08:44:21 2024 +0100
Update ECJ to 4.44 / 3.39.0
---
build.properties.default | 12 ++--
res/maven/tomcat-embed-jasper.pom | 2 +-
res/maven/tomcat-jasper.pom | 2 +-
webapps/docs/changelog.xml| 7 +++
4 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 4254d0965e..5ebf038414 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -130,15 +130,15 @@ base-maven.loc=https://repo.maven.apache.org/maven2
# - Eclipse JDT, version 4.7 or later -#
# See
https://cwiki.apache.org/confluence/display/TOMCAT/Managing+Tomcat%27s+Dependency+on+the+Eclipse+JDT+Core+Batch+Compiler
#
-# Checksum is from "SHA512 Checksums for 4.31" link at
-# https://download.eclipse.org/eclipse/downloads/drops4/R-4.31-202402290520/
-#
https://download.eclipse.org/eclipse/downloads/drops4/R-4.31-202402290520/checksum/eclipse-4.31-SUMSSHA512
+# Checksum is from "SHA512 Checksums for 4.33" link at
+# https://download.eclipse.org/eclipse/downloads/drops4/R-4.33-202409030240/
+#
https://download.eclipse.org/eclipse/downloads/drops4/R-4.33-202409030240/checksum/eclipse-4.33-SUMSSHA512
#
-jdt.version=4.32
-jdt.release=R-4.32-202406010610
+jdt.version=4.33
+jdt.release=R-4.33-202409030240
jdt.checksum.enabled=true
jdt.checksum.algorithm=SHA-512
-jdt.checksum.value=8937dede817b8c37f23e0b42162bdd0f722e34e40f75a35b9ca45a17bc78c1a0d65ddaa81b5e6916c7cd8895023a04dd6112031c952ab4584e72e6a1f35f1608
+jdt.checksum.value=8b99bf69dc13a8b58a5507818be9222887f33b7120f4e92bcae89af108d38b9412715f6fe749eec0c07fc9bde9d84e5f8deacd74030559fab22f14697c12a1a9
jdt.home=${base.path}/ecj-${jdt.version}
jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
# The download will be moved to the archive area eventually. We are taking
care of that in advance.
diff --git a/res/maven/tomcat-embed-jasper.pom
b/res/maven/tomcat-embed-jasper.pom
index 8cff6b9831..3029bc2225 100644
--- a/res/maven/tomcat-embed-jasper.pom
+++ b/res/maven/tomcat-embed-jasper.pom
@@ -48,7 +48,7 @@
org.eclipse.jdt
ecj
- 3.38.0
+ 3.39.0
diff --git a/res/maven/tomcat-jasper.pom b/res/maven/tomcat-jasper.pom
index 3ffe50a6e4..d410d6f6e6 100644
--- a/res/maven/tomcat-jasper.pom
+++ b/res/maven/tomcat-jasper.pom
@@ -60,7 +60,7 @@
org.eclipse.jdt
ecj
- 3.38.0
+ 3.39.0
org.apache.tomcat
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8b2c40f792..56f40e2c02 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -201,6 +201,13 @@
+
+
+
+Update to the Eclipse JDT compiler 4.33. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Update ECJ to 4.44 / 3.39.0
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 2b7debdc9d Update ECJ to 4.44 / 3.39.0
2b7debdc9d is described below
commit 2b7debdc9dea195cf4d249ee0d6c2333e3d9631c
Author: Mark Thomas
AuthorDate: Wed Oct 2 08:44:21 2024 +0100
Update ECJ to 4.44 / 3.39.0
---
build.properties.default | 12 ++--
res/maven/tomcat-embed-jasper.pom | 2 +-
res/maven/tomcat-jasper.pom | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index fd3096d497..e1896d7533 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -130,15 +130,15 @@ base-maven.loc=https://repo.maven.apache.org/maven2
# - Eclipse JDT, version 4.7 or later -#
# See
https://cwiki.apache.org/confluence/display/TOMCAT/Managing+Tomcat%27s+Dependency+on+the+Eclipse+JDT+Core+Batch+Compiler
#
-# Checksum is from "SHA512 Checksums for 4.31" link at
-# https://download.eclipse.org/eclipse/downloads/drops4/R-4.32-202406010610/
-#
https://download.eclipse.org/eclipse/downloads/drops4/R-4.32-202406010610/checksum/eclipse-4.32-SUMSSHA512
+# Checksum is from "SHA512 Checksums for 4.33" link at
+# https://download.eclipse.org/eclipse/downloads/drops4/R-4.33-202409030240/
+#
https://download.eclipse.org/eclipse/downloads/drops4/R-4.33-202409030240/checksum/eclipse-4.33-SUMSSHA512
#
-jdt.version=4.32
-jdt.release=R-4.32-202406010610
+jdt.version=4.33
+jdt.release=R-4.33-202409030240
jdt.checksum.enabled=true
jdt.checksum.algorithm=SHA-512
-jdt.checksum.value=8937dede817b8c37f23e0b42162bdd0f722e34e40f75a35b9ca45a17bc78c1a0d65ddaa81b5e6916c7cd8895023a04dd6112031c952ab4584e72e6a1f35f1608
+jdt.checksum.value=8b99bf69dc13a8b58a5507818be9222887f33b7120f4e92bcae89af108d38b9412715f6fe749eec0c07fc9bde9d84e5f8deacd74030559fab22f14697c12a1a9
jdt.home=${base.path}/ecj-${jdt.version}
jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
# The download will be moved to the archive area eventually. We are taking
care of that in advance.
diff --git a/res/maven/tomcat-embed-jasper.pom
b/res/maven/tomcat-embed-jasper.pom
index 8cff6b9831..3029bc2225 100644
--- a/res/maven/tomcat-embed-jasper.pom
+++ b/res/maven/tomcat-embed-jasper.pom
@@ -48,7 +48,7 @@
org.eclipse.jdt
ecj
- 3.38.0
+ 3.39.0
diff --git a/res/maven/tomcat-jasper.pom b/res/maven/tomcat-jasper.pom
index 3ffe50a6e4..d410d6f6e6 100644
--- a/res/maven/tomcat-jasper.pom
+++ b/res/maven/tomcat-jasper.pom
@@ -60,7 +60,7 @@
org.eclipse.jdt
ecj
- 3.38.0
+ 3.39.0
org.apache.tomcat
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/02: Better comment and some trace level logging
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
commit b4ceb9b50634a27e20312d9fe1cf77462fd83177
Author: Mark Thomas
AuthorDate: Tue Oct 1 18:23:07 2024 +0100
Better comment and some trace level logging
---
java/org/apache/coyote/http2/Http2UpgradeHandler.java | 16 +++-
java/org/apache/coyote/http2/LocalStrings.properties | 2 ++
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 8b31ebc319..49b9734561 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -1879,9 +1879,23 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
void replaceStream(AbstractNonZeroStream original, AbstractNonZeroStream
replacement) {
AbstractNonZeroStream current = streams.get(original.getIdentifier());
-// Only replace the stream if it currently uses the full
implementation.
+/*
+ * Only replace the Stream once. No point replacing one RecycledStream
instance with another.
+ *
+ * This method is called from both StreamProcessor and
Http2UpgradeHandler which may be operating on the Stream
+ * concurrently. It is therefore expected that there will be duplicate
calls to this method - primarily
+ * triggered by stream errors when processing incoming frames.
+ */
if (current instanceof Stream) {
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("upgradeHandler.replace.first",
getConnectionId(), original.getIdAsString()));
+}
streams.put(original.getIdentifier(), replacement);
+} else {
+if (log.isTraceEnabled()) {
+log.trace(sm.getString(
+"upgradeHandler.replace.duplicate", getConnectionId(),
original.getIdAsString()));
+}
}
}
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties
b/java/org/apache/coyote/http2/LocalStrings.properties
index 6bdb05696a..48c7ab33f6 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -148,6 +148,8 @@ upgradeHandler.pruneIncomplete=Connection [{0}], Stream
[{1}], Failed to fully p
upgradeHandler.pruneStart=Connection [{0}] Starting pruning of old streams.
Limit is [{1}] and there are currently [{2}] streams.
upgradeHandler.pruned=Connection [{0}] Pruned completed stream [{1}]
upgradeHandler.releaseBacklog=Connection [{0}], Stream [{1}] released from
backlog
+upgradeHandler.replace.duplicate=Connection [{0}], Stream [{1}] duplicate
attempt to replace stream with lightweight implementation has been ignored
+upgradeHandler.replace.first=Connection [{0}], Stream [{1}] replaced with
lightweight stream implementation
upgradeHandler.reset.receive=Connection [{0}], Stream [{1}], Reset received
due to [{2}]
upgradeHandler.rst.debug=Connection [{0}], Stream [{1}], Error [{2}], Message
[{3}], RST (closing stream)
upgradeHandler.sendPrefaceFail=Connection [{0}], Failed to send preface to
client
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/02: Split Stream.recycle() into replace() and recycle()
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
commit 47307ee27abcdea2ee40e33897aca760083de46a
Author: Mark Thomas
AuthorDate: Tue Oct 1 18:27:02 2024 +0100
Split Stream.recycle() into replace() and recycle()
Ensures recycle() is called no more than once.
There are some error conditions that now no longer call recycle() to
avoid the risk of duplicate calls to recycle if a Stream is being
processed by a StreamProcessor at the same time Http2UpgradeHandler
detects a Stream level error.
---
.../apache/coyote/http2/LocalStrings.properties| 3 +-
java/org/apache/coyote/http2/Stream.java | 50 ++
java/org/apache/coyote/http2/StreamProcessor.java | 11 ++---
webapps/docs/changelog.xml | 6 +++
4 files changed, 55 insertions(+), 15 deletions(-)
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties
b/java/org/apache/coyote/http2/LocalStrings.properties
index 48c7ab33f6..e1fd352878 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -109,7 +109,8 @@ stream.inputBuffer.signal=Data added to inBuffer when read
thread is waiting. Si
stream.inputBuffer.swallowUnread=Swallowing [{0}] bytes previously read into
input stream buffer
stream.notWritable=Connection [{0}], Stream [{1}], This stream is not writable
stream.outputBuffer.flush.debug=Connection [{0}], Stream [{1}], flushing
output with buffer at position [{2}], writeInProgress [{3}] and closed [{4}]
-stream.recycle=Connection [{0}], Stream [{1}] has been recycled
+stream.recycle.duplicate=Connection [{0}], Stream [{1}] Duplicate request to
recycle the associated request and response has been ignored
+stream.recycle.first=Connection [{0}], Stream [{1}] The associated request and
response have been recycled
stream.reset.fail=Connection [{0}], Stream [{1}], Failed to reset stream
stream.reset.receive=Connection [{0}], Stream [{1}], Reset received due to
[{2}]
stream.reset.send=Connection [{0}], Stream [{1}], Reset sent due to [{2}]
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index 5ddb007d9f..0384c513fe 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -110,6 +110,9 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
private volatile int urgency = Priority.DEFAULT_URGENCY;
private volatile boolean incremental = Priority.DEFAULT_INCREMENTAL;
+private final Object recycledLock = new Object();
+private volatile boolean recycled = false;
+
Stream(Integer identifier, Http2UpgradeHandler handler) {
this(identifier, handler, null);
@@ -784,20 +787,15 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
} else {
handler.closeConnection(http2Exception);
}
-recycle();
+replace();
}
/*
- * This method is called recycle for consistency with the rest of the
Tomcat code base. Currently, it calls the
- * handler to replace this stream with an implementation that uses less
memory. It does not fully recycle the Stream
- * ready for re-use since Stream objects are not re-used. This is useful
because Stream instances are retained for a
- * period after the Stream closes.
+ * This method calls the handler to replace this stream with an
implementation that uses less memory. This is useful
+ * because Stream instances are retained for a period after the Stream
closes.
*/
-final void recycle() {
-if (log.isTraceEnabled()) {
-log.trace(sm.getString("stream.recycle", getConnectionId(),
getIdAsString()));
-}
+final void replace() {
int remaining;
// May be null if stream was closed before any DATA frames were
processed.
ByteBuffer inputByteBuffer = getInputByteBuffer(false);
@@ -807,6 +805,40 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
remaining = inputByteBuffer.remaining();
}
handler.replaceStream(this, new RecycledStream(getConnectionId(),
getIdentifier(), state, remaining));
+}
+
+
+/*
+ * This method is called recycle for consistency with the rest of the
Tomcat code base. It does not recycle the
+ * Stream since Stream objects are not re-used. It does recycle the
request and response objects and ensures that
+ * this is only done once.
+ *
+ * replace() should have been called before calling this method.
+ *
+ * It is important that this method is not called until any concurrent
processing for the stream has completed. This
+ * is currently achieved by:
+ * - only the StreamProcessor calls this method
+
(tomcat) branch 9.0.x updated (95449b8720 -> 47307ee27a)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 95449b8720 Fix test new b4ceb9b506 Better comment and some trace level logging new 47307ee27a Split Stream.recycle() into replace() and recycle() The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/coyote/http2/Http2UpgradeHandler.java | 16 ++- .../apache/coyote/http2/LocalStrings.properties| 5 ++- java/org/apache/coyote/http2/Stream.java | 50 ++ java/org/apache/coyote/http2/StreamProcessor.java | 11 ++--- webapps/docs/changelog.xml | 6 +++ 5 files changed, 72 insertions(+), 16 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/02: Better comment and some trace level logging
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
commit f7057dd177df0b35e50df371525d430056a2ea1a
Author: Mark Thomas
AuthorDate: Tue Oct 1 18:23:07 2024 +0100
Better comment and some trace level logging
---
java/org/apache/coyote/http2/Http2UpgradeHandler.java | 16 +++-
java/org/apache/coyote/http2/LocalStrings.properties | 2 ++
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 0e4d94ed5d..18e7dcdcb8 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -1882,9 +1882,23 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
void replaceStream(AbstractNonZeroStream original, AbstractNonZeroStream
replacement) {
AbstractNonZeroStream current = streams.get(original.getIdentifier());
-// Only replace the stream if it currently uses the full
implementation.
+/*
+ * Only replace the Stream once. No point replacing one RecycledStream
instance with another.
+ *
+ * This method is called from both StreamProcessor and
Http2UpgradeHandler which may be operating on the Stream
+ * concurrently. It is therefore expected that there will be duplicate
calls to this method - primarily
+ * triggered by stream errors when processing incoming frames.
+ */
if (current instanceof Stream) {
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("upgradeHandler.replace.first",
getConnectionId(), original.getIdAsString()));
+}
streams.put(original.getIdentifier(), replacement);
+} else {
+if (log.isTraceEnabled()) {
+log.trace(sm.getString(
+"upgradeHandler.replace.duplicate", getConnectionId(),
original.getIdAsString()));
+}
}
}
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties
b/java/org/apache/coyote/http2/LocalStrings.properties
index 6bdb05696a..48c7ab33f6 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -148,6 +148,8 @@ upgradeHandler.pruneIncomplete=Connection [{0}], Stream
[{1}], Failed to fully p
upgradeHandler.pruneStart=Connection [{0}] Starting pruning of old streams.
Limit is [{1}] and there are currently [{2}] streams.
upgradeHandler.pruned=Connection [{0}] Pruned completed stream [{1}]
upgradeHandler.releaseBacklog=Connection [{0}], Stream [{1}] released from
backlog
+upgradeHandler.replace.duplicate=Connection [{0}], Stream [{1}] duplicate
attempt to replace stream with lightweight implementation has been ignored
+upgradeHandler.replace.first=Connection [{0}], Stream [{1}] replaced with
lightweight stream implementation
upgradeHandler.reset.receive=Connection [{0}], Stream [{1}], Reset received
due to [{2}]
upgradeHandler.rst.debug=Connection [{0}], Stream [{1}], Error [{2}], Message
[{3}], RST (closing stream)
upgradeHandler.sendPrefaceFail=Connection [{0}], Failed to send preface to
client
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/02: Split Stream.recycle() into replace() and recycle()
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
commit 146f94f87ea398fb592c7a20a5ccbef95e9dd72b
Author: Mark Thomas
AuthorDate: Tue Oct 1 18:27:02 2024 +0100
Split Stream.recycle() into replace() and recycle()
Ensures recycle() is called no more than once.
There are some error conditions that now no longer call recycle() to
avoid the risk of duplicate calls to recycle if a Stream is being
processed by a StreamProcessor at the same time Http2UpgradeHandler
detects a Stream level error.
---
.../apache/coyote/http2/LocalStrings.properties| 3 +-
java/org/apache/coyote/http2/Stream.java | 50 ++
java/org/apache/coyote/http2/StreamProcessor.java | 11 ++---
webapps/docs/changelog.xml | 6 +++
4 files changed, 55 insertions(+), 15 deletions(-)
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties
b/java/org/apache/coyote/http2/LocalStrings.properties
index 48c7ab33f6..e1fd352878 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -109,7 +109,8 @@ stream.inputBuffer.signal=Data added to inBuffer when read
thread is waiting. Si
stream.inputBuffer.swallowUnread=Swallowing [{0}] bytes previously read into
input stream buffer
stream.notWritable=Connection [{0}], Stream [{1}], This stream is not writable
stream.outputBuffer.flush.debug=Connection [{0}], Stream [{1}], flushing
output with buffer at position [{2}], writeInProgress [{3}] and closed [{4}]
-stream.recycle=Connection [{0}], Stream [{1}] has been recycled
+stream.recycle.duplicate=Connection [{0}], Stream [{1}] Duplicate request to
recycle the associated request and response has been ignored
+stream.recycle.first=Connection [{0}], Stream [{1}] The associated request and
response have been recycled
stream.reset.fail=Connection [{0}], Stream [{1}], Failed to reset stream
stream.reset.receive=Connection [{0}], Stream [{1}], Reset received due to
[{2}]
stream.reset.send=Connection [{0}], Stream [{1}], Reset sent due to [{2}]
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index b2a36fc2e2..c8596933be 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -109,6 +109,9 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
private volatile int urgency = Priority.DEFAULT_URGENCY;
private volatile boolean incremental = Priority.DEFAULT_INCREMENTAL;
+private final Object recycledLock = new Object();
+private volatile boolean recycled = false;
+
Stream(Integer identifier, Http2UpgradeHandler handler) {
this(identifier, handler, null);
@@ -784,20 +787,15 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
} else {
handler.closeConnection(http2Exception);
}
-recycle();
+replace();
}
/*
- * This method is called recycle for consistency with the rest of the
Tomcat code base. Currently, it calls the
- * handler to replace this stream with an implementation that uses less
memory. It does not fully recycle the Stream
- * ready for re-use since Stream objects are not re-used. This is useful
because Stream instances are retained for a
- * period after the Stream closes.
+ * This method calls the handler to replace this stream with an
implementation that uses less memory. This is useful
+ * because Stream instances are retained for a period after the Stream
closes.
*/
-final void recycle() {
-if (log.isTraceEnabled()) {
-log.trace(sm.getString("stream.recycle", getConnectionId(),
getIdAsString()));
-}
+final void replace() {
int remaining;
// May be null if stream was closed before any DATA frames were
processed.
ByteBuffer inputByteBuffer = getInputByteBuffer(false);
@@ -807,6 +805,40 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
remaining = inputByteBuffer.remaining();
}
handler.replaceStream(this, new RecycledStream(getConnectionId(),
getIdentifier(), state, remaining));
+}
+
+
+/*
+ * This method is called recycle for consistency with the rest of the
Tomcat code base. It does not recycle the
+ * Stream since Stream objects are not re-used. It does recycle the
request and response objects and ensures that
+ * this is only done once.
+ *
+ * replace() should have been called before calling this method.
+ *
+ * It is important that this method is not called until any concurrent
processing for the stream has completed. This
+ * is currently achieved by:
+ * - only the StreamProcessor calls this method
+
(tomcat) branch 10.1.x updated (eb0c006d84 -> 146f94f87e)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from eb0c006d84 Fix test new f7057dd177 Better comment and some trace level logging new 146f94f87e Split Stream.recycle() into replace() and recycle() The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/coyote/http2/Http2UpgradeHandler.java | 16 ++- .../apache/coyote/http2/LocalStrings.properties| 5 ++- java/org/apache/coyote/http2/Stream.java | 50 ++ java/org/apache/coyote/http2/StreamProcessor.java | 11 ++--- webapps/docs/changelog.xml | 6 +++ 5 files changed, 72 insertions(+), 16 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/02: Split Stream.recycle() into replace() and recycle()
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
commit 9e840ccacb40881c03a03b1e0746bfba7369b3bd
Author: Mark Thomas
AuthorDate: Tue Oct 1 18:27:02 2024 +0100
Split Stream.recycle() into replace() and recycle()
Ensures recycle() is called no more than once.
There are some error conditions that now no longer call recycle() to
avoid the risk of duplicate calls to recycle if a Stream is being
processed by a StreamProcessor at the same time Http2UpgradeHandler
detects a Stream level error.
---
.../apache/coyote/http2/LocalStrings.properties| 3 +-
java/org/apache/coyote/http2/Stream.java | 50 ++
java/org/apache/coyote/http2/StreamProcessor.java | 11 ++---
webapps/docs/changelog.xml | 6 +++
4 files changed, 55 insertions(+), 15 deletions(-)
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties
b/java/org/apache/coyote/http2/LocalStrings.properties
index 2efeefedd8..a25ead24a7 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -109,7 +109,8 @@ stream.inputBuffer.signal=Data added to inBuffer when read
thread is waiting. Si
stream.inputBuffer.swallowUnread=Swallowing [{0}] bytes previously read into
input stream buffer
stream.notWritable=Connection [{0}], Stream [{1}], This stream is not writable
stream.outputBuffer.flush.debug=Connection [{0}], Stream [{1}], flushing
output with buffer at position [{2}], writeInProgress [{3}] and closed [{4}]
-stream.recycle=Connection [{0}], Stream [{1}] has been recycled
+stream.recycle.duplicate=Connection [{0}], Stream [{1}] Duplicate request to
recycle the associated request and response has been ignored
+stream.recycle.first=Connection [{0}], Stream [{1}] The associated request and
response have been recycled
stream.reset.fail=Connection [{0}], Stream [{1}], Failed to reset stream
stream.reset.receive=Connection [{0}], Stream [{1}], Reset received due to
[{2}]
stream.reset.send=Connection [{0}], Stream [{1}], Reset sent due to [{2}]
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index 08b1fc8a02..d0257ab17e 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -106,6 +106,9 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
private volatile int urgency = Priority.DEFAULT_URGENCY;
private volatile boolean incremental = Priority.DEFAULT_INCREMENTAL;
+private final Object recycledLock = new Object();
+private volatile boolean recycled = false;
+
Stream(Integer identifier, Http2UpgradeHandler handler) {
this(identifier, handler, null);
@@ -772,20 +775,15 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
} else {
handler.closeConnection(http2Exception);
}
-recycle();
+replace();
}
/*
- * This method is called recycle for consistency with the rest of the
Tomcat code base. Currently, it calls the
- * handler to replace this stream with an implementation that uses less
memory. It does not fully recycle the Stream
- * ready for re-use since Stream objects are not re-used. This is useful
because Stream instances are retained for a
- * period after the Stream closes.
+ * This method calls the handler to replace this stream with an
implementation that uses less memory. This is useful
+ * because Stream instances are retained for a period after the Stream
closes.
*/
-final void recycle() {
-if (log.isTraceEnabled()) {
-log.trace(sm.getString("stream.recycle", getConnectionId(),
getIdAsString()));
-}
+final void replace() {
int remaining;
// May be null if stream was closed before any DATA frames were
processed.
ByteBuffer inputByteBuffer = getInputByteBuffer(false);
@@ -795,6 +793,40 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
remaining = inputByteBuffer.remaining();
}
handler.replaceStream(this, new RecycledStream(getConnectionId(),
getIdentifier(), state, remaining));
+}
+
+
+/*
+ * This method is called recycle for consistency with the rest of the
Tomcat code base. It does not recycle the
+ * Stream since Stream objects are not re-used. It does recycle the
request and response objects and ensures that
+ * this is only done once.
+ *
+ * replace() should have been called before calling this method.
+ *
+ * It is important that this method is not called until any concurrent
processing for the stream has completed. This
+ * is currently achieved by:
+ * - only the StreamProcessor calls this method
+
(tomcat) 01/02: Better comment and some trace level logging
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
commit 82da53e84c2b1bf75da4d867970352aa1731ea9c
Author: Mark Thomas
AuthorDate: Tue Oct 1 18:23:07 2024 +0100
Better comment and some trace level logging
---
java/org/apache/coyote/http2/Http2UpgradeHandler.java | 16 +++-
java/org/apache/coyote/http2/LocalStrings.properties | 2 ++
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 22b4f37849..de0a69d2d5 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -1803,9 +1803,23 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
void replaceStream(AbstractNonZeroStream original, AbstractNonZeroStream
replacement) {
AbstractNonZeroStream current = streams.get(original.getIdentifier());
-// Only replace the stream if it currently uses the full
implementation.
+/*
+ * Only replace the Stream once. No point replacing one RecycledStream
instance with another.
+ *
+ * This method is called from both StreamProcessor and
Http2UpgradeHandler which may be operating on the Stream
+ * concurrently. It is therefore expected that there will be duplicate
calls to this method - primarily
+ * triggered by stream errors when processing incoming frames.
+ */
if (current instanceof Stream) {
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("upgradeHandler.replace.first",
getConnectionId(), original.getIdAsString()));
+}
streams.put(original.getIdentifier(), replacement);
+} else {
+if (log.isTraceEnabled()) {
+log.trace(sm.getString(
+"upgradeHandler.replace.duplicate", getConnectionId(),
original.getIdAsString()));
+}
}
}
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties
b/java/org/apache/coyote/http2/LocalStrings.properties
index 4861c582f3..2efeefedd8 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -148,6 +148,8 @@ upgradeHandler.pruneIncomplete=Connection [{0}], Stream
[{1}], Failed to fully p
upgradeHandler.pruneStart=Connection [{0}] Starting pruning of old streams.
Limit is [{1}] and there are currently [{2}] streams.
upgradeHandler.pruned=Connection [{0}] Pruned completed stream [{1}]
upgradeHandler.releaseBacklog=Connection [{0}], Stream [{1}] released from
backlog
+upgradeHandler.replace.duplicate=Connection [{0}], Stream [{1}] duplicate
attempt to replace stream with lightweight implementation has been ignored
+upgradeHandler.replace.first=Connection [{0}], Stream [{1}] replaced with
lightweight stream implementation
upgradeHandler.reset.receive=Connection [{0}], Stream [{1}], Reset received
due to [{2}]
upgradeHandler.rst.debug=Connection [{0}], Stream [{1}], Error [{2}], Message
[{3}], RST (closing stream)
upgradeHandler.sendPrefaceFail=Connection [{0}], Failed to send preface to
client
-
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 (9c2cb75c79 -> 9e840ccacb)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 11.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 9c2cb75c79 Fix test new 82da53e84c Better comment and some trace level logging new 9e840ccacb Split Stream.recycle() into replace() and recycle() The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/coyote/http2/Http2UpgradeHandler.java | 16 ++- .../apache/coyote/http2/LocalStrings.properties| 5 ++- java/org/apache/coyote/http2/Stream.java | 50 ++ java/org/apache/coyote/http2/StreamProcessor.java | 11 ++--- webapps/docs/changelog.xml | 6 +++ 5 files changed, 72 insertions(+), 16 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/02: Better comment and some trace level logging
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 69435ddf503b233fcd6462f09c4d88aaa9e8add5
Author: Mark Thomas
AuthorDate: Tue Oct 1 18:23:07 2024 +0100
Better comment and some trace level logging
---
java/org/apache/coyote/http2/Http2UpgradeHandler.java | 16 +++-
java/org/apache/coyote/http2/LocalStrings.properties | 2 ++
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 22b4f37849..de0a69d2d5 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -1803,9 +1803,23 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
void replaceStream(AbstractNonZeroStream original, AbstractNonZeroStream
replacement) {
AbstractNonZeroStream current = streams.get(original.getIdentifier());
-// Only replace the stream if it currently uses the full
implementation.
+/*
+ * Only replace the Stream once. No point replacing one RecycledStream
instance with another.
+ *
+ * This method is called from both StreamProcessor and
Http2UpgradeHandler which may be operating on the Stream
+ * concurrently. It is therefore expected that there will be duplicate
calls to this method - primarily
+ * triggered by stream errors when processing incoming frames.
+ */
if (current instanceof Stream) {
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("upgradeHandler.replace.first",
getConnectionId(), original.getIdAsString()));
+}
streams.put(original.getIdentifier(), replacement);
+} else {
+if (log.isTraceEnabled()) {
+log.trace(sm.getString(
+"upgradeHandler.replace.duplicate", getConnectionId(),
original.getIdAsString()));
+}
}
}
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties
b/java/org/apache/coyote/http2/LocalStrings.properties
index 4861c582f3..2efeefedd8 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -148,6 +148,8 @@ upgradeHandler.pruneIncomplete=Connection [{0}], Stream
[{1}], Failed to fully p
upgradeHandler.pruneStart=Connection [{0}] Starting pruning of old streams.
Limit is [{1}] and there are currently [{2}] streams.
upgradeHandler.pruned=Connection [{0}] Pruned completed stream [{1}]
upgradeHandler.releaseBacklog=Connection [{0}], Stream [{1}] released from
backlog
+upgradeHandler.replace.duplicate=Connection [{0}], Stream [{1}] duplicate
attempt to replace stream with lightweight implementation has been ignored
+upgradeHandler.replace.first=Connection [{0}], Stream [{1}] replaced with
lightweight stream implementation
upgradeHandler.reset.receive=Connection [{0}], Stream [{1}], Reset received
due to [{2}]
upgradeHandler.rst.debug=Connection [{0}], Stream [{1}], Error [{2}], Message
[{3}], RST (closing stream)
upgradeHandler.sendPrefaceFail=Connection [{0}], Failed to send preface to
client
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/02: Split Stream.recycle() into replace() and recycle()
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 63edfb3ecfc6b0d3aa909abecd7ab9ddc6bf
Author: Mark Thomas
AuthorDate: Tue Oct 1 18:27:02 2024 +0100
Split Stream.recycle() into replace() and recycle()
Ensures recycle() is called no more than once.
There are some error conditions that now no longer call recycle() to
avoid the risk of duplicate calls to recycle if a Stream is being
processed by a StreamProcessor at the same time Http2UpgradeHandler
detects a Stream level error.
---
.../apache/coyote/http2/LocalStrings.properties| 3 +-
java/org/apache/coyote/http2/Stream.java | 50 ++
java/org/apache/coyote/http2/StreamProcessor.java | 11 ++---
3 files changed, 49 insertions(+), 15 deletions(-)
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties
b/java/org/apache/coyote/http2/LocalStrings.properties
index 2efeefedd8..a25ead24a7 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -109,7 +109,8 @@ stream.inputBuffer.signal=Data added to inBuffer when read
thread is waiting. Si
stream.inputBuffer.swallowUnread=Swallowing [{0}] bytes previously read into
input stream buffer
stream.notWritable=Connection [{0}], Stream [{1}], This stream is not writable
stream.outputBuffer.flush.debug=Connection [{0}], Stream [{1}], flushing
output with buffer at position [{2}], writeInProgress [{3}] and closed [{4}]
-stream.recycle=Connection [{0}], Stream [{1}] has been recycled
+stream.recycle.duplicate=Connection [{0}], Stream [{1}] Duplicate request to
recycle the associated request and response has been ignored
+stream.recycle.first=Connection [{0}], Stream [{1}] The associated request and
response have been recycled
stream.reset.fail=Connection [{0}], Stream [{1}], Failed to reset stream
stream.reset.receive=Connection [{0}], Stream [{1}], Reset received due to
[{2}]
stream.reset.send=Connection [{0}], Stream [{1}], Reset sent due to [{2}]
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index 08b1fc8a02..d0257ab17e 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -106,6 +106,9 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
private volatile int urgency = Priority.DEFAULT_URGENCY;
private volatile boolean incremental = Priority.DEFAULT_INCREMENTAL;
+private final Object recycledLock = new Object();
+private volatile boolean recycled = false;
+
Stream(Integer identifier, Http2UpgradeHandler handler) {
this(identifier, handler, null);
@@ -772,20 +775,15 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
} else {
handler.closeConnection(http2Exception);
}
-recycle();
+replace();
}
/*
- * This method is called recycle for consistency with the rest of the
Tomcat code base. Currently, it calls the
- * handler to replace this stream with an implementation that uses less
memory. It does not fully recycle the Stream
- * ready for re-use since Stream objects are not re-used. This is useful
because Stream instances are retained for a
- * period after the Stream closes.
+ * This method calls the handler to replace this stream with an
implementation that uses less memory. This is useful
+ * because Stream instances are retained for a period after the Stream
closes.
*/
-final void recycle() {
-if (log.isTraceEnabled()) {
-log.trace(sm.getString("stream.recycle", getConnectionId(),
getIdAsString()));
-}
+final void replace() {
int remaining;
// May be null if stream was closed before any DATA frames were
processed.
ByteBuffer inputByteBuffer = getInputByteBuffer(false);
@@ -795,6 +793,40 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
remaining = inputByteBuffer.remaining();
}
handler.replaceStream(this, new RecycledStream(getConnectionId(),
getIdentifier(), state, remaining));
+}
+
+
+/*
+ * This method is called recycle for consistency with the rest of the
Tomcat code base. It does not recycle the
+ * Stream since Stream objects are not re-used. It does recycle the
request and response objects and ensures that
+ * this is only done once.
+ *
+ * replace() should have been called before calling this method.
+ *
+ * It is important that this method is not called until any concurrent
processing for the stream has completed. This
+ * is currently achieved by:
+ * - only the StreamProcessor calls this method
+ * - the Http2UpgradeHandler does not call this method
+ * - this
(tomcat) branch main updated (217aca2641 -> 63edfb3ec4)
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 217aca2641 Fix test new 69435ddf50 Better comment and some trace level logging new 63edfb3ec4 Split Stream.recycle() into replace() and recycle() The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/coyote/http2/Http2UpgradeHandler.java | 16 ++- .../apache/coyote/http2/LocalStrings.properties| 5 ++- java/org/apache/coyote/http2/Stream.java | 50 ++ java/org/apache/coyote/http2/StreamProcessor.java | 11 ++--- 4 files changed, 66 insertions(+), 16 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Update comment to reflect current usage
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 a0bff61cac Update comment to reflect current usage
a0bff61cac is described below
commit a0bff61cacf8172d00a38d1a907221050b6a398b
Author: Mark Thomas
AuthorDate: Tue Oct 1 10:50:34 2024 +0100
Update comment to reflect current usage
---
java/org/apache/coyote/http2/RecycledStream.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/coyote/http2/RecycledStream.java
b/java/org/apache/coyote/http2/RecycledStream.java
index fc689f7c2a..54ca63399b 100644
--- a/java/org/apache/coyote/http2/RecycledStream.java
+++ b/java/org/apache/coyote/http2/RecycledStream.java
@@ -19,8 +19,8 @@ package org.apache.coyote.http2;
import java.nio.ByteBuffer;
/**
- * Represents a closed stream in the priority tree. Used in preference to the
full {@link Stream} as has much lower
- * memory usage.
+ * Represents a closed stream and is used to correctly respond to (or ignore)
frames for the stream that are processed
+ * after the stream has been closed. Used in preference to the full {@link
Stream} as has much lower memory usage.
*/
class RecycledStream extends AbstractNonZeroStream {
-
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 comment to reflect current usage
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 af56d56fb1 Update comment to reflect current usage
af56d56fb1 is described below
commit af56d56fb1b1bbbc57847e756be8926f734a5930
Author: Mark Thomas
AuthorDate: Tue Oct 1 10:50:34 2024 +0100
Update comment to reflect current usage
---
java/org/apache/coyote/http2/RecycledStream.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/coyote/http2/RecycledStream.java
b/java/org/apache/coyote/http2/RecycledStream.java
index fc689f7c2a..54ca63399b 100644
--- a/java/org/apache/coyote/http2/RecycledStream.java
+++ b/java/org/apache/coyote/http2/RecycledStream.java
@@ -19,8 +19,8 @@ package org.apache.coyote.http2;
import java.nio.ByteBuffer;
/**
- * Represents a closed stream in the priority tree. Used in preference to the
full {@link Stream} as has much lower
- * memory usage.
+ * Represents a closed stream and is used to correctly respond to (or ignore)
frames for the stream that are processed
+ * after the stream has been closed. Used in preference to the full {@link
Stream} as has much lower memory usage.
*/
class RecycledStream extends AbstractNonZeroStream {
-
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 comment to reflect current usage
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 f09344f4b0 Update comment to reflect current usage
f09344f4b0 is described below
commit f09344f4b0cbce9451a4ebd591ab60bc298f3d46
Author: Mark Thomas
AuthorDate: Tue Oct 1 10:50:34 2024 +0100
Update comment to reflect current usage
---
java/org/apache/coyote/http2/RecycledStream.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/coyote/http2/RecycledStream.java
b/java/org/apache/coyote/http2/RecycledStream.java
index fc689f7c2a..54ca63399b 100644
--- a/java/org/apache/coyote/http2/RecycledStream.java
+++ b/java/org/apache/coyote/http2/RecycledStream.java
@@ -19,8 +19,8 @@ package org.apache.coyote.http2;
import java.nio.ByteBuffer;
/**
- * Represents a closed stream in the priority tree. Used in preference to the
full {@link Stream} as has much lower
- * memory usage.
+ * Represents a closed stream and is used to correctly respond to (or ignore)
frames for the stream that are processed
+ * after the stream has been closed. Used in preference to the full {@link
Stream} as has much lower memory usage.
*/
class RecycledStream extends AbstractNonZeroStream {
-
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 comment to reflect current usage
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 39df7df125 Update comment to reflect current usage
39df7df125 is described below
commit 39df7df1257f3ed048165d934bcd3cceffd3ea35
Author: Mark Thomas
AuthorDate: Tue Oct 1 10:50:34 2024 +0100
Update comment to reflect current usage
---
java/org/apache/coyote/http2/RecycledStream.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/coyote/http2/RecycledStream.java
b/java/org/apache/coyote/http2/RecycledStream.java
index fc689f7c2a..54ca63399b 100644
--- a/java/org/apache/coyote/http2/RecycledStream.java
+++ b/java/org/apache/coyote/http2/RecycledStream.java
@@ -19,8 +19,8 @@ package org.apache.coyote.http2;
import java.nio.ByteBuffer;
/**
- * Represents a closed stream in the priority tree. Used in preference to the
full {@link Stream} as has much lower
- * memory usage.
+ * Represents a closed stream and is used to correctly respond to (or ignore)
frames for the stream that are processed
+ * after the stream has been closed. Used in preference to the full {@link
Stream} as has much lower memory usage.
*/
class RecycledStream extends AbstractNonZeroStream {
-
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: Refactor. Simplify. Don't need two fields tracking the same value.
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 29c723ef58 Refactor. Simplify. Don't need two fields tracking the same
value.
29c723ef58 is described below
commit 29c723ef58d2fad7c29e4a568a53010fcf718cb0
Author: Mark Thomas
AuthorDate: Tue Oct 1 08:13:33 2024 +0100
Refactor. Simplify. Don't need two fields tracking the same value.
---
java/org/apache/coyote/http2/Http2UpgradeHandler.java | 7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 04bb9e0be9..0e4d94ed5d 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -118,7 +118,6 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
private final ConcurrentNavigableMap
streams = new ConcurrentSkipListMap<>();
protected final AtomicInteger activeRemoteStreamCount = new
AtomicInteger(0);
-private volatile int maxActiveRemoteStreamId = 0;
private volatile int maxProcessedStreamId;
private final AtomicInteger nextLocalStreamId = new AtomicInteger(2);
private final PingManager pingManager = getPingManager();
@@ -177,7 +176,6 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
Integer key = Integer.valueOf(1);
Stream stream = new Stream(key, this, coyoteRequest);
streams.put(key, stream);
-maxActiveRemoteStreamId = 0;
activeRemoteStreamCount.set(1);
maxProcessedStreamId = 1;
}
@@ -1598,14 +1596,13 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
checkPauseState();
if (connectionState.get().isNewStreamAllowed()) {
-if (streamId > maxActiveRemoteStreamId) {
+if (streamId > maxProcessedStreamId) {
stream = createRemoteStream(streamId);
activeRemoteStreamCount.incrementAndGet();
-maxActiveRemoteStreamId = streamId;
} else {
// ID for new stream must always be greater than any
previous stream
throw new
ConnectionException(sm.getString("upgradeHandler.stream.old",
Integer.valueOf(streamId),
-Integer.valueOf(maxActiveRemoteStreamId)),
Http2Error.PROTOCOL_ERROR);
+Integer.valueOf(maxProcessedStreamId)),
Http2Error.PROTOCOL_ERROR);
}
} else {
if (log.isTraceEnabled()) {
-
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: Refactor. Simplify. Don't need two fields tracking the same value.
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 66ec89f162 Refactor. Simplify. Don't need two fields tracking the same
value.
66ec89f162 is described below
commit 66ec89f162157225daa4589d1d1581e30affcc52
Author: Mark Thomas
AuthorDate: Tue Oct 1 08:13:33 2024 +0100
Refactor. Simplify. Don't need two fields tracking the same value.
---
java/org/apache/coyote/http2/Http2UpgradeHandler.java | 7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 1c08a277cc..8b31ebc319 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -118,7 +118,6 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
private final ConcurrentNavigableMap
streams = new ConcurrentSkipListMap<>();
protected final AtomicInteger activeRemoteStreamCount = new
AtomicInteger(0);
-private volatile int maxActiveRemoteStreamId = 0;
private volatile int maxProcessedStreamId;
private final AtomicInteger nextLocalStreamId = new AtomicInteger(2);
private final PingManager pingManager = getPingManager();
@@ -174,7 +173,6 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
Integer key = Integer.valueOf(1);
Stream stream = new Stream(key, this, coyoteRequest);
streams.put(key, stream);
-maxActiveRemoteStreamId = 0;
activeRemoteStreamCount.set(1);
maxProcessedStreamId = 1;
}
@@ -1595,14 +1593,13 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
checkPauseState();
if (connectionState.get().isNewStreamAllowed()) {
-if (streamId > maxActiveRemoteStreamId) {
+if (streamId > maxProcessedStreamId) {
stream = createRemoteStream(streamId);
activeRemoteStreamCount.incrementAndGet();
-maxActiveRemoteStreamId = streamId;
} else {
// ID for new stream must always be greater than any
previous stream
throw new
ConnectionException(sm.getString("upgradeHandler.stream.old",
Integer.valueOf(streamId),
-Integer.valueOf(maxActiveRemoteStreamId)),
Http2Error.PROTOCOL_ERROR);
+Integer.valueOf(maxProcessedStreamId)),
Http2Error.PROTOCOL_ERROR);
}
} else {
if (log.isTraceEnabled()) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
