[Bug 65571] ClientAbortException in Tomcat 9.0.50 and 9.0.52

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=65571

--- Comment #6 from Mark Thomas  ---
It has now been six months since this report was opened and none of the
information requested in comment #1 has been provided. Therefore, I intend to
resolve this issue as WONTFIX when I next review the open bugs prior to a
release.

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

[Bug 65951] ant package with custom tomcat.output fails in add-osgi

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=65951

Konstantin Kolinko  changed:

   What|Removed |Added

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

--- Comment #4 from Konstantin Kolinko  ---
I see that this was fixed in 10.0.x by
https://github.com/apache/tomcat/commit/e38672aa1a0beaf7ffa285b120fb048f4609ca75

Thank you.

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

[tomcat] branch main updated: Update to Commons Daemon 1.3.0

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new 4e376b6  Update to Commons Daemon 1.3.0
4e376b6 is described below

commit 4e376b643f513b29aa50f239801bee5c70f8f49c
Author: Mark Thomas 
AuthorDate: Tue Mar 15 10:09:13 2022 +

Update to Commons Daemon 1.3.0
---
 build.properties.default   | 12 ++--
 webapps/docs/changelog.xml |  3 +++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 7b4a7ec..d4a5a20 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -181,20 +181,20 @@ 
nsis.nsdialogs.dll=${nsis.home}/Plugins/${nsis.arch.dir}nsDialogs.dll
 nsis.loc=${base-sf.loc}/nsis/nsis-${nsis.version}.zip
 
 # - Commons Daemon, version 1.2.0 or later -
-commons-daemon.version=1.2.4
+commons-daemon.version=1.3.0
 
-# checksum for commons-daemon-1.2.4-bin.tar.gz
+# checksum for commons-daemon-1.3.0-bin.tar.gz
 commons-daemon.bin.checksum.enabled=true
 commons-daemon.bin.checksum.algorithm=SHA-512
-commons-daemon.bin.checksum.value=66c33091fa51b6845ce45f326708419ef20ecd4a60bc175b94620a708f398843d9d53cfa8bfd2f5ab924c30b7034af602cb65e3e1cf164a5f687353f755919fe
+commons-daemon.bin.checksum.value=53c1fee9bb14ae84034ec06e45693b86927493124fb050a598928884a985c54878710f63063e45b095469ffe45050ed87663de320df2140e0678642e21938592
 
-# checksums for commons-daemon-1.2.4-native-src.tar.gz, 
commons-daemon-1.2.4-bin-windows.zip
+# checksums for commons-daemon-1.3.0-native-src.tar.gz, 
commons-daemon-1.3.0-bin-windows.zip
 commons-daemon.native.src.checksum.enabled=true
 commons-daemon.native.src.checksum.algorithm=SHA-512
-commons-daemon.native.src.checksum.value=655f5b106238f6ac7f6e42dd32acfc553b302aa2c248b839528abdc9872bad5c80da3ef15399a7ff8c414427aafea9c4e9656b2887d98be4584f3926ac02ca23
+commons-daemon.native.src.checksum.value=86588c1ce9e26a365235d8629137a6fea8b7bd1f4920063d620f7bf713e17bafc2fd152f46a52edd420d8090122dac4250a531e683b435948ae12462175807b4
 commons-daemon.native.win.checksum.enabled=true
 commons-daemon.native.win.checksum.algorithm=SHA-512
-commons-daemon.native.win.checksum.value=9c2bc010828826acbde5613aaf2de303471b33f2cb655b0ac91574e27123b8bcbe59e987d9e47d5835c171a5db31922b1458ed2e4fef840fd06c048f61f1e62b
+commons-daemon.native.win.checksum.value=ff545f4b1c8a5f10b471e579e0b4c739e6e1f393f74f36ff35cfe62cced3febef20451b15b418e534c9e3640a9502e4c9da47a59e7ff3c772b439f8b8929f223
 
 commons-daemon.home=${base.path}/commons-daemon-${commons-daemon.version}
 
commons-daemon.jar=${commons-daemon.home}/commons-daemon-${commons-daemon.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3a9e577..a35939d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -124,6 +124,9 @@
 65951: Use the tomcat.output property for OSGi
 bundle manifest paths. (isapir)
   
+  
+Update to Commons Daemon 1.3.0. (markt)
+  
 
   
 

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

[tomcat] branch 10.0.x updated: Update to Commons Daemon 1.3.0

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new 1cc8c0a  Update to Commons Daemon 1.3.0
1cc8c0a is described below

commit 1cc8c0ab485ecf757df1b593c112bee146037215
Author: Mark Thomas 
AuthorDate: Tue Mar 15 10:09:13 2022 +

Update to Commons Daemon 1.3.0
---
 build.properties.default   | 12 ++--
 webapps/docs/changelog.xml |  3 +++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index fa3f97c..0dc8c6c 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -186,20 +186,20 @@ 
nsis.nsdialogs.dll=${nsis.home}/Plugins/${nsis.arch.dir}nsDialogs.dll
 nsis.loc=${base-sf.loc}/nsis/nsis-${nsis.version}.zip
 
 # - Commons Daemon, version 1.2.0 or later -
-commons-daemon.version=1.2.4
+commons-daemon.version=1.3.0
 
-# checksum for commons-daemon-1.2.4-bin.tar.gz
+# checksum for commons-daemon-1.3.0-bin.tar.gz
 commons-daemon.bin.checksum.enabled=true
 commons-daemon.bin.checksum.algorithm=SHA-512
-commons-daemon.bin.checksum.value=66c33091fa51b6845ce45f326708419ef20ecd4a60bc175b94620a708f398843d9d53cfa8bfd2f5ab924c30b7034af602cb65e3e1cf164a5f687353f755919fe
+commons-daemon.bin.checksum.value=53c1fee9bb14ae84034ec06e45693b86927493124fb050a598928884a985c54878710f63063e45b095469ffe45050ed87663de320df2140e0678642e21938592
 
-# checksums for commons-daemon-1.2.4-native-src.tar.gz, 
commons-daemon-1.2.4-bin-windows.zip
+# checksums for commons-daemon-1.3.0-native-src.tar.gz, 
commons-daemon-1.3.0-bin-windows.zip
 commons-daemon.native.src.checksum.enabled=true
 commons-daemon.native.src.checksum.algorithm=SHA-512
-commons-daemon.native.src.checksum.value=655f5b106238f6ac7f6e42dd32acfc553b302aa2c248b839528abdc9872bad5c80da3ef15399a7ff8c414427aafea9c4e9656b2887d98be4584f3926ac02ca23
+commons-daemon.native.src.checksum.value=86588c1ce9e26a365235d8629137a6fea8b7bd1f4920063d620f7bf713e17bafc2fd152f46a52edd420d8090122dac4250a531e683b435948ae12462175807b4
 commons-daemon.native.win.checksum.enabled=true
 commons-daemon.native.win.checksum.algorithm=SHA-512
-commons-daemon.native.win.checksum.value=9c2bc010828826acbde5613aaf2de303471b33f2cb655b0ac91574e27123b8bcbe59e987d9e47d5835c171a5db31922b1458ed2e4fef840fd06c048f61f1e62b
+commons-daemon.native.win.checksum.value=ff545f4b1c8a5f10b471e579e0b4c739e6e1f393f74f36ff35cfe62cced3febef20451b15b418e534c9e3640a9502e4c9da47a59e7ff3c772b439f8b8929f223
 
 commons-daemon.home=${base.path}/commons-daemon-${commons-daemon.version}
 
commons-daemon.jar=${commons-daemon.home}/commons-daemon-${commons-daemon.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5dac898..93d7601 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -124,6 +124,9 @@
 65951: Use the tomcat.output property for OSGi
 bundle manifest paths. (isapir)
   
+  
+Update to Commons Daemon 1.3.0. (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 to Commons Daemon 1.3.0

[markt]

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 95b8cb0  Update to Commons Daemon 1.3.0
95b8cb0 is described below

commit 95b8cb0576f70c22c7783e340838a02513e5870a
Author: Mark Thomas 
AuthorDate: Tue Mar 15 10:09:13 2022 +

Update to Commons Daemon 1.3.0
---
 build.properties.default   | 12 ++--
 webapps/docs/changelog.xml |  3 +++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 8b0a4da..e47a192 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -186,20 +186,20 @@ 
nsis.nsdialogs.dll=${nsis.home}/Plugins/${nsis.arch.dir}nsDialogs.dll
 nsis.loc=${base-sf.loc}/nsis/nsis-${nsis.version}.zip
 
 # - Commons Daemon, version 1.2.0 or later -
-commons-daemon.version=1.2.4
+commons-daemon.version=1.3.0
 
-# checksum for commons-daemon-1.2.4-bin.tar.gz
+# checksum for commons-daemon-1.3.0-bin.tar.gz
 commons-daemon.bin.checksum.enabled=true
 commons-daemon.bin.checksum.algorithm=SHA-512
-commons-daemon.bin.checksum.value=66c33091fa51b6845ce45f326708419ef20ecd4a60bc175b94620a708f398843d9d53cfa8bfd2f5ab924c30b7034af602cb65e3e1cf164a5f687353f755919fe
+commons-daemon.bin.checksum.value=53c1fee9bb14ae84034ec06e45693b86927493124fb050a598928884a985c54878710f63063e45b095469ffe45050ed87663de320df2140e0678642e21938592
 
-# checksums for commons-daemon-1.2.4-native-src.tar.gz, 
commons-daemon-1.2.4-bin-windows.zip
+# checksums for commons-daemon-1.3.0-native-src.tar.gz, 
commons-daemon-1.3.0-bin-windows.zip
 commons-daemon.native.src.checksum.enabled=true
 commons-daemon.native.src.checksum.algorithm=SHA-512
-commons-daemon.native.src.checksum.value=655f5b106238f6ac7f6e42dd32acfc553b302aa2c248b839528abdc9872bad5c80da3ef15399a7ff8c414427aafea9c4e9656b2887d98be4584f3926ac02ca23
+commons-daemon.native.src.checksum.value=86588c1ce9e26a365235d8629137a6fea8b7bd1f4920063d620f7bf713e17bafc2fd152f46a52edd420d8090122dac4250a531e683b435948ae12462175807b4
 commons-daemon.native.win.checksum.enabled=true
 commons-daemon.native.win.checksum.algorithm=SHA-512
-commons-daemon.native.win.checksum.value=9c2bc010828826acbde5613aaf2de303471b33f2cb655b0ac91574e27123b8bcbe59e987d9e47d5835c171a5db31922b1458ed2e4fef840fd06c048f61f1e62b
+commons-daemon.native.win.checksum.value=ff545f4b1c8a5f10b471e579e0b4c739e6e1f393f74f36ff35cfe62cced3febef20451b15b418e534c9e3640a9502e4c9da47a59e7ff3c772b439f8b8929f223
 
 commons-daemon.home=${base.path}/commons-daemon-${commons-daemon.version}
 
commons-daemon.jar=${commons-daemon.home}/commons-daemon-${commons-daemon.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d98779c..72d0b00 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -115,6 +115,9 @@
 65951: Use the tomcat.output property for OSGi 
bundle
 manifest paths. (isapir)
   
+  
+Update to Commons Daemon 1.3.0. (markt)
+  
 
   
 

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

[tomcat] branch 8.5.x updated (1dd7a24 -> 89d4663)

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


from 1dd7a24  Fix typos. Thanks to Thomas Hoffmann.
 new de58103  Fix rtext for 8.5.76 and 8.5.77
 new 89d4663  Increment version number for next development cycle

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 | 2 +-
 res/maven/mvn.properties.default | 2 +-
 webapps/docs/changelog.xml   | 6 --
 3 files changed, 6 insertions(+), 4 deletions(-)

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

[tomcat] 02/02: Increment version number for next development cycle

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit 89d466358996eb9daa92fdb90293e4cbc7e28887
Author: Mark Thomas 
AuthorDate: Tue Mar 15 10:16:57 2022 +

Increment version number for next development cycle
---
 build.properties.default | 2 +-
 res/maven/mvn.properties.default | 2 +-
 webapps/docs/changelog.xml   | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 64cb22e..3564336 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -31,7 +31,7 @@
 # - Version Control Flags -
 version.major=8
 version.minor=5
-version.build=77
+version.build=78
 version.patch=0
 version.suffix=-dev
 
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 092fcb8..caf2bd3 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -39,7 +39,7 @@ 
maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d
 maven.asf.release.repo.repositoryId=apache.releases.https
 
 # Release version info
-maven.asf.release.deploy.version=8.5.77
+maven.asf.release.deploy.version=8.5.78
 
 #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 a536f60..cd55922 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,6 +104,8 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
+
+
 
   
 

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

[tomcat] 01/02: Fix rtext for 8.5.76 and 8.5.77

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit de58103aa0ad965844eda0d33549a481b7c5e883
Author: Mark Thomas 
AuthorDate: Tue Mar 15 10:14:49 2022 +

Fix rtext for 8.5.76 and 8.5.77
---
 webapps/docs/changelog.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 74d49de..a536f60 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,7 +104,7 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
   
 
   
@@ -162,7 +162,7 @@
 
   
 
-
+
   
 
   

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

[tomcat] branch 8.5.x updated: Update to Commons Daemon 1.3.0

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new a1396c3  Update to Commons Daemon 1.3.0
a1396c3 is described below

commit a1396c3b56c9e0a643ba53d93452ed87cbe302a5
Author: Mark Thomas 
AuthorDate: Tue Mar 15 10:09:13 2022 +

Update to Commons Daemon 1.3.0
---
 build.properties.default   | 12 ++--
 webapps/docs/changelog.xml |  7 +++
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 3564336..99d42d7 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -189,20 +189,20 @@ 
nsis.nsdialogs.dll=${nsis.home}/Plugins/${nsis.arch.dir}nsDialogs.dll
 nsis.loc=${base-sf.loc}/nsis/nsis-${nsis.version}.zip
 
 # - Commons Daemon, version 1.2.0 or later -
-commons-daemon.version=1.2.4
+commons-daemon.version=1.3.0
 
-# checksum for commons-daemon-1.2.4-bin.tar.gz
+# checksum for commons-daemon-1.3.0-bin.tar.gz
 commons-daemon.bin.checksum.enabled=true
 commons-daemon.bin.checksum.algorithm=SHA-512
-commons-daemon.bin.checksum.value=66c33091fa51b6845ce45f326708419ef20ecd4a60bc175b94620a708f398843d9d53cfa8bfd2f5ab924c30b7034af602cb65e3e1cf164a5f687353f755919fe
+commons-daemon.bin.checksum.value=53c1fee9bb14ae84034ec06e45693b86927493124fb050a598928884a985c54878710f63063e45b095469ffe45050ed87663de320df2140e0678642e21938592
 
-# checksums for commons-daemon-1.2.4-native-src.tar.gz, 
commons-daemon-1.2.4-bin-windows.zip
+# checksums for commons-daemon-1.3.0-native-src.tar.gz, 
commons-daemon-1.3.0-bin-windows.zip
 commons-daemon.native.src.checksum.enabled=true
 commons-daemon.native.src.checksum.algorithm=SHA-512
-commons-daemon.native.src.checksum.value=655f5b106238f6ac7f6e42dd32acfc553b302aa2c248b839528abdc9872bad5c80da3ef15399a7ff8c414427aafea9c4e9656b2887d98be4584f3926ac02ca23
+commons-daemon.native.src.checksum.value=86588c1ce9e26a365235d8629137a6fea8b7bd1f4920063d620f7bf713e17bafc2fd152f46a52edd420d8090122dac4250a531e683b435948ae12462175807b4
 commons-daemon.native.win.checksum.enabled=true
 commons-daemon.native.win.checksum.algorithm=SHA-512
-commons-daemon.native.win.checksum.value=9c2bc010828826acbde5613aaf2de303471b33f2cb655b0ac91574e27123b8bcbe59e987d9e47d5835c171a5db31922b1458ed2e4fef840fd06c048f61f1e62b
+commons-daemon.native.win.checksum.value=ff545f4b1c8a5f10b471e579e0b4c739e6e1f393f74f36ff35cfe62cced3febef20451b15b418e534c9e3640a9502e4c9da47a59e7ff3c772b439f8b8929f223
 
 commons-daemon.home=${base.path}/commons-daemon-${commons-daemon.version}
 
commons-daemon.jar=${commons-daemon.home}/commons-daemon-${commons-daemon.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cd55922..9bdf277 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,13 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Update to Commons Daemon 1.3.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 to Checkstyle 10.0

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new 2d9e51a  Update to Checkstyle 10.0
2d9e51a is described below

commit 2d9e51ab1bf9b3143bb12926fab1b210ff456922
Author: Mark Thomas 
AuthorDate: Tue Mar 15 10:25:36 2022 +

Update to Checkstyle 10.0
---
 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 d4a5a20..4376c0f 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -264,10 +264,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=9.2.1
+checkstyle.version=10.0
 checkstyle.checksum.enabled=true
 checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=01f6576d988ee7ef5d7a6a528439263205c956a020c6479430992aebbe49186bb962015941161959c019daea567818b35f8cfb5157ae3b1ce1625f3699226611
+checkstyle.checksum.value=c613a3036d15b67f20738ddb9a2a0aeccb58cb0163dd5b94dcc153d924ddf9c58a884bd90c59fb899870b6c5601af3e52847b97e985d6f5c58209d64b4fde2f1
 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 a35939d..f54ca71 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -127,6 +127,9 @@
   
 Update to Commons Daemon 1.3.0. (markt)
   
+  
+Update to Checkstyle 10.0. (markt)
+  
 
   
 

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

[tomcat] branch 10.0.x updated: Update to Checkstyle 10.0

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new fe64d95  Update to Checkstyle 10.0
fe64d95 is described below

commit fe64d95b7b645354da69107a437aece7c40ce47b
Author: Mark Thomas 
AuthorDate: Tue Mar 15 10:25:36 2022 +

Update to Checkstyle 10.0
---
 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 0dc8c6c..a6a2e48 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -269,10 +269,10 @@ 
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
 
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
 
 # - Checkstyle, version 6.16 or later -
-checkstyle.version=9.2.1
+checkstyle.version=10.0
 checkstyle.checksum.enabled=true
 checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=01f6576d988ee7ef5d7a6a528439263205c956a020c6479430992aebbe49186bb962015941161959c019daea567818b35f8cfb5157ae3b1ce1625f3699226611
+checkstyle.checksum.value=c613a3036d15b67f20738ddb9a2a0aeccb58cb0163dd5b94dcc153d924ddf9c58a884bd90c59fb899870b6c5601af3e52847b97e985d6f5c58209d64b4fde2f1
 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 93d7601..e2089e6 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -127,6 +127,9 @@
   
 Update to Commons Daemon 1.3.0. (markt)
   
+  
+Update to Checkstyle 10.0. (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 to Checkstyle 10.0

[markt]

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 9e56a56  Update to Checkstyle 10.0
9e56a56 is described below

commit 9e56a56939b9d6d04e00afb3e1b8b760af9f136c
Author: Mark Thomas 
AuthorDate: Tue Mar 15 10:25:36 2022 +

Update to Checkstyle 10.0
---
 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 e47a192..248f07c 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -269,10 +269,10 @@ 
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
 
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
 
 # - Checkstyle, version 6.16 or later -
-checkstyle.version=9.2.1
+checkstyle.version=10.0
 checkstyle.checksum.enabled=true
 checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=01f6576d988ee7ef5d7a6a528439263205c956a020c6479430992aebbe49186bb962015941161959c019daea567818b35f8cfb5157ae3b1ce1625f3699226611
+checkstyle.checksum.value=c613a3036d15b67f20738ddb9a2a0aeccb58cb0163dd5b94dcc153d924ddf9c58a884bd90c59fb899870b6c5601af3e52847b97e985d6f5c58209d64b4fde2f1
 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 72d0b00..a2ad295 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -118,6 +118,9 @@
   
 Update to Commons Daemon 1.3.0. (markt)
   
+  
+Update to Checkstyle 10.0. (markt)
+  
 
   
 

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

[tomcat] branch 8.5.x updated: Update to Checkstyle 10.0

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 4573cbe  Update to Checkstyle 10.0
4573cbe is described below

commit 4573cbe6122f3fa7abe72a17e82554bb16c403d0
Author: Mark Thomas 
AuthorDate: Tue Mar 15 10:25:36 2022 +

Update to Checkstyle 10.0
---
 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 99d42d7..815b3d7 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -272,10 +272,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=9.2.1
+checkstyle.version=10.0
 checkstyle.checksum.enabled=true
 checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=01f6576d988ee7ef5d7a6a528439263205c956a020c6479430992aebbe49186bb962015941161959c019daea567818b35f8cfb5157ae3b1ce1625f3699226611
+checkstyle.checksum.value=c613a3036d15b67f20738ddb9a2a0aeccb58cb0163dd5b94dcc153d924ddf9c58a884bd90c59fb899870b6c5601af3e52847b97e985d6f5c58209d64b4fde2f1
 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 9bdf277..01776a5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -110,6 +110,9 @@
   
 Update to Commons Daemon 1.3.0. (markt)
   
+  
+Update to Checkstyle 10.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: Add TLS 1.3 ciphersuite setting

[remm]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new f8ead03  Add TLS 1.3 ciphersuite setting
f8ead03 is described below

commit f8ead037fa43aa720672e98f3b4389e5a81e6c14
Author: remm 
AuthorDate: Tue Mar 15 14:43:46 2022 +0100

Add TLS 1.3 ciphersuite setting

Also fix NPE handling in the CA configuration after revert.
Clarify ciphersuite errors since it doesn't mean it won't work (verified
with testssl).
Verify with only TLS 1.2, TLS 1.3, TLS 1.2 + TLS 1.3.
---
 modules/openssl-java17/openssl-tomcat.conf |  1 +
 .../util/net/openssl/panama/OpenSSLContext.java| 30 ---
 .../openssl/SSL_CTX_set_tmp_dh_callback$dh.java|  2 +-
 .../util/openssl/SSL_set_info_callback$cb.java |  4 +-
 .../apache/tomcat/util/openssl/constants$14.java   | 18 +++
 .../apache/tomcat/util/openssl/constants$15.java   | 19 ---
 .../apache/tomcat/util/openssl/constants$16.java   | 18 ---
 .../apache/tomcat/util/openssl/constants$17.java   | 14 ++---
 .../apache/tomcat/util/openssl/constants$18.java   | 14 +++--
 .../apache/tomcat/util/openssl/constants$19.java   | 16 +++---
 .../apache/tomcat/util/openssl/constants$20.java   | 13 +++--
 .../apache/tomcat/util/openssl/constants$21.java   |  4 --
 .../apache/tomcat/util/openssl/constants$22.java   | 18 +++
 .../apache/tomcat/util/openssl/constants$23.java   | 15 +++---
 .../apache/tomcat/util/openssl/constants$24.java   | 15 +++---
 .../apache/tomcat/util/openssl/constants$25.java   | 17 ---
 .../apache/tomcat/util/openssl/constants$26.java   | 16 +++---
 .../apache/tomcat/util/openssl/constants$27.java   | 18 +++
 .../apache/tomcat/util/openssl/constants$28.java   | 12 -
 .../org/apache/tomcat/util/openssl/openssl_h.java  | 59 +-
 .../net/openssl/panama/LocalStrings.properties |  3 +-
 21 files changed, 181 insertions(+), 145 deletions(-)

diff --git a/modules/openssl-java17/openssl-tomcat.conf 
b/modules/openssl-java17/openssl-tomcat.conf
index 9256996..5273538 100644
--- a/modules/openssl-java17/openssl-tomcat.conf
+++ b/modules/openssl-java17/openssl-tomcat.conf
@@ -186,6 +186,7 @@
 --include-function SSL_CTX_set_alpn_select_cb# header: 
/usr/include/openssl/ssl.h
 --include-function SSL_CTX_set_cert_verify_callback  # header: 
/usr/include/openssl/ssl.h
 --include-function SSL_CTX_set_cipher_list   # header: 
/usr/include/openssl/ssl.h
+--include-function SSL_CTX_set_ciphersuites  # header: 
/usr/include/openssl/ssl.h
 --include-function SSL_CTX_set_client_CA_list# header: 
/usr/include/openssl/ssl.h
 --include-function SSL_CTX_set_default_passwd_cb # header: 
/usr/include/openssl/ssl.h
 --include-function SSL_CTX_set_default_verify_paths  # header: 
/usr/include/openssl/ssl.h
diff --git 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
index ff249f0..66942b8 100644
--- 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
+++ 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
@@ -151,6 +151,9 @@ public class OpenSSLContext implements 
org.apache.tomcat.util.net.SSLContext {
 }
 }
 
+private final int minTlsVersion;
+private final int maxTlsVersion;
+
 private final SSLHostConfig sslHostConfig;
 private final SSLHostConfigCertificate certificate;
 private final boolean alpn;
@@ -274,9 +277,10 @@ public class OpenSSLContext implements 
org.apache.tomcat.util.net.SSLContext {
 } else if ((protocol & SSL_PROTOCOL_SSLV3) > 0) {
 prot = SSL3_VERSION();
 }
+maxTlsVersion = prot;
 // # define SSL_CTX_set_max_proto_version(sslCtx, version) \
 //  SSL_CTX_ctrl(sslCtx, SSL_CTRL_SET_MAX_PROTO_VERSION, 
version, NULL)
-SSL_CTX_ctrl(sslCtx, SSL_CTRL_SET_MAX_PROTO_VERSION(), prot, 
MemoryAddress.NULL);
+SSL_CTX_ctrl(sslCtx, SSL_CTRL_SET_MAX_PROTO_VERSION(), 
maxTlsVersion, MemoryAddress.NULL);
 if (prot == TLS1_3_VERSION() && (protocol & SSL_PROTOCOL_TLSV1_2) 
> 0) {
 prot = TLS1_2_VERSION();
 }
@@ -289,9 +293,10 @@ public class OpenSSLContext implements 
org.apache.tomcat.util.net.SSLContext {
 if (prot == TLS1_VERSION() && (protocol & SSL_PROTOCOL_SSLV3) > 0) 
{
 prot = SSL3_VERSION();
 }
+minTlsVersion = prot;
 //# define SSL_CTX_set_min_proto_version(sslCtx, version) \
 // SSL_

[tomcat] branch main updated: Update to SpotBugs 4.6.0

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new c8f4bea  Update to SpotBugs 4.6.0
c8f4bea is described below

commit c8f4bea4e0e8a51edecac9b49a81fd391acfeaad
Author: Mark Thomas 
AuthorDate: Tue Mar 15 14:00:22 2022 +

Update to SpotBugs 4.6.0
---
 build.properties.default|  4 ++--
 res/spotbugs/filter-false-positives.xml | 39 +
 webapps/docs/changelog.xml  |  3 +++
 3 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 4376c0f..030fdb2 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -282,10 +282,10 @@ jacoco.jar=${jacoco.home}/lib/jacocoant.jar
 
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
 
 # - SpotBugs (originally FindBugs) -
-spotbugs.version=4.5.2
+spotbugs.version=4.6.0
 spotbugs.checksum.enabled=true
 spotbugs.checksum.algorithm=SHA-512
-spotbugs.checksum.value=6e6d4aab1a935f47f9cf4983c30c5c338a257339bd2a6ae4fea2204683d973a67bb95a9204e387ebf9c31070a998367afa12a3b1f812b01f2e27715b704bf194
+spotbugs.checksum.value=c3ebc5761299b253e7e563a0a71f931ffa6ab3861380abb246d2258a916c9c6d40f6582dbe10b084d6932536c38f6d8bd7711456b6b7eef7c83df770915ecf1e
 spotbugs.home=${base.path}/spotbugs-${spotbugs.version}
 spotbugs.jar=${spotbugs.home}/lib/spotbugs-ant.jar
 
spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/spotbugs-${spotbugs.version}.tgz
diff --git a/res/spotbugs/filter-false-positives.xml 
b/res/spotbugs/filter-false-positives.xml
index f924615..c9382b5 100644
--- a/res/spotbugs/filter-false-positives.xml
+++ b/res/spotbugs/filter-false-positives.xml
@@ -42,6 +42,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
 
@@ -420,6 +426,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
@@ -635,6 +647,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
 
@@ -846,6 +864,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
 
@@ -1133,6 +1157,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
 
@@ -1220,6 +1250,15 @@
 
   
   
+
+
+
+  
+  
+
+
+  
+  
 
 
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f54ca71..84b4a5e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -130,6 +130,9 @@
   
 Update to Checkstyle 10.0. (markt)
   
+  
+Update to SpotBugs 4.6.0. (markt)
+  
 
   
 

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

[tomcat] branch 10.0.x updated (fe64d95 -> 78a516f)

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


from fe64d95  Update to Checkstyle 10.0
 new 1d700dd  Update to SpotBugs 4.6.0
 new 78a516f  Back-port additional false positives

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 +--
 res/spotbugs/filter-false-positives.xml | 63 +
 webapps/docs/changelog.xml  |  3 ++
 3 files changed, 68 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: Back-port additional false positives

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit 78a516ff5480214b5da1b3251a47c04f51585b41
Author: Mark Thomas 
AuthorDate: Tue Mar 15 14:41:13 2022 +

Back-port additional false positives
---
 res/spotbugs/filter-false-positives.xml | 24 
 1 file changed, 24 insertions(+)

diff --git a/res/spotbugs/filter-false-positives.xml 
b/res/spotbugs/filter-false-positives.xml
index b6cc8ba..912a7eb 100644
--- a/res/spotbugs/filter-false-positives.xml
+++ b/res/spotbugs/filter-false-positives.xml
@@ -579,6 +579,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
 
@@ -855,6 +861,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
 
@@ -1039,6 +1051,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
 
@@ -1130,6 +1148,12 @@
 
   
   
+
+
+
+
+  
+  
 
 

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

[tomcat] 01/02: Update to SpotBugs 4.6.0

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit 1d700dd1bb6b816e22a8592c125b16abc34783e5
Author: Mark Thomas 
AuthorDate: Tue Mar 15 14:00:22 2022 +

Update to SpotBugs 4.6.0
---
 build.properties.default|  4 ++--
 res/spotbugs/filter-false-positives.xml | 39 +
 webapps/docs/changelog.xml  |  3 +++
 3 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index a6a2e48..d25e72b 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -287,10 +287,10 @@ jacoco.jar=${jacoco.home}/lib/jacocoant.jar
 
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
 
 # - SpotBugs (originally FindBugs) -
-spotbugs.version=4.5.2
+spotbugs.version=4.6.0
 spotbugs.checksum.enabled=true
 spotbugs.checksum.algorithm=SHA-512
-spotbugs.checksum.value=6e6d4aab1a935f47f9cf4983c30c5c338a257339bd2a6ae4fea2204683d973a67bb95a9204e387ebf9c31070a998367afa12a3b1f812b01f2e27715b704bf194
+spotbugs.checksum.value=c3ebc5761299b253e7e563a0a71f931ffa6ab3861380abb246d2258a916c9c6d40f6582dbe10b084d6932536c38f6d8bd7711456b6b7eef7c83df770915ecf1e
 spotbugs.home=${base.path}/spotbugs-${spotbugs.version}
 spotbugs.jar=${spotbugs.home}/lib/spotbugs-ant.jar
 
spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/spotbugs-${spotbugs.version}.tgz
diff --git a/res/spotbugs/filter-false-positives.xml 
b/res/spotbugs/filter-false-positives.xml
index 00189b0..b6cc8ba 100644
--- a/res/spotbugs/filter-false-positives.xml
+++ b/res/spotbugs/filter-false-positives.xml
@@ -42,6 +42,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
 
@@ -426,6 +432,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
@@ -641,6 +653,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
 
@@ -846,6 +864,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
 
@@ -1149,6 +1173,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
 
@@ -1236,6 +1266,15 @@
 
   
   
+
+
+
+  
+  
+
+
+  
+  
 
 
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e2089e6..70b950d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -130,6 +130,9 @@
   
 Update to Checkstyle 10.0. (markt)
   
+  
+Update to SpotBugs 4.6.0. (markt)
+  
 
   
 

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

[tomcat] 02/02: Back-port additional false positives

[markt]

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 f25802a838a8bf80a476a63ebc5a6c046ec0b776
Author: Mark Thomas 
AuthorDate: Tue Mar 15 14:49:53 2022 +

Back-port additional false positives
---
 res/spotbugs/filter-false-positives.xml | 26 +-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/res/spotbugs/filter-false-positives.xml 
b/res/spotbugs/filter-false-positives.xml
index ba30c1a..5c80194 100644
--- a/res/spotbugs/filter-false-positives.xml
+++ b/res/spotbugs/filter-false-positives.xml
@@ -43,7 +43,7 @@
   
   
 
-
+
 
 
   
@@ -607,6 +607,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
 
@@ -877,6 +883,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
 
@@ -1061,6 +1073,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
 
@@ -1152,6 +1170,12 @@
 
   
   
+
+
+
+
+  
+  
 
 

-
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 (9e56a56 -> f25802a)

[markt]

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 9e56a56  Update to Checkstyle 10.0
 new f9771df  Update to SpotBugs 4.6.0
 new f25802a  Back-port additional false positives

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 +--
 res/spotbugs/filter-false-positives.xml | 63 +
 webapps/docs/changelog.xml  |  3 ++
 3 files changed, 68 insertions(+), 2 deletions(-)

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

[tomcat] 01/02: Update to SpotBugs 4.6.0

[markt]

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 f9771df954720f738417398914ac94a11a76c009
Author: Mark Thomas 
AuthorDate: Tue Mar 15 14:00:22 2022 +

Update to SpotBugs 4.6.0
---
 build.properties.default|  4 ++--
 res/spotbugs/filter-false-positives.xml | 39 +
 webapps/docs/changelog.xml  |  3 +++
 3 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 248f07c..dbeb93c 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -287,10 +287,10 @@ jacoco.jar=${jacoco.home}/lib/jacocoant.jar
 
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
 
 # - SpotBugs (originally FindBugs) -
-spotbugs.version=4.5.2
+spotbugs.version=4.6.0
 spotbugs.checksum.enabled=true
 spotbugs.checksum.algorithm=SHA-512
-spotbugs.checksum.value=6e6d4aab1a935f47f9cf4983c30c5c338a257339bd2a6ae4fea2204683d973a67bb95a9204e387ebf9c31070a998367afa12a3b1f812b01f2e27715b704bf194
+spotbugs.checksum.value=c3ebc5761299b253e7e563a0a71f931ffa6ab3861380abb246d2258a916c9c6d40f6582dbe10b084d6932536c38f6d8bd7711456b6b7eef7c83df770915ecf1e
 spotbugs.home=${base.path}/spotbugs-${spotbugs.version}
 spotbugs.jar=${spotbugs.home}/lib/spotbugs-ant.jar
 
spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/spotbugs-${spotbugs.version}.tgz
diff --git a/res/spotbugs/filter-false-positives.xml 
b/res/spotbugs/filter-false-positives.xml
index 7f5a589..ba30c1a 100644
--- a/res/spotbugs/filter-false-positives.xml
+++ b/res/spotbugs/filter-false-positives.xml
@@ -42,6 +42,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
 
@@ -443,6 +449,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
@@ -663,6 +675,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
 
@@ -868,6 +886,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
 
@@ -1171,6 +1195,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
 
@@ -1258,6 +1288,15 @@
 
   
   
+
+
+
+  
+  
+
+
+  
+  
 
 
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a2ad295..764302f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -121,6 +121,9 @@
   
 Update to Checkstyle 10.0. (markt)
   
+  
+Update to SpotBugs 4.6.0. (markt)
+  
 
   
 

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

[tomcat] branch 8.5.x updated (4573cbe -> dcde972)

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


from 4573cbe  Update to Checkstyle 10.0
 new d9888f6  Update to SpotBugs 4.6.0
 new dcde972  Back-port additional false positives

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 +-
 res/spotbugs/filter-false-positives.xml | 82 +
 webapps/docs/changelog.xml  |  3 ++
 3 files changed, 87 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: Back-port additional false positives

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit dcde9722fcda8bdb80e00aa20c365a4b162e8ac0
Author: Mark Thomas 
AuthorDate: Tue Mar 15 16:29:35 2022 +

Back-port additional false positives
---
 res/spotbugs/filter-false-positives.xml | 43 +
 1 file changed, 43 insertions(+)

diff --git a/res/spotbugs/filter-false-positives.xml 
b/res/spotbugs/filter-false-positives.xml
index bf8fe94..8e256b3 100644
--- a/res/spotbugs/filter-false-positives.xml
+++ b/res/spotbugs/filter-false-positives.xml
@@ -592,6 +592,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
 
@@ -607,6 +613,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
 
@@ -840,6 +852,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
 
@@ -1011,6 +1029,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
 
@@ -1114,6 +1138,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
@@ -1575,6 +1605,13 @@
 
   
   
+
+
+
+
+
+  
+  
 
 
 
@@ -1591,6 +1628,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
 

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

[tomcat] 01/02: Update to SpotBugs 4.6.0

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit d9888f6af06873ddb70de40051597539f178a595
Author: Mark Thomas 
AuthorDate: Tue Mar 15 14:00:22 2022 +

Update to SpotBugs 4.6.0
---
 build.properties.default|  4 ++--
 res/spotbugs/filter-false-positives.xml | 39 +
 webapps/docs/changelog.xml  |  3 +++
 3 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 815b3d7..643e645 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -290,10 +290,10 @@ jacoco.jar=${jacoco.home}/lib/jacocoant.jar
 
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
 
 # - SpotBugs (originally FindBugs) -
-spotbugs.version=4.5.2
+spotbugs.version=4.6.0
 spotbugs.checksum.enabled=true
 spotbugs.checksum.algorithm=SHA-512
-spotbugs.checksum.value=6e6d4aab1a935f47f9cf4983c30c5c338a257339bd2a6ae4fea2204683d973a67bb95a9204e387ebf9c31070a998367afa12a3b1f812b01f2e27715b704bf194
+spotbugs.checksum.value=c3ebc5761299b253e7e563a0a71f931ffa6ab3861380abb246d2258a916c9c6d40f6582dbe10b084d6932536c38f6d8bd7711456b6b7eef7c83df770915ecf1e
 spotbugs.home=${base.path}/spotbugs-${spotbugs.version}
 spotbugs.jar=${spotbugs.home}/lib/spotbugs-ant.jar
 
spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/spotbugs-${spotbugs.version}.tgz
diff --git a/res/spotbugs/filter-false-positives.xml 
b/res/spotbugs/filter-false-positives.xml
index cd268c8..bf8fe94 100644
--- a/res/spotbugs/filter-false-positives.xml
+++ b/res/spotbugs/filter-false-positives.xml
@@ -48,6 +48,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
 
@@ -437,6 +443,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
@@ -656,6 +668,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
 
@@ -831,6 +849,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
 
@@ -1128,6 +1152,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
 
@@ -1206,6 +1236,15 @@
 
   
   
+
+
+
+  
+  
+
+
+  
+  
 
 
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 01776a5..11bc548 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -113,6 +113,9 @@
   
 Update to Checkstyle 10.0. (markt)
   
+  
+Update to SpotBugs 4.6.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: Avoid possible NPE

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new 74d1be0  Avoid possible NPE
74d1be0 is described below

commit 74d1be0ff0824562506f25cafc9beffaf12033c1
Author: Mark Thomas 
AuthorDate: Tue Mar 15 16:47:05 2022 +

Avoid possible NPE

No functional change since NPE would be swallowed but this saves
generating the NPE.
---
 java/org/apache/tomcat/util/IntrospectionUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/IntrospectionUtils.java 
b/java/org/apache/tomcat/util/IntrospectionUtils.java
index a1f718d..ff13d11 100644
--- a/java/org/apache/tomcat/util/IntrospectionUtils.java
+++ b/java/org/apache/tomcat/util/IntrospectionUtils.java
@@ -303,7 +303,7 @@ public final class IntrospectionUtils {
 private static String replaceProperties(String value,
 Hashtable staticProp, PropertySource dynamicProp[],
 ClassLoader classLoader, int iterationCount) {
-if (value.indexOf("${") < 0) {
+if (value == null || value.indexOf("${") < 0) {
 return value;
 }
 if (iterationCount >=20) {

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

[tomcat] branch 10.0.x updated: Avoid possible NPE

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new b0f2793  Avoid possible NPE
b0f2793 is described below

commit b0f279341b08517bee3490f53965a5126d0d97f2
Author: Mark Thomas 
AuthorDate: Tue Mar 15 16:47:05 2022 +

Avoid possible NPE

No functional change since NPE would be swallowed but this saves
generating the NPE.
---
 java/org/apache/tomcat/util/IntrospectionUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/IntrospectionUtils.java 
b/java/org/apache/tomcat/util/IntrospectionUtils.java
index a1f718d..ff13d11 100644
--- a/java/org/apache/tomcat/util/IntrospectionUtils.java
+++ b/java/org/apache/tomcat/util/IntrospectionUtils.java
@@ -303,7 +303,7 @@ public final class IntrospectionUtils {
 private static String replaceProperties(String value,
 Hashtable staticProp, PropertySource dynamicProp[],
 ClassLoader classLoader, int iterationCount) {
-if (value.indexOf("${") < 0) {
+if (value == null || value.indexOf("${") < 0) {
 return value;
 }
 if (iterationCount >=20) {

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

[tomcat] branch 9.0.x updated: Avoid possible NPE

[markt]

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 5010c4e  Avoid possible NPE
5010c4e is described below

commit 5010c4e0bcfbc520718253d8ce4a4ce7ae7a295b
Author: Mark Thomas 
AuthorDate: Tue Mar 15 16:47:05 2022 +

Avoid possible NPE

No functional change since NPE would be swallowed but this saves
generating the NPE.
---
 java/org/apache/tomcat/util/IntrospectionUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/IntrospectionUtils.java 
b/java/org/apache/tomcat/util/IntrospectionUtils.java
index b019623..36dbcdf 100644
--- a/java/org/apache/tomcat/util/IntrospectionUtils.java
+++ b/java/org/apache/tomcat/util/IntrospectionUtils.java
@@ -312,7 +312,7 @@ public final class IntrospectionUtils {
 Hashtable staticProp, PropertySource dynamicProp[],
 ClassLoader classLoader) {
 
-if (value.indexOf('$') < 0) {
+if (value == null || value.indexOf('$') < 0) {
 return value;
 }
 StringBuilder sb = new StringBuilder();

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

[tomcat] branch 8.5.x updated: Avoid possible NPE

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 0346b14  Avoid possible NPE
0346b14 is described below

commit 0346b14f0de67140389cb7943800351fd4caebaa
Author: Mark Thomas 
AuthorDate: Tue Mar 15 16:47:05 2022 +

Avoid possible NPE

No functional change since NPE would be swallowed but this saves
generating the NPE.
---
 java/org/apache/tomcat/util/IntrospectionUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/IntrospectionUtils.java 
b/java/org/apache/tomcat/util/IntrospectionUtils.java
index 82a83f5..a10a42c 100644
--- a/java/org/apache/tomcat/util/IntrospectionUtils.java
+++ b/java/org/apache/tomcat/util/IntrospectionUtils.java
@@ -269,7 +269,7 @@ public final class IntrospectionUtils {
 Hashtable staticProp, PropertySource dynamicProp[],
 ClassLoader classLoader) {
 
-if (value.indexOf('$') < 0) {
+if (value == null || value.indexOf('$') < 0) {
 return value;
 }
 StringBuilder sb = new StringBuilder();

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

[tomcat] 01/03: Expand spotbugs Ant task to cover test code

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit 8bef76a877270c4f35bd191036a5611e1b8a6910
Author: Mark Thomas 
AuthorDate: Tue Mar 15 17:17:55 2022 +

Expand spotbugs Ant task to cover test code
---
 build.xml  | 2 +-
 webapps/docs/changelog.xml | 4 
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 54cd5fd..91282fb 100644
--- a/build.xml
+++ b/build.xml
@@ -2071,7 +2071,7 @@
 
   
+  depends="test-compile,download-spotbugs">
 
 
   
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 84b4a5e..01ed9b8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -133,6 +133,10 @@
   
 Update to SpotBugs 4.6.0. (markt)
   
+  
+Expand the spotbugs Ant task to also cover test code.
+(markt)
+  
 
   
 

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

[tomcat] branch main updated (74d1be0 -> e99da3e)

[markt]

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 74d1be0  Avoid possible NPE
 new 8bef76a  Expand spotbugs Ant task to cover test code
 new 017a5d7  Fix sync issues identified by SpotBugs
 new e99da3e  Add additional false positives for test code

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:
 build.xml  |  2 +-
 res/spotbugs/filter-false-positives.xml| 19 ++---
 .../catalina/nonblocking/TestNonBlockingAPI.java   |  3 ++-
 .../tribes/test/transport/SocketNioReceive.java| 24 ++
 webapps/docs/changelog.xml |  4 
 5 files changed, 38 insertions(+), 14 deletions(-)

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

[tomcat] 03/03: Add additional false positives for test code

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit e99da3e6542f2189b2655ad0781d6a8ac816a26d
Author: Mark Thomas 
AuthorDate: Tue Mar 15 17:18:19 2022 +

Add additional false positives for test code
---
 res/spotbugs/filter-false-positives.xml | 19 ---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/res/spotbugs/filter-false-positives.xml 
b/res/spotbugs/filter-false-positives.xml
index c9382b5..85ca2a7 100644
--- a/res/spotbugs/filter-false-positives.xml
+++ b/res/spotbugs/filter-false-positives.xml
@@ -1940,7 +1940,10 @@
   
 
 
-
+
+  
+  
+
 
   
   
@@ -2143,13 +2146,17 @@
 
   
   
-
 
 
   
   
 
-
+
+  
+  
+  
+  
+
   
   
 
@@ -2533,4 +2540,10 @@
 
 
   
+  
+  
+
+
+
+  
 

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

[tomcat] 02/03: Fix sync issues identified by SpotBugs

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit 017a5d73fed304eaeed34be835bc0b886968e9da
Author: Mark Thomas 
AuthorDate: Tue Mar 15 17:18:09 2022 +

Fix sync issues identified by SpotBugs
---
 .../catalina/nonblocking/TestNonBlockingAPI.java   |  3 ++-
 .../tribes/test/transport/SocketNioReceive.java| 24 ++
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java 
b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
index 0ca63ab..8023e8f 100644
--- a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
+++ b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
@@ -1144,7 +1144,8 @@ public class TestNonBlockingAPI extends TomcatBaseTest {
 try {
 byte buffer[] = new byte[1 * 4];
 while (is.isReady() && !is.isFinished()) {
-is.read(buffer);
+@SuppressWarnings("unused")
+int ignore = is.read(buffer);
 }
 String body = new String(buffer, 
StandardCharsets.UTF_8);
 Assert.assertTrue(body.equals("body"));
diff --git 
a/test/org/apache/catalina/tribes/test/transport/SocketNioReceive.java 
b/test/org/apache/catalina/tribes/test/transport/SocketNioReceive.java
index 763d7b2..9936c63 100644
--- a/test/org/apache/catalina/tribes/test/transport/SocketNioReceive.java
+++ b/test/org/apache/catalina/tribes/test/transport/SocketNioReceive.java
@@ -27,13 +27,15 @@ import org.apache.catalina.tribes.membership.MemberImpl;
 import org.apache.catalina.tribes.transport.nio.NioReceiver;
 
 public class SocketNioReceive {
-static int count = 0;
-static int accept = 0;
-static long start = 0;
-static double mb = 0;
-static int len = 0;
-static DecimalFormat df = new DecimalFormat("##.00");
-static double seconds = 0;
+private static int count = 0;
+private static final Object countLock = new Object();
+private static int accept = 0;
+private static final Object acceptLock = new Object();
+private static long start = 0;
+private static double mb = 0;
+private static int len = 0;
+private static DecimalFormat df = new DecimalFormat("##.00");
+private static double seconds = 0;
 
 protected static final Object mutex = new Object();
 public static void main(String[] args) throws Exception {
@@ -74,7 +76,9 @@ public class SocketNioReceive {
 start = System.currentTimeMillis();
 }
 mb += ( (double) len) / 1024 / 1024;
-synchronized (this) {count++;}
+synchronized (countLock) {
+count++;
+}
 if ( ( (count) % 1) == 0) {
 long time = System.currentTimeMillis();
 seconds = ( (double) (time - start)) / 1000;
@@ -84,7 +88,9 @@ public class SocketNioReceive {
 
 @Override
 public boolean accept(ChannelMessage msg) {
-synchronized (this) {accept++;}
+synchronized (acceptLock) {
+accept++;
+}
 return true;
 }
 

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

[tomcat] branch 10.0.x updated (b0f2793 -> 011b5a7)

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


from b0f2793  Avoid possible NPE
 new 816d250  Expand spotbugs Ant task to cover test code
 new 011b5a7  Fix sync issues identified by SpotBugs

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.xml  |  2 +-
 .../catalina/nonblocking/TestNonBlockingAPI.java   |  3 ++-
 .../tribes/test/transport/SocketNioReceive.java| 24 ++
 webapps/docs/changelog.xml |  4 
 4 files changed, 22 insertions(+), 11 deletions(-)

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

[tomcat] 02/02: Fix sync issues identified by SpotBugs

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit 011b5a7efad69bbaefe79464a3d55d69bb856030
Author: Mark Thomas 
AuthorDate: Tue Mar 15 17:18:09 2022 +

Fix sync issues identified by SpotBugs
---
 .../catalina/nonblocking/TestNonBlockingAPI.java   |  3 ++-
 .../tribes/test/transport/SocketNioReceive.java| 24 ++
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java 
b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
index 0ca63ab..8023e8f 100644
--- a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
+++ b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
@@ -1144,7 +1144,8 @@ public class TestNonBlockingAPI extends TomcatBaseTest {
 try {
 byte buffer[] = new byte[1 * 4];
 while (is.isReady() && !is.isFinished()) {
-is.read(buffer);
+@SuppressWarnings("unused")
+int ignore = is.read(buffer);
 }
 String body = new String(buffer, 
StandardCharsets.UTF_8);
 Assert.assertTrue(body.equals("body"));
diff --git 
a/test/org/apache/catalina/tribes/test/transport/SocketNioReceive.java 
b/test/org/apache/catalina/tribes/test/transport/SocketNioReceive.java
index 763d7b2..9936c63 100644
--- a/test/org/apache/catalina/tribes/test/transport/SocketNioReceive.java
+++ b/test/org/apache/catalina/tribes/test/transport/SocketNioReceive.java
@@ -27,13 +27,15 @@ import org.apache.catalina.tribes.membership.MemberImpl;
 import org.apache.catalina.tribes.transport.nio.NioReceiver;
 
 public class SocketNioReceive {
-static int count = 0;
-static int accept = 0;
-static long start = 0;
-static double mb = 0;
-static int len = 0;
-static DecimalFormat df = new DecimalFormat("##.00");
-static double seconds = 0;
+private static int count = 0;
+private static final Object countLock = new Object();
+private static int accept = 0;
+private static final Object acceptLock = new Object();
+private static long start = 0;
+private static double mb = 0;
+private static int len = 0;
+private static DecimalFormat df = new DecimalFormat("##.00");
+private static double seconds = 0;
 
 protected static final Object mutex = new Object();
 public static void main(String[] args) throws Exception {
@@ -74,7 +76,9 @@ public class SocketNioReceive {
 start = System.currentTimeMillis();
 }
 mb += ( (double) len) / 1024 / 1024;
-synchronized (this) {count++;}
+synchronized (countLock) {
+count++;
+}
 if ( ( (count) % 1) == 0) {
 long time = System.currentTimeMillis();
 seconds = ( (double) (time - start)) / 1000;
@@ -84,7 +88,9 @@ public class SocketNioReceive {
 
 @Override
 public boolean accept(ChannelMessage msg) {
-synchronized (this) {accept++;}
+synchronized (acceptLock) {
+accept++;
+}
 return true;
 }
 

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

[tomcat] 01/02: Expand spotbugs Ant task to cover test code

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit 816d2509a0737555a1e4f97d09029f8a6c9921f4
Author: Mark Thomas 
AuthorDate: Tue Mar 15 17:17:55 2022 +

Expand spotbugs Ant task to cover test code
---
 build.xml  | 2 +-
 webapps/docs/changelog.xml | 4 
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index cb0e971..a108130 100644
--- a/build.xml
+++ b/build.xml
@@ -2033,7 +2033,7 @@
 
   
+  depends="test-compile,download-spotbugs">
 
 
   
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 70b950d..f538566 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -133,6 +133,10 @@
   
 Update to SpotBugs 4.6.0. (markt)
   
+  
+Expand the spotbugs Ant task to also cover test code.
+(markt)
+  
 
   
 

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

[tomcat] branch 10.0.x updated: Back-port additional false positives

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new 767e258  Back-port additional false positives
767e258 is described below

commit 767e258d16f29ebd4feb05921466dbf751d6bf1a
Author: Mark Thomas 
AuthorDate: Tue Mar 15 17:39:59 2022 +

Back-port additional false positives
---
 res/spotbugs/filter-false-positives.xml | 19 ---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/res/spotbugs/filter-false-positives.xml 
b/res/spotbugs/filter-false-positives.xml
index 912a7eb..1098c3b 100644
--- a/res/spotbugs/filter-false-positives.xml
+++ b/res/spotbugs/filter-false-positives.xml
@@ -2050,7 +2050,10 @@
   
 
 
-
+
+  
+  
+
 
   
   
@@ -2253,13 +2256,17 @@
 
   
   
-
 
 
   
   
 
-
+
+  
+  
+  
+  
+
   
   
 
@@ -2623,4 +2630,10 @@
 
 
   
+  
+  
+
+
+
+  
 

-
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 (5010c4e -> 1498abd)

[markt]

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 5010c4e  Avoid possible NPE
 new 925273d  Expand spotbugs Ant task to cover test code
 new e477131  Fix sync issues identified by SpotBugs
 new 1498abd  Back-port additional false positives

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:
 build.xml  |  2 +-
 res/spotbugs/filter-false-positives.xml| 19 ++---
 .../catalina/nonblocking/TestNonBlockingAPI.java   |  3 ++-
 .../tribes/test/transport/SocketNioReceive.java| 24 ++
 webapps/docs/changelog.xml |  4 
 5 files changed, 38 insertions(+), 14 deletions(-)

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

[tomcat] 01/03: Expand spotbugs Ant task to cover test code

[markt]

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 925273da3eb3a6e692a98c8aaef8862aebb7c804
Author: Mark Thomas 
AuthorDate: Tue Mar 15 17:17:55 2022 +

Expand spotbugs Ant task to cover test code
---
 build.xml  | 2 +-
 webapps/docs/changelog.xml | 4 
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 6e24ad4..8ed475b 100644
--- a/build.xml
+++ b/build.xml
@@ -2015,7 +2015,7 @@
 
   
+  depends="test-compile,download-spotbugs">
 
 
   
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 764302f..1b0aabd 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -124,6 +124,10 @@
   
 Update to SpotBugs 4.6.0. (markt)
   
+  
+Expand the spotbugs Ant task to also cover test code.
+(markt)
+  
 
   
 

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

[tomcat] 02/03: Fix sync issues identified by SpotBugs

[markt]

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 e4771310934871bfc5eb27638d4cb766281c8c82
Author: Mark Thomas 
AuthorDate: Tue Mar 15 17:18:09 2022 +

Fix sync issues identified by SpotBugs
---
 .../catalina/nonblocking/TestNonBlockingAPI.java   |  3 ++-
 .../tribes/test/transport/SocketNioReceive.java| 24 ++
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java 
b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
index 782dce7..c0eeca5 100644
--- a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
+++ b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
@@ -1143,7 +1143,8 @@ public class TestNonBlockingAPI extends TomcatBaseTest {
 try {
 byte buffer[] = new byte[1 * 4];
 while (is.isReady() && !is.isFinished()) {
-is.read(buffer);
+@SuppressWarnings("unused")
+int ignore = is.read(buffer);
 }
 String body = new String(buffer, 
StandardCharsets.UTF_8);
 Assert.assertTrue(body.equals("body"));
diff --git 
a/test/org/apache/catalina/tribes/test/transport/SocketNioReceive.java 
b/test/org/apache/catalina/tribes/test/transport/SocketNioReceive.java
index 763d7b2..9936c63 100644
--- a/test/org/apache/catalina/tribes/test/transport/SocketNioReceive.java
+++ b/test/org/apache/catalina/tribes/test/transport/SocketNioReceive.java
@@ -27,13 +27,15 @@ import org.apache.catalina.tribes.membership.MemberImpl;
 import org.apache.catalina.tribes.transport.nio.NioReceiver;
 
 public class SocketNioReceive {
-static int count = 0;
-static int accept = 0;
-static long start = 0;
-static double mb = 0;
-static int len = 0;
-static DecimalFormat df = new DecimalFormat("##.00");
-static double seconds = 0;
+private static int count = 0;
+private static final Object countLock = new Object();
+private static int accept = 0;
+private static final Object acceptLock = new Object();
+private static long start = 0;
+private static double mb = 0;
+private static int len = 0;
+private static DecimalFormat df = new DecimalFormat("##.00");
+private static double seconds = 0;
 
 protected static final Object mutex = new Object();
 public static void main(String[] args) throws Exception {
@@ -74,7 +76,9 @@ public class SocketNioReceive {
 start = System.currentTimeMillis();
 }
 mb += ( (double) len) / 1024 / 1024;
-synchronized (this) {count++;}
+synchronized (countLock) {
+count++;
+}
 if ( ( (count) % 1) == 0) {
 long time = System.currentTimeMillis();
 seconds = ( (double) (time - start)) / 1000;
@@ -84,7 +88,9 @@ public class SocketNioReceive {
 
 @Override
 public boolean accept(ChannelMessage msg) {
-synchronized (this) {accept++;}
+synchronized (acceptLock) {
+accept++;
+}
 return true;
 }
 

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

[tomcat] 03/03: Back-port additional false positives

[markt]

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 1498abd921208ace57edea88624282966321819b
Author: Mark Thomas 
AuthorDate: Tue Mar 15 17:39:59 2022 +

Back-port additional false positives
---
 res/spotbugs/filter-false-positives.xml | 19 ---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/res/spotbugs/filter-false-positives.xml 
b/res/spotbugs/filter-false-positives.xml
index 5c80194..48d7218 100644
--- a/res/spotbugs/filter-false-positives.xml
+++ b/res/spotbugs/filter-false-positives.xml
@@ -2066,7 +2066,10 @@
   
 
 
-
+
+  
+  
+
 
   
   
@@ -2269,13 +2272,17 @@
 
   
   
-
 
 
   
   
 
-
+
+  
+  
+  
+  
+
   
   
 
@@ -2645,4 +2652,10 @@
 
 
   
+  
+  
+
+
+
+  
 

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

[tomcat] branch 8.5.x updated (0346b14 -> 8a7bbe9)

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


from 0346b14  Avoid possible NPE
 new fea9210  Expand spotbugs Ant task to cover test code
 new a654701  Fix sync issues identified by SpotBugs
 new 8a7bbe9  Back-port additional false positives

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:
 build.xml  |  2 +-
 res/spotbugs/filter-false-positives.xml| 11 +-
 .../catalina/nonblocking/TestNonBlockingAPI.java   |  3 ++-
 .../tribes/test/transport/SocketNioReceive.java| 24 ++
 webapps/docs/changelog.xml |  4 
 5 files changed, 32 insertions(+), 12 deletions(-)

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

[tomcat] 03/03: Back-port additional false positives

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit 8a7bbe9db6f1abb1f3c10982f3a1fbf5adfdb60f
Author: Mark Thomas 
AuthorDate: Tue Mar 15 17:39:59 2022 +

Back-port additional false positives
---
 res/spotbugs/filter-false-positives.xml | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/res/spotbugs/filter-false-positives.xml 
b/res/spotbugs/filter-false-positives.xml
index 8e256b3..6aed839 100644
--- a/res/spotbugs/filter-false-positives.xml
+++ b/res/spotbugs/filter-false-positives.xml
@@ -2000,7 +2000,10 @@
   
 
 
-
+
+  
+  
+
 
   
   
@@ -2552,4 +2555,10 @@
 
 
   
+  
+  
+
+
+
+  
 

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

[tomcat] 02/03: Fix sync issues identified by SpotBugs

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit a65470102b01cdc0d38c75c8eaf25af5e49fe8a6
Author: Mark Thomas 
AuthorDate: Tue Mar 15 17:18:09 2022 +

Fix sync issues identified by SpotBugs
---
 .../catalina/nonblocking/TestNonBlockingAPI.java   |  3 ++-
 .../tribes/test/transport/SocketNioReceive.java| 24 ++
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java 
b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
index 8973b71..2730e44 100644
--- a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
+++ b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
@@ -1143,7 +1143,8 @@ public class TestNonBlockingAPI extends TomcatBaseTest {
 try {
 byte buffer[] = new byte[1 * 4];
 while (is.isReady() && !is.isFinished()) {
-is.read(buffer);
+@SuppressWarnings("unused")
+int ignore = is.read(buffer);
 }
 String body = new String(buffer, 
StandardCharsets.UTF_8);
 Assert.assertTrue(body.equals("body"));
diff --git 
a/test/org/apache/catalina/tribes/test/transport/SocketNioReceive.java 
b/test/org/apache/catalina/tribes/test/transport/SocketNioReceive.java
index 763d7b2..9936c63 100644
--- a/test/org/apache/catalina/tribes/test/transport/SocketNioReceive.java
+++ b/test/org/apache/catalina/tribes/test/transport/SocketNioReceive.java
@@ -27,13 +27,15 @@ import org.apache.catalina.tribes.membership.MemberImpl;
 import org.apache.catalina.tribes.transport.nio.NioReceiver;
 
 public class SocketNioReceive {
-static int count = 0;
-static int accept = 0;
-static long start = 0;
-static double mb = 0;
-static int len = 0;
-static DecimalFormat df = new DecimalFormat("##.00");
-static double seconds = 0;
+private static int count = 0;
+private static final Object countLock = new Object();
+private static int accept = 0;
+private static final Object acceptLock = new Object();
+private static long start = 0;
+private static double mb = 0;
+private static int len = 0;
+private static DecimalFormat df = new DecimalFormat("##.00");
+private static double seconds = 0;
 
 protected static final Object mutex = new Object();
 public static void main(String[] args) throws Exception {
@@ -74,7 +76,9 @@ public class SocketNioReceive {
 start = System.currentTimeMillis();
 }
 mb += ( (double) len) / 1024 / 1024;
-synchronized (this) {count++;}
+synchronized (countLock) {
+count++;
+}
 if ( ( (count) % 1) == 0) {
 long time = System.currentTimeMillis();
 seconds = ( (double) (time - start)) / 1000;
@@ -84,7 +88,9 @@ public class SocketNioReceive {
 
 @Override
 public boolean accept(ChannelMessage msg) {
-synchronized (this) {accept++;}
+synchronized (acceptLock) {
+accept++;
+}
 return true;
 }
 

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

[tomcat] 01/03: Expand spotbugs Ant task to cover test code

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit fea92100ddaa2aa86827219fdf3fb614ce69868c
Author: Mark Thomas 
AuthorDate: Tue Mar 15 17:17:55 2022 +

Expand spotbugs Ant task to cover test code
---
 build.xml  | 2 +-
 webapps/docs/changelog.xml | 4 
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 8427711..b3cacd3 100644
--- a/build.xml
+++ b/build.xml
@@ -1625,7 +1625,7 @@
 
   
+  depends="test-compile,download-spotbugs">
 
 
   
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 11bc548..66a0baf 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -116,6 +116,10 @@
   
 Update to SpotBugs 4.6.0. (markt)
   
+  
+Expand the spotbugs Ant task to also cover test code.
+(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 65952 - align jsvc docs with scripts

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new e3b5c3a  Fix BZ 65952 - align jsvc docs with scripts
e3b5c3a is described below

commit e3b5c3a44a84c4158732d6adccd43fc26a82f8d7
Author: Mark Thomas 
AuthorDate: Tue Mar 15 19:38:31 2022 +

Fix BZ 65952 - align jsvc docs with scripts

https://bz.apache.org/bugzilla/show_bug.cgi?id=65952
---
 webapps/docs/changelog.xml | 4 
 webapps/docs/setup.xml | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 01ed9b8..4e9018b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -112,6 +112,10 @@
 (maxHttpHeaderSize) that is inherited by the HTTP/2 
upgrade
 protocol. Thanks to Thomas Hoffmann. (markt)
   
+  
+65952: Align --add-opens configuration for jsvc
+with the current Tomcat scripts. (markt)
+  
 
   
   
diff --git a/webapps/docs/setup.xml b/webapps/docs/setup.xml
index 871420d..b3e8028 100644
--- a/webapps/docs/setup.xml
+++ b/webapps/docs/setup.xml
@@ -153,6 +153,8 @@ cd $CATALINA_HOME
 -errfile $CATALINA_BASE/logs/catalina.err \
 --add-opens=java.base/java.lang=ALL-UNNAMED \
 --add-opens=java.base/java.io=ALL-UNNAMED \
+--add-opens=java.base/java.util=ALL-UNNAMED \
+--add-opens=java.base/java.util.concurrent=ALL-UNNAMED \
 --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED \
 -Dcatalina.home=$CATALINA_HOME \
 -Dcatalina.base=$CATALINA_BASE \

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

[tomcat] branch 10.0.x updated: Fix BZ 65952 - align jsvc docs with scripts

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new b988077  Fix BZ 65952 - align jsvc docs with scripts
b988077 is described below

commit b988077279c428442240d526cb8108c683583334
Author: Mark Thomas 
AuthorDate: Tue Mar 15 19:38:31 2022 +

Fix BZ 65952 - align jsvc docs with scripts

https://bz.apache.org/bugzilla/show_bug.cgi?id=65952
---
 webapps/docs/changelog.xml | 4 
 webapps/docs/setup.xml | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f538566..73b61bf 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -112,6 +112,10 @@
 (maxHttpHeaderSize) that is inherited by the HTTP/2 
upgrade
 protocol. Thanks to Thomas Hoffmann. (markt)
   
+  
+65952: Align --add-opens configuration for jsvc
+with the current Tomcat scripts. (markt)
+  
 
   
   
diff --git a/webapps/docs/setup.xml b/webapps/docs/setup.xml
index 8daf5c1..31cc153 100644
--- a/webapps/docs/setup.xml
+++ b/webapps/docs/setup.xml
@@ -158,10 +158,12 @@ cd $CATALINA_HOME
 org.apache.catalina.startup.Bootstrap
 
 When running on Java 9 you will need to additionally specify the
-following when starting jsvc to avoid warnings on shutdown.
+following when starting jsvc.
 ...
 --add-opens=java.base/java.lang=ALL-UNNAMED \
 --add-opens=java.base/java.io=ALL-UNNAMED \
+--add-opens=java.base/java.util=ALL-UNNAMED \
+--add-opens=java.base/java.util.concurrent=ALL-UNNAMED \
 --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED \
 ...
 

-
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 65952 - align jsvc docs with scripts

[markt]

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 9caf30f  Fix BZ 65952 - align jsvc docs with scripts
9caf30f is described below

commit 9caf30feb827306e9fdbdd38e79a95a29681338e
Author: Mark Thomas 
AuthorDate: Tue Mar 15 19:38:31 2022 +

Fix BZ 65952 - align jsvc docs with scripts

https://bz.apache.org/bugzilla/show_bug.cgi?id=65952
---
 webapps/docs/changelog.xml | 8 
 webapps/docs/setup.xml | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1b0aabd..816ee53 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,14 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+65952: Align --add-opens configuration for jsvc
+with the current Tomcat scripts. (markt)
+  
+
+  
   
 
   
diff --git a/webapps/docs/setup.xml b/webapps/docs/setup.xml
index 8daf5c1..31cc153 100644
--- a/webapps/docs/setup.xml
+++ b/webapps/docs/setup.xml
@@ -158,10 +158,12 @@ cd $CATALINA_HOME
 org.apache.catalina.startup.Bootstrap
 
 When running on Java 9 you will need to additionally specify the
-following when starting jsvc to avoid warnings on shutdown.
+following when starting jsvc.
 ...
 --add-opens=java.base/java.lang=ALL-UNNAMED \
 --add-opens=java.base/java.io=ALL-UNNAMED \
+--add-opens=java.base/java.util=ALL-UNNAMED \
+--add-opens=java.base/java.util.concurrent=ALL-UNNAMED \
 --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED \
 ...
 

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

[tomcat] branch 8.5.x updated: Fix BZ 65952 - align jsvc docs with scripts

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new eb30560  Fix BZ 65952 - align jsvc docs with scripts
eb30560 is described below

commit eb30560817a5f4b934cb767dac4e4ea0d7c1bd52
Author: Mark Thomas 
AuthorDate: Tue Mar 15 19:38:31 2022 +

Fix BZ 65952 - align jsvc docs with scripts

https://bz.apache.org/bugzilla/show_bug.cgi?id=65952
---
 webapps/docs/changelog.xml | 8 
 webapps/docs/setup.xml | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 66a0baf..dc71da6 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,14 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+65952: Align --add-opens configuration for jsvc
+with the current Tomcat scripts. (markt)
+  
+
+  
   
 
   
diff --git a/webapps/docs/setup.xml b/webapps/docs/setup.xml
index 8daf5c1..31cc153 100644
--- a/webapps/docs/setup.xml
+++ b/webapps/docs/setup.xml
@@ -158,10 +158,12 @@ cd $CATALINA_HOME
 org.apache.catalina.startup.Bootstrap
 
 When running on Java 9 you will need to additionally specify the
-following when starting jsvc to avoid warnings on shutdown.
+following when starting jsvc.
 ...
 --add-opens=java.base/java.lang=ALL-UNNAMED \
 --add-opens=java.base/java.io=ALL-UNNAMED \
+--add-opens=java.base/java.util=ALL-UNNAMED \
+--add-opens=java.base/java.util.concurrent=ALL-UNNAMED \
 --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED \
 ...
 

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

[Bug 65952] Exception in PrivilegedSetAccessControlContext initialisation with SecurityManager activated and java.lang module not opened

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=65952

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #1 from Mark Thomas  ---
Fixed in:
- 10.1.x for 10.1.0-M13 onwards
- 10.0.x for 10.0.19 onwards
- 9.0.x for 9.0.61 onwards
- 8.5.x for 8.5.78 onwards

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

[tomcat-native] branch main updated: Update the minimum recommended OpenSSL version to 1.1.1n

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new b33a35d  Update the minimum recommended OpenSSL version to 1.1.1n
b33a35d is described below

commit b33a35d726b3efc5387e6bbe3a8b65396fdaf9d3
Author: Mark Thomas 
AuthorDate: Tue Mar 15 20:33:11 2022 +

Update the minimum recommended OpenSSL version to 1.1.1n
---
 download_deps.sh  | 2 +-
 native/srclib/VERSIONS| 2 +-
 xdocs/miscellaneous/changelog.xml | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/download_deps.sh b/download_deps.sh
index 558cd15..2c45d08 100755
--- a/download_deps.sh
+++ b/download_deps.sh
@@ -3,7 +3,7 @@
 # Small script to get a recent openssl, with npn support
 # Will run configure and build_libs to generate the .s files
 
-SSL=openssl-1.1.1k.tar.gz
+SSL=openssl-1.1.1n.tar.gz
 APR=apr-1.7.0.tar.gz
 mkdir -p deps
 
diff --git a/native/srclib/VERSIONS b/native/srclib/VERSIONS
index cbb4ac3..1a34869 100644
--- a/native/srclib/VERSIONS
+++ b/native/srclib/VERSIONS
@@ -5,7 +5,7 @@ The current minimum versions are:
 The following version of the libraries are recommended:
 
 - APR 1.7.0 or later, http://apr.apache.org
-- OpenSSL 1.1.1k or later, http://www.openssl.org
+- OpenSSL 1.1.1n or later, http://www.openssl.org
 
 Older versions should also work but are not as thoroughly tested by the Tomcat
 Native team
diff --git a/xdocs/miscellaneous/changelog.xml 
b/xdocs/miscellaneous/changelog.xml
index 14f4906..d749412 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -36,6 +36,9 @@
 
 
   
+
+  Update recommended OpenSSL version to 1.1.1n or later. (markt)
+
   
 
 

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

Tomcat Native and minimum OpenSSL version

[Mark Thomas]

Hi all,

We currently have the following text in the VERSIONS file for Tomcat Native:

=
The current minimum versions are:
- OpenSSL 1.0.2
- APR 1.4.3

...

It is current anticipated that Tomcat Native releases will transition to 
1.3.x

after April 2021 when the minimum version will become OpenSSL 1.1.0 and
APR 1.5.2.
==


This change was driven by Ubuntu 16.04 reaching EOL in April 2021. 
However, Debian 9 reaches EOL in June this year which would allow us to 
move to:

OpenSSL 1.1.1
APR 1.6.x


As I am about to prepare a Tomcat Native release do we want to make the 
switch to 1.3.0 now or wait until after June and go straight to 1.1.1/1.6.x?



Thoughts?

Mark

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

[tomcat] branch 8.5.x updated: Backport errorCode.nnn handling to 8.5.x

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 2366a69  Backport errorCode.nnn handling to 8.5.x
2366a69 is described below

commit 2366a695507aa261fdada21ca4072faa57319fa2
Author: Mark Thomas 
AuthorDate: Wed Feb 14 10:17:19 2018 +

Backport errorCode.nnn handling to 8.5.x

Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=41007
Add the ability to specify static HTML responses for specific error
codes and/or exception types with the ErrorReportValve.
---
 .../org/apache/catalina/util/ErrorPageSupport.java |   4 -
 .../apache/catalina/valves/ErrorReportValve.java   | 107 +
 .../apache/catalina/valves/LocalStrings.properties |   2 +
 .../catalina/valves/LocalStrings_fr.properties |   2 +
 .../catalina/valves/LocalStrings_ja.properties |   2 +
 .../catalina/valves/LocalStrings_ko.properties |   2 +
 .../catalina/valves/LocalStrings_zh_CN.properties  |   2 +
 webapps/docs/changelog.xml |   9 ++
 webapps/docs/config/valve.xml  |  29 +-
 9 files changed, 154 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/util/ErrorPageSupport.java 
b/java/org/apache/catalina/util/ErrorPageSupport.java
index 0a241e8..19ebba7 100644
--- a/java/org/apache/catalina/util/ErrorPageSupport.java
+++ b/java/org/apache/catalina/util/ErrorPageSupport.java
@@ -68,11 +68,7 @@ public class ErrorPageSupport {
  *
  * @return The ErrorPage for the named exception type, or {@code null} if
  * none is configured
- *
- * @deprecated Unused. Will be removed in Tomcat 10.
- * Use {@link #find(Throwable)} instead.
  */
-@Deprecated
 public ErrorPage find(String exceptionType) {
 return exceptionPages.get(exceptionType);
 }
diff --git a/java/org/apache/catalina/valves/ErrorReportValve.java 
b/java/org/apache/catalina/valves/ErrorReportValve.java
index 74ccc1f..ae02d62 100644
--- a/java/org/apache/catalina/valves/ErrorReportValve.java
+++ b/java/org/apache/catalina/valves/ErrorReportValve.java
@@ -16,7 +16,11 @@
  */
 package org.apache.catalina.valves;
 
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.io.Writer;
 import java.util.Scanner;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -27,10 +31,13 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
+import org.apache.catalina.util.ErrorPageSupport;
+import org.apache.catalina.util.IOTools;
 import org.apache.catalina.util.ServerInfo;
 import org.apache.catalina.util.TomcatCSS;
 import org.apache.coyote.ActionCode;
 import org.apache.tomcat.util.ExceptionUtils;
+import org.apache.tomcat.util.descriptor.web.ErrorPage;
 import org.apache.tomcat.util.res.StringManager;
 import org.apache.tomcat.util.security.Escape;
 
@@ -54,7 +61,11 @@ public class ErrorReportValve extends ValveBase {
 
 private boolean showServerInfo = true;
 
+private final ErrorPageSupport errorPageSupport = new ErrorPageSupport();
+
+
 //-- Constructor
+
 public ErrorReportValve() {
 super(true);
 }
@@ -168,6 +179,27 @@ public class ErrorReportValve extends ValveBase {
 return;
 }
 
+ErrorPage errorPage = null;
+if (throwable != null) {
+errorPage = errorPageSupport.find(throwable);
+}
+if (errorPage == null) {
+errorPage = errorPageSupport.find(statusCode);
+}
+if (errorPage == null) {
+// Default error page
+errorPage = errorPageSupport.find(0);
+}
+
+
+if (errorPage != null) {
+if (sendErrorPage(errorPage.getLocation(), response)) {
+// If the page was sent successfully, don't write the standard
+// error page.
+return;
+}
+}
+
 String message = Escape.htmlElementContent(response.getMessage());
 if (message == null) {
 if (throwable != null) {
@@ -331,6 +363,37 @@ public class ErrorReportValve extends ValveBase {
 return trace.toString();
 }
 
+
+private boolean sendErrorPage(String location, Response response) {
+File file = new File(location);
+if (!file.isAbsolute()) {
+file = new File(getContainer().getCatalinaBase(), location);
+}
+if (!file.isFile() || !file.canRead()) {
+getContainer().getLogger().warn(
+sm.getString("errorReportValve.errorPageNotFound", 
location));
+return false;
+}
+
+// Hard 

[Bug 41007] Can't define customized 503 error page

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=41007

--- Comment #12 from Mark Thomas  ---
Back-ported to 8.5.x for 8.5.78 onwards

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

[tomcat] branch main updated: Correct docs for common Connector properties

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new 7dd8ae1  Correct docs for common Connector properties
7dd8ae1 is described below

commit 7dd8ae1a1b97991d7a6513b63685ae2b350d2af8
Author: Mark Thomas 
AuthorDate: Tue Mar 15 21:06:02 2022 +

Correct docs for common Connector properties
---
 webapps/docs/changelog.xml   |  5 +++
 webapps/docs/config/ajp.xml  | 70 ++
 webapps/docs/config/http.xml | 72 ++--
 3 files changed, 92 insertions(+), 55 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4e9018b..88d940f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -116,6 +116,11 @@
 65952: Align --add-opens configuration for jsvc
 with the current Tomcat scripts. (markt)
   
+  
+Correct the AJP and HTTP/1.1 Connector configuration pages in the
+documentation web application to show which attributes are applicable 
to
+all Connectors and which are implementation specific. (markt)
+  
 
   
   
diff --git a/webapps/docs/config/ajp.xml b/webapps/docs/config/ajp.xml
index 3188454..6850854 100644
--- a/webapps/docs/config/ajp.xml
+++ b/webapps/docs/config/ajp.xml
@@ -81,16 +81,10 @@
 
   
 
-
-  A boolean value which can be used to enable or disable sending
-  AJP flush messages to the fronting proxy whenever an explicit
-  flush happens. The default value is true.
-  An AJP flush message is a SEND_BODY_CHUNK packet with no body content.
-  Proxy implementations like mod_jk or mod_proxy_ajp will flush the
-  data buffered in the web server to the client when they receive
-  such a packet. Setting this to false can reduce
-  AJP packet traffic but might delay sending packets to the client.
-  At the end of the response, AJP does always flush to the client.
+
+  If this is true the '\' character will be permitted as a
+  path delimiter.
+  If not specified, the default value of false will be 
used.
 
 
 
@@ -104,6 +98,15 @@
   3 (30 seconds).
 
 
+
+  A boolean value which can be used to enable or disable the recycling
+  of the facade objects that isolate the container internal request
+  processing objects. If set to true the facades will be
+  set for garbage collection after every request, otherwise they will be
+  reused. This setting has no effect when the security manager is enabled.
+  If not specified, this attribute is set to true.
+
+
 
   Set to true if you want calls to
   request.getRemoteHost() to perform DNS lookups in
@@ -124,11 +127,21 @@
   If not specified the default value is reject.
 
 
-
-  The maximum number of headers in a request that are allowed by the
-  container. A request that contains more headers than the specified limit
-  will be rejected. A value of less than 0 means no limit.
-  If not specified, a default of 100 is used.
+
+  If this is true then
+  a call to Response.getWriter() if no character encoding
+  has been specified will result in subsequent calls to
+  Response.getCharacterEncoding() returning
+  ISO-8859-1 and the Content-Type response header
+  will include a charset=ISO-8859-1 component. 
(SRV.15.2.22.1)
+  If not specified, the default specification compliant value of
+  true will be used.
+
+
+
+  The maximum number of cookies that are permitted for a request. A 
value
+  of less than zero means no limit. If not specified, a default value of 
200
+  will be used.
 
 
 
@@ -229,6 +242,12 @@
   number specified here.
 
 
+
+  Should this Connector reject a requests if the URI
+  matches one of the suspicious URIs patterns identified by the Servlet 6.0
+  specification? The default value is false.
+
+
 
   Set this attribute to the name of the protocol you wish to have
   returned by calls to request.getScheme().  For
@@ -322,6 +341,18 @@
   with either 0.0.0.0 or ::.
 
 
+
+  A boolean value which can be used to enable or disable sending
+  AJP flush messages to the fronting proxy whenever an explicit
+  flush happens. The default value is true.
+  An AJP flush message is a SEND_BODY_CHUNK packet with no body content.
+  Proxy implementations like mod_jk or mod_proxy_ajp will flush the
+  data buffered in the web server to the client when they receive
+  such a packet. Setting this to false can reduce
+  AJP packet traffic but might delay sending packets to the client.
+  At the end of the response, AJP does always flush to the client.
+
+
 
   The AJP protocol pass

[tomcat] branch 10.0.x updated: Correct docs for common Connector properties

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new d083b65  Correct docs for common Connector properties
d083b65 is described below

commit d083b65ccc09a100b255a6d06e6981acacb2b87a
Author: Mark Thomas 
AuthorDate: Tue Mar 15 21:06:02 2022 +

Correct docs for common Connector properties
---
 webapps/docs/changelog.xml   |  5 +++
 webapps/docs/config/ajp.xml  | 64 +++
 webapps/docs/config/http.xml | 72 ++--
 3 files changed, 86 insertions(+), 55 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 73b61bf..4463d53 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -116,6 +116,11 @@
 65952: Align --add-opens configuration for jsvc
 with the current Tomcat scripts. (markt)
   
+  
+Correct the AJP and HTTP/1.1 Connector configuration pages in the
+documentation web application to show which attributes are applicable 
to
+all Connectors and which are implementation specific. (markt)
+  
 
   
   
diff --git a/webapps/docs/config/ajp.xml b/webapps/docs/config/ajp.xml
index 81c825a..c59c7bd 100644
--- a/webapps/docs/config/ajp.xml
+++ b/webapps/docs/config/ajp.xml
@@ -84,16 +84,10 @@
 
   
 
-
-  A boolean value which can be used to enable or disable sending
-  AJP flush messages to the fronting proxy whenever an explicit
-  flush happens. The default value is true.
-  An AJP flush message is a SEND_BODY_CHUNK packet with no body content.
-  Proxy implementations like mod_jk or mod_proxy_ajp will flush the
-  data buffered in the web server to the client when they receive
-  such a packet. Setting this to false can reduce
-  AJP packet traffic but might delay sending packets to the client.
-  At the end of the response, AJP does always flush to the client.
+
+  If this is true the '\' character will be permitted as a
+  path delimiter.
+  If not specified, the default value of false will be 
used.
 
 
 
@@ -107,6 +101,15 @@
   3 (30 seconds).
 
 
+
+  A boolean value which can be used to enable or disable the recycling
+  of the facade objects that isolate the container internal request
+  processing objects. If set to true the facades will be
+  set for garbage collection after every request, otherwise they will be
+  reused. This setting has no effect when the security manager is enabled.
+  If not specified, this attribute is set to true.
+
+
 
   Set to true if you want calls to
   request.getRemoteHost() to perform DNS lookups in
@@ -127,11 +130,21 @@
   If not specified the default value is reject.
 
 
-
-  The maximum number of headers in a request that are allowed by the
-  container. A request that contains more headers than the specified limit
-  will be rejected. A value of less than 0 means no limit.
-  If not specified, a default of 100 is used.
+
+  If this is true then
+  a call to Response.getWriter() if no character encoding
+  has been specified will result in subsequent calls to
+  Response.getCharacterEncoding() returning
+  ISO-8859-1 and the Content-Type response header
+  will include a charset=ISO-8859-1 component. 
(SRV.15.2.22.1)
+  If not specified, the default specification compliant value of
+  true will be used.
+
+
+
+  The maximum number of cookies that are permitted for a request. A 
value
+  of less than zero means no limit. If not specified, a default value of 
200
+  will be used.
 
 
 
@@ -332,6 +345,18 @@
   configured with ::.
 
 
+
+  A boolean value which can be used to enable or disable sending
+  AJP flush messages to the fronting proxy whenever an explicit
+  flush happens. The default value is true.
+  An AJP flush message is a SEND_BODY_CHUNK packet with no body content.
+  Proxy implementations like mod_jk or mod_proxy_ajp will flush the
+  data buffered in the web server to the client when they receive
+  such a packet. Setting this to false can reduce
+  AJP packet traffic but might delay sending packets to the client.
+  At the end of the response, AJP does always flush to the client.
+
+
 
   The AJP protocol passes some information from the reverse proxy to the
   AJP connector using request attributes. These attributes are:
@@ -428,10 +453,11 @@
   maxConnections feature and connections will not be counted.
 
 
-
-  The maximum number of cookies that are permitted for a request. A 
value
-  of less than zero means no limit. If not specified, a default value of 
200
-  will b

[tomcat] branch 9.0.x updated: Correct docs for common Connector properties

[markt]

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 8fa2667  Correct docs for common Connector properties
8fa2667 is described below

commit 8fa2667f132c96bb8f81744b98d2dc13d5ce98d7
Author: Mark Thomas 
AuthorDate: Tue Mar 15 21:06:02 2022 +

Correct docs for common Connector properties
---
 webapps/docs/changelog.xml   |  5 +++
 webapps/docs/config/ajp.xml  | 51 ++-
 webapps/docs/config/http.xml | 72 ++--
 3 files changed, 71 insertions(+), 57 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 816ee53..ea5fc14 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -111,6 +111,11 @@
 65952: Align --add-opens configuration for jsvc
 with the current Tomcat scripts. (markt)
   
+  
+Correct the AJP and HTTP/1.1 Connector configuration pages in the
+documentation web application to show which attributes are applicable 
to
+all Connectors and which are implementation specific. (markt)
+  
 
   
   
diff --git a/webapps/docs/config/ajp.xml b/webapps/docs/config/ajp.xml
index 87e83a4..be5cd0f 100644
--- a/webapps/docs/config/ajp.xml
+++ b/webapps/docs/config/ajp.xml
@@ -81,18 +81,6 @@
 
   
 
-
-  A boolean value which can be used to enable or disable sending
-  AJP flush messages to the fronting proxy whenever an explicit
-  flush happens. The default value is true.
-  An AJP flush message is a SEND_BODY_CHUNK packet with no body content.
-  Proxy implementations like mod_jk or mod_proxy_ajp will flush the
-  data buffered in the web server to the client when they receive
-  such a packet. Setting this to false can reduce
-  AJP packet traffic but might delay sending packets to the client.
-  At the end of the response, AJP does always flush to the client.
-
-
 
   A boolean value which can be used to enable or disable the TRACE
   HTTP method. If not specified, this attribute is set to false.
@@ -104,6 +92,15 @@
   3 (30 seconds).
 
 
+
+  A boolean value which can be used to enable or disable the recycling
+  of the facade objects that isolate the container internal request
+  processing objects. If set to true the facades will be
+  set for garbage collection after every request, otherwise they will be
+  reused. This setting has no effect when the security manager is enabled.
+  If not specified, this attribute is set to true.
+
+
 
   Set to true if you want calls to
   request.getRemoteHost() to perform DNS lookups in
@@ -128,11 +125,10 @@
   set.
 
 
-
-  The maximum number of headers in a request that are allowed by the
-  container. A request that contains more headers than the specified limit
-  will be rejected. A value of less than 0 means no limit.
-  If not specified, a default of 100 is used.
+
+  The maximum number of cookies that are permitted for a request. A 
value
+  of less than zero means no limit. If not specified, a default value of 
200
+  will be used.
 
 
 
@@ -339,6 +335,18 @@
   configured with ::.
 
 
+
+  A boolean value which can be used to enable or disable sending
+  AJP flush messages to the fronting proxy whenever an explicit
+  flush happens. The default value is true.
+  An AJP flush message is a SEND_BODY_CHUNK packet with no body content.
+  Proxy implementations like mod_jk or mod_proxy_ajp will flush the
+  data buffered in the web server to the client when they receive
+  such a packet. Setting this to false can reduce
+  AJP packet traffic but might delay sending packets to the client.
+  At the end of the response, AJP does always flush to the client.
+
+
 
   The AJP protocol passes some information from the reverse proxy to the
   AJP connector using request attributes. These attributes are:
@@ -435,10 +443,11 @@
   maxConnections feature and connections will not be counted.
 
 
-
-  The maximum number of cookies that are permitted for a request. A 
value
-  of less than zero means no limit. If not specified, a default value of 
200
-  will be used.
+
+  The maximum number of headers in a request that are allowed by the
+  container. A request that contains more headers than the specified limit
+  will be rejected. A value of less than 0 means no limit.
+  If not specified, a default of 100 is used.
 
 
 
diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index 06b27cb..c79a5dc 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -88,31 +88,6 @@
   3 (30 

[tomcat] branch 8.5.x updated: Correct docs for common Connector properties

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new e236b12  Correct docs for common Connector properties
e236b12 is described below

commit e236b12de662e1ec189860558d55919e4ab1aba9
Author: Mark Thomas 
AuthorDate: Tue Mar 15 21:06:02 2022 +

Correct docs for common Connector properties
---
 webapps/docs/changelog.xml   |  5 +++
 webapps/docs/config/ajp.xml  | 67 ++---
 webapps/docs/config/http.xml | 88 ++--
 3 files changed, 87 insertions(+), 73 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f1deb1c..7b0bbc2 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -120,6 +120,11 @@
 65952: Align --add-opens configuration for jsvc
 with the current Tomcat scripts. (markt)
   
+  
+Correct the AJP and HTTP/1.1 Connector configuration pages in the
+documentation web application to show which attributes are applicable 
to
+all Connectors and which are implementation specific. (markt)
+  
 
   
   
diff --git a/webapps/docs/config/ajp.xml b/webapps/docs/config/ajp.xml
index 75d0049..12424c5 100644
--- a/webapps/docs/config/ajp.xml
+++ b/webapps/docs/config/ajp.xml
@@ -81,18 +81,6 @@
 
   
 
-
-  A boolean value which can be used to enable or disable sending
-  AJP flush messages to the fronting proxy whenever an explicit
-  flush happens. The default value is true.
-  An AJP flush message is a SEND_BODY_CHUNK packet with no body content.
-  Proxy implementations like mod_jk or mod_proxy_ajp will flush the
-  data buffered in the web server to the client when they receive
-  such a packet. Setting this to false can reduce
-  AJP packet traffic but might delay sending packets to the client.
-  At the end of the response, AJP does always flush to the client.
-
-
 
   A boolean value which can be used to enable or disable the TRACE
   HTTP method. If not specified, this attribute is set to false.
@@ -104,6 +92,15 @@
   3 (30 seconds).
 
 
+
+  A boolean value which can be used to enable or disable the recycling
+  of the facade objects that isolate the container internal request
+  processing objects. If set to true the facades will be
+  set for garbage collection after every request, otherwise they will be
+  reused. This setting has no effect when the security manager is enabled.
+  If not specified, this attribute is set to true.
+
+
 
   Set to true if you want calls to
   request.getRemoteHost() to perform DNS lookups in
@@ -128,11 +125,10 @@
   set.
 
 
-
-  The maximum number of headers in a request that are allowed by the
-  container. A request that contains more headers than the specified limit
-  will be rejected. A value of less than 0 means no limit.
-  If not specified, a default of 100 is used.
+
+  The maximum number of cookies that are permitted for a request. A 
value
+  of less than zero means no limit. If not specified, a default value of 
200
+  will be used.
 
 
 
@@ -258,14 +254,6 @@
   The default value is false.
 
 
-
-  Set this attribute to true if you wish to have
-  a reason phrase in the response.
-  The default value is false.
-  Note: This option is deprecated and will be removed
-  in Tomcat 9. The reason phrase will not be sent.
-
-
 
   This specifies the character encoding used to decode the URI bytes,
   after %xx decoding the URL. If not specified, UTF-8 will be used unless
@@ -342,6 +330,18 @@
   configured with ::.
 
 
+
+  A boolean value which can be used to enable or disable sending
+  AJP flush messages to the fronting proxy whenever an explicit
+  flush happens. The default value is true.
+  An AJP flush message is a SEND_BODY_CHUNK packet with no body content.
+  Proxy implementations like mod_jk or mod_proxy_ajp will flush the
+  data buffered in the web server to the client when they receive
+  such a packet. Setting this to false can reduce
+  AJP packet traffic but might delay sending packets to the client.
+  At the end of the response, AJP does always flush to the client.
+
+
 
   The AJP protocol passes some information from the reverse proxy to the
   AJP connector using request attributes. These attributes are:
@@ -439,10 +439,11 @@
   maxConnections feature and connections will not be counted.
 
 
-
-  The maximum number of cookies that are permitted for a request. A 
value
-  of less than zero means no limit. If not specified, a default value of 
200
-  will be used.
+
+  T