Re: [VOTE] Release Apache Tomcat 10.0.12
On Tue, Sep 28, 2021 at 6:59 AM Mark Thomas wrote: > The proposed Apache Tomcat 10.0.12 release is now available for > voting. > > Apache Tomcat 10.x implements Jakarta EE 9 and, as such, the primary > package for all the specification APIs has changed from javax.* to > jakarta.* > > Applications that run on Tomcat 9 will not run on Tomcat 10 without > changes. Java EE applications designed for Tomcat 9 and earlier may be > placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will > automatically convert them to Jakarta EE and copy them to the webapps > directory > > The notable changes compared to 10.0.11 are: > > - Further robustness improvements to HTTP/2 flow control window >management > > - Improvements to the DataSourceUserDatabase > > - Fix an issue that caused some Servlet non-blocking API reads of the >HTTP request body to incorrectly use blocking IO. > > Along with lots of other bug fixes and improvements. > > For full details, see the changelog: > https://ci.apache.org/projects/tomcat/tomcat-10.0.x/docs/changelog.html > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.0.12/ > > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1335 > > The tag is: > https://github.com/apache/tomcat/tree/10.0.12 > 84e18583f461778707f7fd2e25b1f0677e44e899 > > The proposed 10.0.12 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 10.0.12 (stable) > +1 Unit tests passed on Ubuntu 20.04 with Java 11 Igal > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
Re: [VOTE] Release Apache Tomcat 9.0.54
On Tue, Sep 28, 2021 at 7:25 AM Rémy Maucherat wrote: > The proposed Apache Tomcat 9.0.54 release is now available for voting. > > The notable changes compared to 9.0.54 are: > > - Further robustness improvements to HTTP/2 flow control window >management > > - Improvements to the DataSourceUserDatabase > > - Fix an issue that caused some Servlet non-blocking API reads of the >HTTP request body to incorrectly use blocking IO. > > Along with lots of other bug fixes and improvements. > > For full details, see the changelog: > https://ci.apache.org/projects/tomcat/tomcat-9.0.x/docs/changelog.html > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.54/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1336 > The tag is: > https://github.com/apache/tomcat/tree/9.0.54 > 454f804f3336ec980e84eb84bb6a051e349c6d3a > > The proposed 9.0.54 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 9.0.54 (stable) > +1 Unit tests passed on Ubuntu 20.04 with Java 11 Igal > > Rémy > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
Re: [VOTE] Release Apache Tomcat 10.1.0-M6
On Tue, Sep 28, 2021 at 5:31 AM Mark Thomas wrote: > The proposed Apache Tomcat 10.1.0-M6 release is now available for > voting. > > Applications that run on Tomcat 9 and earlier will not run on Tomcat 10 > without changes. Java EE applications designed for Tomcat 9 and earlier > may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat > will automatically convert them to Jakarta EE and copy them to the > webapps directory. > > The notable changes compared to 10.1.0-M5 are: > > - Servlet API updates for Servlet 6 including removal of all deprecated >code, updated schemas and a new API for connection and request IDs. > > - EL API updates for EL 5.0 including deprecation of the use of >FeatureDescriptor, improvements to BeanELResolver and the addition of >MethodReference > > - Further robustness improvements to HTTP/2 flow control window >management > > For full details, see the changelog: > https://ci.apache.org/projects/tomcat/tomcat-10.1.x/docs/changelog.html > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.0-M6/ > > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1334 > > The tag is: > https://github.com/apache/tomcat/tree/10.1.0-M6 > 51d1031c36c0f2b3ee1e0d14b56228a559144153 > > > The proposed 10.1.0-M6 release is: > [ ] Broken - do not release > [X] Alpha - go ahead and release as 10.1.0-M6 (alpha) > Unit tests passed on Ubuntu 20.04 with Java 11 Igal > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
Re: [VOTE] Release Apache Tomcat 10.1.0-M6
On Tue, Sep 28, 2021 at 2:31 PM Mark Thomas wrote: > > The proposed Apache Tomcat 10.1.0-M6 release is now available for > voting. > > Applications that run on Tomcat 9 and earlier will not run on Tomcat 10 > without changes. Java EE applications designed for Tomcat 9 and earlier > may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat > will automatically convert them to Jakarta EE and copy them to the > webapps directory. > > The notable changes compared to 10.1.0-M5 are: > > - Servlet API updates for Servlet 6 including removal of all deprecated >code, updated schemas and a new API for connection and request IDs. > > - EL API updates for EL 5.0 including deprecation of the use of >FeatureDescriptor, improvements to BeanELResolver and the addition of >MethodReference > > - Further robustness improvements to HTTP/2 flow control window >management > > For full details, see the changelog: > https://ci.apache.org/projects/tomcat/tomcat-10.1.x/docs/changelog.html > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.0-M6/ > > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1334 > > The tag is: > https://github.com/apache/tomcat/tree/10.1.0-M6 > 51d1031c36c0f2b3ee1e0d14b56228a559144153 > > > The proposed 10.1.0-M6 release is: > [ ] Broken - do not release > [X] Alpha - go ahead and release as 10.1.0-M6 (alpha) Rémy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #451: make threadNameCache actually useful
markt-asf commented on pull request #451: URL: https://github.com/apache/tomcat/pull/451#issuecomment-928950075 Thanks for the PR. I'll add a change log entry and then back-port it. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf merged pull request #451: make threadNameCache actually useful
markt-asf merged pull request #451: URL: https://github.com/apache/tomcat/pull/451 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE] Release Apache Tomcat 9.0.54
The proposed Apache Tomcat 9.0.54 release is now available for voting. The notable changes compared to 9.0.54 are: - Further robustness improvements to HTTP/2 flow control window management - Improvements to the DataSourceUserDatabase - Fix an issue that caused some Servlet non-blocking API reads of the HTTP request body to incorrectly use blocking IO. Along with lots of other bug fixes and improvements. For full details, see the changelog: https://ci.apache.org/projects/tomcat/tomcat-9.0.x/docs/changelog.html It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.54/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1336 The tag is: https://github.com/apache/tomcat/tree/9.0.54 454f804f3336ec980e84eb84bb6a051e349c6d3a The proposed 9.0.54 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 9.0.54 (stable) Rémy - 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: Increment version for next development cycle
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 bc3737a Increment version for next development cycle bc3737a is described below commit bc3737a60f55b323edf8b07bf0f79e0204d31b15 Author: Mark Thomas AuthorDate: Tue Sep 28 15:02:06 2021 +0100 Increment version for next development cycle --- build.properties.default | 2 +- res/maven/mvn.properties.default | 2 +- webapps/docs/changelog.xml | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.properties.default b/build.properties.default index b6e3235..37e3b42 100644 --- a/build.properties.default +++ b/build.properties.default @@ -31,7 +31,7 @@ # - Version Control Flags - version.major=10 version.minor=0 -version.build=12 +version.build=13 version.patch=0 version.suffix=-dev diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default index 677f7d8..9c65820 100644 --- a/res/maven/mvn.properties.default +++ b/res/maven/mvn.properties.default @@ -39,7 +39,7 @@ maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d maven.asf.release.repo.repositoryId=apache.releases.https # Release version info -maven.asf.release.deploy.version=10.0.12 +maven.asf.release.deploy.version=10.0.13 #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 2fa3410..acadd80 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -104,7 +104,9 @@ They eventually become mixed with the numbered issues (i.e., numbered issues do not "pop up" wrt. others). --> - + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Remove duplicate entry
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 5a9dfd0 Remove duplicate entry 5a9dfd0 is described below commit 5a9dfd09d6b4d0d4d261273e20c62924a93d1e18 Author: Mark Thomas AuthorDate: Tue Sep 28 15:01:07 2021 +0100 Remove duplicate entry --- webapps/docs/changelog.xml | 8 1 file changed, 8 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 5ed91bc..2fa3410 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -183,14 +183,6 @@ - - - -The internal upgrade handler should close the associated -WebConnection on destroy. (remm) - - - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r50152 - in /dev/tomcat/tomcat-9/v9.0.54: ./ bin/ bin/embed/ src/
Author: remm Date: Tue Sep 28 13:59:18 2021 New Revision: 50152 Log: Upload Tomcat 9.0.54 for voting Added: dev/tomcat/tomcat-9/v9.0.54/ dev/tomcat/tomcat-9/v9.0.54/KEYS dev/tomcat/tomcat-9/v9.0.54/README.html dev/tomcat/tomcat-9/v9.0.54/RELEASE-NOTES dev/tomcat/tomcat-9/v9.0.54/bin/ dev/tomcat/tomcat-9/v9.0.54/bin/README.html dev/tomcat/tomcat-9/v9.0.54/bin/apache-tomcat-9.0.54-deployer.tar.gz (with props) dev/tomcat/tomcat-9/v9.0.54/bin/apache-tomcat-9.0.54-deployer.tar.gz.asc (with props) dev/tomcat/tomcat-9/v9.0.54/bin/apache-tomcat-9.0.54-deployer.tar.gz.sha512 dev/tomcat/tomcat-9/v9.0.54/bin/apache-tomcat-9.0.54-deployer.zip (with props) dev/tomcat/tomcat-9/v9.0.54/bin/apache-tomcat-9.0.54-deployer.zip.asc (with props) dev/tomcat/tomcat-9/v9.0.54/bin/apache-tomcat-9.0.54-deployer.zip.sha512 dev/tomcat/tomcat-9/v9.0.54/bin/apache-tomcat-9.0.54-fulldocs.tar.gz (with props) dev/tomcat/tomcat-9/v9.0.54/bin/apache-tomcat-9.0.54-fulldocs.tar.gz.asc (with props) dev/tomcat/tomcat-9/v9.0.54/bin/apache-tomcat-9.0.54-fulldocs.tar.gz.sha512 dev/tomcat/tomcat-9/v9.0.54/bin/apache-tomcat-9.0.54-windows-x64.zip (with props) dev/tomcat/tomcat-9/v9.0.54/bin/apache-tomcat-9.0.54-windows-x64.zip.asc (with props) dev/tomcat/tomcat-9/v9.0.54/bin/apache-tomcat-9.0.54-windows-x64.zip.sha512 dev/tomcat/tomcat-9/v9.0.54/bin/apache-tomcat-9.0.54-windows-x86.zip (with props) dev/tomcat/tomcat-9/v9.0.54/bin/apache-tomcat-9.0.54-windows-x86.zip.asc (with props) dev/tomcat/tomcat-9/v9.0.54/bin/apache-tomcat-9.0.54-windows-x86.zip.sha512 dev/tomcat/tomcat-9/v9.0.54/bin/apache-tomcat-9.0.54.exe (with props) dev/tomcat/tomcat-9/v9.0.54/bin/apache-tomcat-9.0.54.exe.asc (with props) dev/tomcat/tomcat-9/v9.0.54/bin/apache-tomcat-9.0.54.exe.sha512 dev/tomcat/tomcat-9/v9.0.54/bin/apache-tomcat-9.0.54.tar.gz (with props) dev/tomcat/tomcat-9/v9.0.54/bin/apache-tomcat-9.0.54.tar.gz.asc (with props) dev/tomcat/tomcat-9/v9.0.54/bin/apache-tomcat-9.0.54.tar.gz.sha512 dev/tomcat/tomcat-9/v9.0.54/bin/apache-tomcat-9.0.54.zip (with props) dev/tomcat/tomcat-9/v9.0.54/bin/apache-tomcat-9.0.54.zip.asc (with props) dev/tomcat/tomcat-9/v9.0.54/bin/apache-tomcat-9.0.54.zip.sha512 dev/tomcat/tomcat-9/v9.0.54/bin/embed/ dev/tomcat/tomcat-9/v9.0.54/bin/embed/apache-tomcat-9.0.54-embed.tar.gz (with props) dev/tomcat/tomcat-9/v9.0.54/bin/embed/apache-tomcat-9.0.54-embed.tar.gz.asc (with props) dev/tomcat/tomcat-9/v9.0.54/bin/embed/apache-tomcat-9.0.54-embed.tar.gz.sha512 dev/tomcat/tomcat-9/v9.0.54/bin/embed/apache-tomcat-9.0.54-embed.zip (with props) dev/tomcat/tomcat-9/v9.0.54/bin/embed/apache-tomcat-9.0.54-embed.zip.asc (with props) dev/tomcat/tomcat-9/v9.0.54/bin/embed/apache-tomcat-9.0.54-embed.zip.sha512 dev/tomcat/tomcat-9/v9.0.54/src/ dev/tomcat/tomcat-9/v9.0.54/src/apache-tomcat-9.0.54-src.tar.gz (with props) dev/tomcat/tomcat-9/v9.0.54/src/apache-tomcat-9.0.54-src.tar.gz.asc (with props) dev/tomcat/tomcat-9/v9.0.54/src/apache-tomcat-9.0.54-src.tar.gz.sha512 dev/tomcat/tomcat-9/v9.0.54/src/apache-tomcat-9.0.54-src.zip (with props) dev/tomcat/tomcat-9/v9.0.54/src/apache-tomcat-9.0.54-src.zip.asc (with props) dev/tomcat/tomcat-9/v9.0.54/src/apache-tomcat-9.0.54-src.zip.sha512 Added: dev/tomcat/tomcat-9/v9.0.54/KEYS == --- dev/tomcat/tomcat-9/v9.0.54/KEYS (added) +++ dev/tomcat/tomcat-9/v9.0.54/KEYS Tue Sep 28 13:59:18 2021 @@ -0,0 +1,237 @@ +This file contains the PGP keys of various Apache developers. +Please don't use them for email unless you have to. Their main +purpose is code signing. + +Apache users: pgp < KEYS +Apache developers: +(pgpk -ll && pgpk -xa ) >> this file. + or +(gpg --fingerprint --list-sigs + && gpg --armor --export ) >> this file. + +Apache developers: please ensure that your key is also available via the +PGP keyservers (such as pgpkeys.mit.edu). + + +pub 1024D/33C60243 2004-09-12 + Key fingerprint = DCFD 35E0 BF8C A734 4752 DE8B 6FB2 1E89 33C6 0243 +uid Mark E D Thomas +uid Mark E D Thomas +uid Mark E D Thomas +sub 2048g/0BECE548 2004-09-12 + +pub 4096R/2F6059E7 2009-09-18 + Key fingerprint = A9C5 DF4D 22E9 9998 D987 5A51 10C0 1C5A 2F60 59E7 +uid Mark E D Thomas +sub 4096R/5E763BEC 2009-09-18 + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1.4.9 (MingW32) + +mQGiBEFEjegRBADocGttfROvtLGrTOW3xRqZHmFWybmEaI6jmnRdN/1gGXmb3wQL +rHsS3fLFIIOYLPph0Kov9q4qNq36LekShIvjMBDFoj2/wRxaUtFq81asaRZg8Mcw +4kVeIoe8OIOuWmvYhU8SH2jJNUnVVrpTPAa6QWquTmseNi6UJMjLxuL7DwCg//9u +k2yj0vk6e4WSO6Fe5+EkQDED/AjQsy0kj9TpNHkKSSUR2evRlWPYA0YtxBSbsgON
[VOTE] Release Apache Tomcat 10.0.12
The proposed Apache Tomcat 10.0.12 release is now available for voting. Apache Tomcat 10.x implements Jakarta EE 9 and, as such, the primary package for all the specification APIs has changed from javax.* to jakarta.* Applications that run on Tomcat 9 will not run on Tomcat 10 without changes. Java EE applications designed for Tomcat 9 and earlier may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will automatically convert them to Jakarta EE and copy them to the webapps directory The notable changes compared to 10.0.11 are: - Further robustness improvements to HTTP/2 flow control window management - Improvements to the DataSourceUserDatabase - Fix an issue that caused some Servlet non-blocking API reads of the HTTP request body to incorrectly use blocking IO. Along with lots of other bug fixes and improvements. For full details, see the changelog: https://ci.apache.org/projects/tomcat/tomcat-10.0.x/docs/changelog.html It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.0.12/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1335 The tag is: https://github.com/apache/tomcat/tree/10.0.12 84e18583f461778707f7fd2e25b1f0677e44e899 The proposed 10.0.12 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 10.0.12 (stable) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r50151 - in /dev/tomcat/tomcat-10/v10.0.12: ./ bin/ bin/embed/ src/
Author: markt Date: Tue Sep 28 13:50:51 2021 New Revision: 50151 Log: Upload 10.0.12 for voting Added: dev/tomcat/tomcat-10/v10.0.12/ dev/tomcat/tomcat-10/v10.0.12/KEYS dev/tomcat/tomcat-10/v10.0.12/README.html dev/tomcat/tomcat-10/v10.0.12/RELEASE-NOTES dev/tomcat/tomcat-10/v10.0.12/bin/ dev/tomcat/tomcat-10/v10.0.12/bin/README.html dev/tomcat/tomcat-10/v10.0.12/bin/apache-tomcat-10.0.12-deployer.tar.gz (with props) dev/tomcat/tomcat-10/v10.0.12/bin/apache-tomcat-10.0.12-deployer.tar.gz.asc dev/tomcat/tomcat-10/v10.0.12/bin/apache-tomcat-10.0.12-deployer.tar.gz.sha512 dev/tomcat/tomcat-10/v10.0.12/bin/apache-tomcat-10.0.12-deployer.zip (with props) dev/tomcat/tomcat-10/v10.0.12/bin/apache-tomcat-10.0.12-deployer.zip.asc dev/tomcat/tomcat-10/v10.0.12/bin/apache-tomcat-10.0.12-deployer.zip.sha512 dev/tomcat/tomcat-10/v10.0.12/bin/apache-tomcat-10.0.12-fulldocs.tar.gz (with props) dev/tomcat/tomcat-10/v10.0.12/bin/apache-tomcat-10.0.12-fulldocs.tar.gz.asc dev/tomcat/tomcat-10/v10.0.12/bin/apache-tomcat-10.0.12-fulldocs.tar.gz.sha512 dev/tomcat/tomcat-10/v10.0.12/bin/apache-tomcat-10.0.12-windows-x64.zip (with props) dev/tomcat/tomcat-10/v10.0.12/bin/apache-tomcat-10.0.12-windows-x64.zip.asc dev/tomcat/tomcat-10/v10.0.12/bin/apache-tomcat-10.0.12-windows-x64.zip.sha512 dev/tomcat/tomcat-10/v10.0.12/bin/apache-tomcat-10.0.12-windows-x86.zip (with props) dev/tomcat/tomcat-10/v10.0.12/bin/apache-tomcat-10.0.12-windows-x86.zip.asc dev/tomcat/tomcat-10/v10.0.12/bin/apache-tomcat-10.0.12-windows-x86.zip.sha512 dev/tomcat/tomcat-10/v10.0.12/bin/apache-tomcat-10.0.12.exe (with props) dev/tomcat/tomcat-10/v10.0.12/bin/apache-tomcat-10.0.12.exe.asc dev/tomcat/tomcat-10/v10.0.12/bin/apache-tomcat-10.0.12.exe.sha512 dev/tomcat/tomcat-10/v10.0.12/bin/apache-tomcat-10.0.12.tar.gz (with props) dev/tomcat/tomcat-10/v10.0.12/bin/apache-tomcat-10.0.12.tar.gz.asc dev/tomcat/tomcat-10/v10.0.12/bin/apache-tomcat-10.0.12.tar.gz.sha512 dev/tomcat/tomcat-10/v10.0.12/bin/apache-tomcat-10.0.12.zip (with props) dev/tomcat/tomcat-10/v10.0.12/bin/apache-tomcat-10.0.12.zip.asc dev/tomcat/tomcat-10/v10.0.12/bin/apache-tomcat-10.0.12.zip.sha512 dev/tomcat/tomcat-10/v10.0.12/bin/embed/ dev/tomcat/tomcat-10/v10.0.12/bin/embed/apache-tomcat-10.0.12-embed.tar.gz (with props) dev/tomcat/tomcat-10/v10.0.12/bin/embed/apache-tomcat-10.0.12-embed.tar.gz.asc dev/tomcat/tomcat-10/v10.0.12/bin/embed/apache-tomcat-10.0.12-embed.tar.gz.sha512 dev/tomcat/tomcat-10/v10.0.12/bin/embed/apache-tomcat-10.0.12-embed.zip (with props) dev/tomcat/tomcat-10/v10.0.12/bin/embed/apache-tomcat-10.0.12-embed.zip.asc dev/tomcat/tomcat-10/v10.0.12/bin/embed/apache-tomcat-10.0.12-embed.zip.sha512 dev/tomcat/tomcat-10/v10.0.12/src/ dev/tomcat/tomcat-10/v10.0.12/src/apache-tomcat-10.0.12-src.tar.gz (with props) dev/tomcat/tomcat-10/v10.0.12/src/apache-tomcat-10.0.12-src.tar.gz.asc dev/tomcat/tomcat-10/v10.0.12/src/apache-tomcat-10.0.12-src.tar.gz.sha512 dev/tomcat/tomcat-10/v10.0.12/src/apache-tomcat-10.0.12-src.zip (with props) dev/tomcat/tomcat-10/v10.0.12/src/apache-tomcat-10.0.12-src.zip.asc dev/tomcat/tomcat-10/v10.0.12/src/apache-tomcat-10.0.12-src.zip.sha512 Added: dev/tomcat/tomcat-10/v10.0.12/KEYS == --- dev/tomcat/tomcat-10/v10.0.12/KEYS (added) +++ dev/tomcat/tomcat-10/v10.0.12/KEYS Tue Sep 28 13:50:51 2021 @@ -0,0 +1,453 @@ +This file contains the PGP keys of various Apache developers. +Please don't use them for email unless you have to. Their main +purpose is code signing. + +Apache users: pgp < KEYS +Apache developers: +(pgpk -ll && pgpk -xa ) >> this file. + or +(gpg --fingerprint --list-sigs + && gpg --armor --export ) >> this file. + +Apache developers: please ensure that your key is also available via the +PGP keyservers (such as pgpkeys.mit.edu). + + +pub 4096R/2F6059E7 2009-09-18 + Key fingerprint = A9C5 DF4D 22E9 9998 D987 5A51 10C0 1C5A 2F60 59E7 +uid Mark E D Thomas +sub 4096R/5E763BEC 2009-09-18 + +-BEGIN PGP PUBLIC KEY BLOCK- +Comment: GPGTools - http://gpgtools.org + +mQINBEq0DukBEAD4jovHOPJDxoD+JnO1Go2kiwpgRULasGlrVKuSUdP6wzcaqWmX +pqtOJKKwW2MQFQLmg7nQ9RjJwy3QCbKNDJQA/bwbQT1F7WzTCz2S6vxC4zxKck4t +6RZBq2dJsYKF0CEh6ZfY4dmKvhq+3istSoFRdHYoOPGWZpuRDqfZPdGm/m335/6K +GH59oysn1NE7a2a+kZzjBSEgv23+l4Z1Rg7+fpz1JcdHSdC2Z+ZRxML25eVatRVz +4yvDOZItqDURP24zWOodxgboldV6Y88C3v/7KRR+1vklzkuA2FqF8Q4r/2f0su7M +UVviQcy29y/RlLSDTTYoVlCZ1ni14qFU7Hpw43KJtgXmcUwq31T1+SlXdYjNJ1aF +kUi8BjCHDcSgE/IReKUanjHzm4XSymKDTeqqzidi4k6PDD4jyHb8k8vxi6qT6Udn +lcfo5NBkkUT1TauhEy8ktHhbl9k60BvvMBP9l6cURiJg1WS77egI4P/82oPbzzFi +GFqXyJKULVgxtdQ3JikCpodp3f1fh6PlYZwkW4xCJLJucJ5MiQp07HAkMVW5w+k8
[tomcat] branch main updated: Increment version for next development cycle
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 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 7d22587 Increment version for next development cycle 7d22587 is described below commit 7d225870bba98618e0396b6543ae209af5b259e5 Author: Mark Thomas AuthorDate: Tue Sep 28 14:38:19 2021 +0100 Increment version for next development cycle --- build.properties.default | 2 +- res/maven/mvn.properties.default | 2 +- webapps/docs/changelog.xml | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.properties.default b/build.properties.default index f3df001..b177208 100644 --- a/build.properties.default +++ b/build.properties.default @@ -33,7 +33,7 @@ version.major=10 version.minor=1 version.build=0 version.patch=0 -version.suffix=-M6-dev +version.suffix=-M7-dev # - Reproducible builds - # Uncomment and set to current time for reproducible builds diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default index abda5b2..b81a8e0 100644 --- a/res/maven/mvn.properties.default +++ b/res/maven/mvn.properties.default @@ -39,7 +39,7 @@ maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d maven.asf.release.repo.repositoryId=apache.releases.https # Release version info -maven.asf.release.deploy.version=10.1.0-M6 +maven.asf.release.deploy.version=10.1.0-M7 #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 2433c6c..ef3e6d6 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -104,7 +104,9 @@ They eventually become mixed with the numbered issues (i.e., numbered issues do not "pop up" wrt. others). --> - + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Next will be 9.0.55
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new b4ecb88 Next will be 9.0.55 b4ecb88 is described below commit b4ecb88703fd8f2f1c743912ef99f62b68e4894a Author: remm AuthorDate: Tue Sep 28 15:31:23 2021 +0200 Next will be 9.0.55 --- build.properties.default | 2 +- res/maven/mvn.properties.default | 2 +- webapps/docs/changelog.xml | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.properties.default b/build.properties.default index 95804d4..45e2f1d 100644 --- a/build.properties.default +++ b/build.properties.default @@ -31,7 +31,7 @@ # - Version Control Flags - version.major=9 version.minor=0 -version.build=54 +version.build=55 version.patch=0 version.suffix=-dev diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default index a56b70c..bbf8ce0 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=9.0.54 +maven.asf.release.deploy.version=9.0.55 #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 b6ef3ba..989549f 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -104,7 +104,9 @@ They eventually become mixed with the numbered issues (i.e., numbered issues do not "pop up" wrt. others). --> - + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/01: Tag 10.0.12
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to tag 10.0.12 in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 84e18583f461778707f7fd2e25b1f0677e44e899 Author: Mark Thomas AuthorDate: Tue Sep 28 14:28:33 2021 +0100 Tag 10.0.12 --- build.properties.default | 2 +- webapps/docs/changelog.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.properties.default b/build.properties.default index b6e3235..91db4f5 100644 --- a/build.properties.default +++ b/build.properties.default @@ -33,7 +33,7 @@ version.major=10 version.minor=0 version.build=12 version.patch=0 -version.suffix=-dev +version.suffix= # - Reproducible builds - # Uncomment and set to current time for reproducible builds diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 5ed91bc..b4f5656 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -104,7 +104,7 @@ They eventually become mixed with the numbered issues (i.e., numbered issues do not "pop up" wrt. others). --> - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] tag 10.0.12 created (now 84e1858)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to tag 10.0.12 in repository https://gitbox.apache.org/repos/asf/tomcat.git. at 84e1858 (commit) This tag includes the following new commits: new 84e1858 Tag 10.0.12 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/01: Tag 9.0.54
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to tag 9.0.54 in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 454f804f3336ec980e84eb84bb6a051e349c6d3a Author: remm AuthorDate: Tue Sep 28 15:26:54 2021 +0200 Tag 9.0.54 --- build.properties.default | 2 +- webapps/docs/changelog.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.properties.default b/build.properties.default index 95804d4..c551db4 100644 --- a/build.properties.default +++ b/build.properties.default @@ -33,7 +33,7 @@ version.major=9 version.minor=0 version.build=54 version.patch=0 -version.suffix=-dev +version.suffix= # - Reproducible builds - # Uncomment and set to current time for reproducible builds diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index b6ef3ba..77ab1e8 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -104,7 +104,7 @@ They eventually become mixed with the numbered issues (i.e., numbered issues do not "pop up" wrt. others). --> - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] tag 9.0.54 created (now 454f804)
This is an automated email from the ASF dual-hosted git repository. remm pushed a change to tag 9.0.54 in repository https://gitbox.apache.org/repos/asf/tomcat.git. at 454f804 (commit) This tag includes the following new commits: new 454f804 Tag 9.0.54 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/01: Tag 10.0.12
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to tag 10.0.12 in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 024f9a44bef6f2fba28a07e9524ce65ee83bb903 Author: Mark Thomas AuthorDate: Tue Sep 28 14:23:59 2021 +0100 Tag 10.0.12 --- build.properties.default | 2 +- webapps/docs/changelog.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.properties.default b/build.properties.default index c799cd4..1bab897 100644 --- a/build.properties.default +++ b/build.properties.default @@ -33,7 +33,7 @@ version.major=10 version.minor=0 version.build=12 version.patch=0 -version.suffix=-dev +version.suffix= # - Reproducible builds - # Uncomment and set to current time for reproducible builds diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index e4485d0..248aec7 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -104,7 +104,7 @@ They eventually become mixed with the numbered issues (i.e., numbered issues do not "pop up" wrt. others). --> - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] tag 10.0.12 created (now 024f9a44)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to tag 10.0.12 in repository https://gitbox.apache.org/repos/asf/tomcat.git. at 024f9a44 (commit) This tag includes the following new commits: new 024f9a44 Tag 10.0.12 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Fix typos
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 45e25ba Fix typos 45e25ba is described below commit 45e25ba10bbcf53175999c6a2900081c2ff2d93b Author: Mark Thomas AuthorDate: Tue Sep 28 13:38:10 2021 +0100 Fix typos --- webapps/docs/changelog.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 2260a5c..66768e9 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -122,9 +122,9 @@ Further improvements in the management of the connection flow control -window. This addresses various bugs that what cause streams to -incorrectly report that they had timed out waiting for an allocation -from the connection flow control window. (markt) +window. This addresses various bugs that caused streams to incorrectly +report that they had timed out waiting for an allocation from the +connection flow control window. (markt) 65577: Fix a AccessControlException reporting - 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 typos
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 c295b1f Fix typos c295b1f is described below commit c295b1fd1bd7c435fdf7d1aa6a22c0a3714103a9 Author: Mark Thomas AuthorDate: Tue Sep 28 13:38:10 2021 +0100 Fix typos --- webapps/docs/changelog.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 42f226a..b6ef3ba 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -146,9 +146,9 @@ Further improvements in the management of the connection flow control -window. This addresses various bugs that what cause streams to -incorrectly report that they had timed out waiting for an allocation -from the connection flow control window. (markt) +window. This addresses various bugs that caused streams to incorrectly +report that they had timed out waiting for an allocation from the +connection flow control window. (markt) 65577: Fix a AccessControlException reporting - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Fix typos
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 dbbeb37348b94b1be008330915932778177f2719 Author: Mark Thomas AuthorDate: Tue Sep 28 13:38:10 2021 +0100 Fix typos --- webapps/docs/changelog.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index e4485d0..5ed91bc 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -146,9 +146,9 @@ Further improvements in the management of the connection flow control -window. This addresses various bugs that what cause streams to -incorrectly report that they had timed out waiting for an allocation -from the connection flow control window. (markt) +window. This addresses various bugs that caused streams to incorrectly +report that they had timed out waiting for an allocation from the +connection flow control window. (markt) 65577: Fix a AccessControlException reporting - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Update build timestamp (currently unused)
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 fe7f3d9ec81b8dfaad3eb470e578c95d2ffc3528 Author: Mark Thomas AuthorDate: Tue Sep 28 12:50:55 2021 +0100 Update build timestamp (currently unused) --- build.properties.default | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.properties.default b/build.properties.default index c799cd4..b6e3235 100644 --- a/build.properties.default +++ b/build.properties.default @@ -38,8 +38,8 @@ version.suffix=-dev # - Reproducible builds - # Uncomment and set to current time for reproducible builds # Note: The value is in seconds (unlike milliseconds used by System.currentTimeMillis()). -#2021-09-06T18:00:00Z -#ant.tstamp.now=1630951200 +#2021-09-28T12:09:00Z +#ant.tstamp.now=1632819600 # - Source control flags - git.branch=10.0.x - 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 (8acff39 -> dbbeb37)
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 8acff39 make threadNameCache actually useful new fe7f3d9 Update build timestamp (currently unused) new dbbeb37 Fix typos The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: build.properties.default | 4 ++-- webapps/docs/changelog.xml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix typos
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 3dc9725 Fix typos 3dc9725 is described below commit 3dc97251bfecd5bed27f74ff0f676721227103b6 Author: Mark Thomas AuthorDate: Tue Sep 28 13:38:10 2021 +0100 Fix typos --- webapps/docs/changelog.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index b7c0170..2433c6c 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -158,9 +158,9 @@ Further improvements in the management of the connection flow control -window. This addresses various bugs that what cause streams to -incorrectly report that they had timed out waiting for an allocation -from the connection flow control window. (markt) +window. This addresses various bugs that caused streams to incorrectly +report that they had timed out waiting for an allocation from the +connection flow control window. (markt) 65577: Fix a AccessControlException reporting - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix typos
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 4a53eee Fix typos 4a53eee is described below commit 4a53eeeb7dc50eed6f96fa87f4dc1d1027325b16 Author: Mark Thomas AuthorDate: Tue Sep 28 13:37:13 2021 +0100 Fix typos --- 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 88a8279..b7c0170 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -120,7 +120,7 @@ recent changes in the Jakarta Servlet specification project. (markt) -Add the current available Jakarta EE 10 schemas from the Jakarta EE +Add the currently available Jakarta EE 10 schemas from the Jakarta EE schema project. (markt) @@ -189,7 +189,7 @@ Add support for MethodReference and the associated getter -on MehtodExpression to align Tomcat with recent updates in +on MethodExpression to align Tomcat with recent updates in the Jakarta EL specification project. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE] Release Apache Tomcat 10.1.0-M6
The proposed Apache Tomcat 10.1.0-M6 release is now available for voting. Applications that run on Tomcat 9 and earlier will not run on Tomcat 10 without changes. Java EE applications designed for Tomcat 9 and earlier may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will automatically convert them to Jakarta EE and copy them to the webapps directory. The notable changes compared to 10.1.0-M5 are: - Servlet API updates for Servlet 6 including removal of all deprecated code, updated schemas and a new API for connection and request IDs. - EL API updates for EL 5.0 including deprecation of the use of FeatureDescriptor, improvements to BeanELResolver and the addition of MethodReference - Further robustness improvements to HTTP/2 flow control window management For full details, see the changelog: https://ci.apache.org/projects/tomcat/tomcat-10.1.x/docs/changelog.html It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.0-M6/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1334 The tag is: https://github.com/apache/tomcat/tree/10.1.0-M6 51d1031c36c0f2b3ee1e0d14b56228a559144153 The proposed 10.1.0-M6 release is: [ ] Broken - do not release [ ] Alpha - go ahead and release as 10.1.0-M6 (alpha) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r50146 - in /dev/tomcat/tomcat-10/v10.1.0-M6: ./ bin/ bin/embed/ src/
Author: markt Date: Tue Sep 28 11:47:55 2021 New Revision: 50146 Log: Upload 10.1.0-M6 for voting Added: dev/tomcat/tomcat-10/v10.1.0-M6/ dev/tomcat/tomcat-10/v10.1.0-M6/KEYS dev/tomcat/tomcat-10/v10.1.0-M6/README.html dev/tomcat/tomcat-10/v10.1.0-M6/RELEASE-NOTES dev/tomcat/tomcat-10/v10.1.0-M6/bin/ dev/tomcat/tomcat-10/v10.1.0-M6/bin/README.html dev/tomcat/tomcat-10/v10.1.0-M6/bin/apache-tomcat-10.1.0-M6-deployer.tar.gz (with props) dev/tomcat/tomcat-10/v10.1.0-M6/bin/apache-tomcat-10.1.0-M6-deployer.tar.gz.asc dev/tomcat/tomcat-10/v10.1.0-M6/bin/apache-tomcat-10.1.0-M6-deployer.tar.gz.sha512 dev/tomcat/tomcat-10/v10.1.0-M6/bin/apache-tomcat-10.1.0-M6-deployer.zip (with props) dev/tomcat/tomcat-10/v10.1.0-M6/bin/apache-tomcat-10.1.0-M6-deployer.zip.asc dev/tomcat/tomcat-10/v10.1.0-M6/bin/apache-tomcat-10.1.0-M6-deployer.zip.sha512 dev/tomcat/tomcat-10/v10.1.0-M6/bin/apache-tomcat-10.1.0-M6-fulldocs.tar.gz (with props) dev/tomcat/tomcat-10/v10.1.0-M6/bin/apache-tomcat-10.1.0-M6-fulldocs.tar.gz.asc dev/tomcat/tomcat-10/v10.1.0-M6/bin/apache-tomcat-10.1.0-M6-fulldocs.tar.gz.sha512 dev/tomcat/tomcat-10/v10.1.0-M6/bin/apache-tomcat-10.1.0-M6-windows-x64.zip (with props) dev/tomcat/tomcat-10/v10.1.0-M6/bin/apache-tomcat-10.1.0-M6-windows-x64.zip.asc dev/tomcat/tomcat-10/v10.1.0-M6/bin/apache-tomcat-10.1.0-M6-windows-x64.zip.sha512 dev/tomcat/tomcat-10/v10.1.0-M6/bin/apache-tomcat-10.1.0-M6-windows-x86.zip (with props) dev/tomcat/tomcat-10/v10.1.0-M6/bin/apache-tomcat-10.1.0-M6-windows-x86.zip.asc dev/tomcat/tomcat-10/v10.1.0-M6/bin/apache-tomcat-10.1.0-M6-windows-x86.zip.sha512 dev/tomcat/tomcat-10/v10.1.0-M6/bin/apache-tomcat-10.1.0-M6.exe (with props) dev/tomcat/tomcat-10/v10.1.0-M6/bin/apache-tomcat-10.1.0-M6.exe.asc dev/tomcat/tomcat-10/v10.1.0-M6/bin/apache-tomcat-10.1.0-M6.exe.sha512 dev/tomcat/tomcat-10/v10.1.0-M6/bin/apache-tomcat-10.1.0-M6.tar.gz (with props) dev/tomcat/tomcat-10/v10.1.0-M6/bin/apache-tomcat-10.1.0-M6.tar.gz.asc dev/tomcat/tomcat-10/v10.1.0-M6/bin/apache-tomcat-10.1.0-M6.tar.gz.sha512 dev/tomcat/tomcat-10/v10.1.0-M6/bin/apache-tomcat-10.1.0-M6.zip (with props) dev/tomcat/tomcat-10/v10.1.0-M6/bin/apache-tomcat-10.1.0-M6.zip.asc dev/tomcat/tomcat-10/v10.1.0-M6/bin/apache-tomcat-10.1.0-M6.zip.sha512 dev/tomcat/tomcat-10/v10.1.0-M6/bin/embed/ dev/tomcat/tomcat-10/v10.1.0-M6/bin/embed/apache-tomcat-10.1.0-M6-embed.tar.gz (with props) dev/tomcat/tomcat-10/v10.1.0-M6/bin/embed/apache-tomcat-10.1.0-M6-embed.tar.gz.asc dev/tomcat/tomcat-10/v10.1.0-M6/bin/embed/apache-tomcat-10.1.0-M6-embed.tar.gz.sha512 dev/tomcat/tomcat-10/v10.1.0-M6/bin/embed/apache-tomcat-10.1.0-M6-embed.zip (with props) dev/tomcat/tomcat-10/v10.1.0-M6/bin/embed/apache-tomcat-10.1.0-M6-embed.zip.asc dev/tomcat/tomcat-10/v10.1.0-M6/bin/embed/apache-tomcat-10.1.0-M6-embed.zip.sha512 dev/tomcat/tomcat-10/v10.1.0-M6/src/ dev/tomcat/tomcat-10/v10.1.0-M6/src/apache-tomcat-10.1.0-M6-src.tar.gz (with props) dev/tomcat/tomcat-10/v10.1.0-M6/src/apache-tomcat-10.1.0-M6-src.tar.gz.asc dev/tomcat/tomcat-10/v10.1.0-M6/src/apache-tomcat-10.1.0-M6-src.tar.gz.sha512 dev/tomcat/tomcat-10/v10.1.0-M6/src/apache-tomcat-10.1.0-M6-src.zip (with props) dev/tomcat/tomcat-10/v10.1.0-M6/src/apache-tomcat-10.1.0-M6-src.zip.asc dev/tomcat/tomcat-10/v10.1.0-M6/src/apache-tomcat-10.1.0-M6-src.zip.sha512 Added: dev/tomcat/tomcat-10/v10.1.0-M6/KEYS == --- dev/tomcat/tomcat-10/v10.1.0-M6/KEYS (added) +++ dev/tomcat/tomcat-10/v10.1.0-M6/KEYS Tue Sep 28 11:47:55 2021 @@ -0,0 +1,453 @@ +This file contains the PGP keys of various Apache developers. +Please don't use them for email unless you have to. Their main +purpose is code signing. + +Apache users: pgp < KEYS +Apache developers: +(pgpk -ll && pgpk -xa ) >> this file. + or +(gpg --fingerprint --list-sigs + && gpg --armor --export ) >> this file. + +Apache developers: please ensure that your key is also available via the +PGP keyservers (such as pgpkeys.mit.edu). + + +pub 4096R/2F6059E7 2009-09-18 + Key fingerprint = A9C5 DF4D 22E9 9998 D987 5A51 10C0 1C5A 2F60 59E7 +uid Mark E D Thomas +sub 4096R/5E763BEC 2009-09-18 + +-BEGIN PGP PUBLIC KEY BLOCK- +Comment: GPGTools - http://gpgtools.org + +mQINBEq0DukBEAD4jovHOPJDxoD+JnO1Go2kiwpgRULasGlrVKuSUdP6wzcaqWmX +pqtOJKKwW2MQFQLmg7nQ9RjJwy3QCbKNDJQA/bwbQT1F7WzTCz2S6vxC4zxKck4t +6RZBq2dJsYKF0CEh6ZfY4dmKvhq+3istSoFRdHYoOPGWZpuRDqfZPdGm/m335/6K +GH59oysn1NE7a2a+kZzjBSEgv23+l4Z1Rg7+fpz1JcdHSdC2Z+ZRxML25eVatRVz +4yvDOZItqDURP24zWOodxgboldV6Y88C3v/7KRR+1vklzkuA2FqF8Q4r/2f0su7M +UVviQcy29y/RlLSDTTYoVlCZ1ni14qFU7Hpw43KJtgXmcUwq31T1+SlXdYjNJ1aF
[tomcat] branch 9.0.x updated: Update build timestamp (currently unused)
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new 3acc953 Update build timestamp (currently unused) 3acc953 is described below commit 3acc95368ac586ee712706c8446c5abaa4f86722 Author: Mark Thomas AuthorDate: Tue Sep 28 10:48:39 2021 +0100 Update build timestamp (currently unused) --- build.properties.default | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.properties.default b/build.properties.default index 2144107..95804d4 100644 --- a/build.properties.default +++ b/build.properties.default @@ -38,8 +38,8 @@ version.suffix=-dev # - Reproducible builds - # Uncomment and set to current time for reproducible builds # Note: The value is in seconds (unlike milliseconds used by System.currentTimeMillis()). -#2021-09-06T12:00:00Z -#ant.tstamp.now=1630929600 +#2021-09-28T12:09:00Z +#ant.tstamp.now=1632819600 # - Source control flags - git.branch=9.0.x - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/01: Tag 10.1.0-M6
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to tag 10.1.0-M6 in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 51d1031c36c0f2b3ee1e0d14b56228a559144153 Author: Mark Thomas AuthorDate: Tue Sep 28 12:22:27 2021 +0100 Tag 10.1.0-M6 --- build.properties.default | 2 +- webapps/docs/changelog.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.properties.default b/build.properties.default index f3df001..020ccba 100644 --- a/build.properties.default +++ b/build.properties.default @@ -33,7 +33,7 @@ version.major=10 version.minor=1 version.build=0 version.patch=0 -version.suffix=-M6-dev +version.suffix=-M6 # - Reproducible builds - # Uncomment and set to current time for reproducible builds diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 88a8279..9d15b96 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -104,7 +104,7 @@ They eventually become mixed with the numbered issues (i.e., numbered issues do not "pop up" wrt. others). --> - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] tag 10.1.0-M6 created (now 51d1031)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to tag 10.1.0-M6 in repository https://gitbox.apache.org/repos/asf/tomcat.git. at 51d1031 (commit) This tag includes the following new commits: new 51d1031 Tag 10.1.0-M6 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Update build timestamp (currently unused)
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 0023329 Update build timestamp (currently unused) 0023329 is described below commit 0023329dd62e0f17b7e07dace7b109be84cd6e41 Author: Mark Thomas AuthorDate: Tue Sep 28 10:48:39 2021 +0100 Update build timestamp (currently unused) --- build.properties.default | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.properties.default b/build.properties.default index e924e7e..f3df001 100644 --- a/build.properties.default +++ b/build.properties.default @@ -38,8 +38,8 @@ version.suffix=-M6-dev # - Reproducible builds - # Uncomment and set to current time for reproducible builds # Note: The value is in seconds (unlike milliseconds used by System.currentTimeMillis()). -#2021-09-06T12:00:00Z -#ant.tstamp.now=1630929600 +#2021-09-28T12:09:00Z +#ant.tstamp.now=1632819600 # - Source control flags - git.branch=main - 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: make threadNameCache actually useful
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 9eaffc1 make threadNameCache actually useful
9eaffc1 is described below
commit 9eaffc1280beafc0a1dead0f7b274351c00e2ed3
Author: t-gergely <8715996+t-gerg...@users.noreply.github.com>
AuthorDate: Wed Sep 15 12:26:28 2021 +0200
make threadNameCache actually useful
---
java/org/apache/juli/OneLineFormatter.java| 8 +---
test/org/apache/juli/TestThreadNameCache.java | 61 +++
webapps/docs/changelog.xml| 4 ++
3 files changed, 67 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/juli/OneLineFormatter.java
b/java/org/apache/juli/OneLineFormatter.java
index 968a692..c2e34d8 100644
--- a/java/org/apache/juli/OneLineFormatter.java
+++ b/java/org/apache/juli/OneLineFormatter.java
@@ -43,7 +43,7 @@ public class OneLineFormatter extends Formatter {
private static final Object threadMxBeanLock = new Object();
private static volatile ThreadMXBean threadMxBean = null;
private static final int THREAD_NAME_CACHE_SIZE = 1;
-private static ThreadLocal threadNameCache = new
ThreadLocal() {
+private static final ThreadLocal threadNameCache = new
ThreadLocal() {
@Override
protected ThreadNameCache initialValue() {
return new ThreadNameCache(THREAD_NAME_CACHE_SIZE);
@@ -230,11 +230,7 @@ public class OneLineFormatter extends Formatter {
*/
private static String getThreadName(int logRecordThreadId) {
Map cache = threadNameCache.get();
-String result = null;
-
-if (logRecordThreadId > (Integer.MAX_VALUE / 2)) {
-result = cache.get(Integer.valueOf(logRecordThreadId));
-}
+String result = cache.get(Integer.valueOf(logRecordThreadId));
if (result != null) {
return result;
diff --git a/test/org/apache/juli/TestThreadNameCache.java
b/test/org/apache/juli/TestThreadNameCache.java
new file mode 100644
index 000..d32efb81
--- /dev/null
+++ b/test/org/apache/juli/TestThreadNameCache.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.juli;
+
+import java.lang.reflect.Method;
+import java.util.concurrent.CountDownLatch;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestThreadNameCache {
+private Integer threadId;
+
+@Test
+public void testCache() throws Exception {
+final String THREAD_NAME = "t-TestThreadNameCache";
+final CountDownLatch threadIdLatch = new CountDownLatch(1);
+final CountDownLatch cacheLatch = new CountDownLatch(1);
+
+OneLineFormatter olf = new OneLineFormatter();
+Method getThreadName =
olf.getClass().getDeclaredMethod("getThreadName", int.class);
+getThreadName.setAccessible(true);
+Thread thread = new Thread() {
+@Override
+public void run() {
+setName(THREAD_NAME);
+threadId = Integer.valueOf((int) getId());
+threadIdLatch.countDown();
+try {
+cacheLatch.await();
+} catch (InterruptedException ex) {
+throw new RuntimeException(ex);
+}
+}
+};
+
+thread.start();
+threadIdLatch.await();
+Object name = getThreadName.invoke(olf, threadId);
+cacheLatch.countDown();
+Assert.assertEquals(THREAD_NAME, name);
+
+thread.join();
+name = getThreadName.invoke(olf, threadId);
+Assert.assertEquals(THREAD_NAME, name);
+}
+}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 85471c5..2260a5c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -112,6 +112,10 @@
https://bugs.openjdk.java.net/browse/JDK-8273874;>JRE bug
that can trigger a memory leak when using the JNDI realm. (markt)
+
+451: Improve the usefulness of the thread name cache used in
+JULI.
[tomcat] branch 9.0.x updated: make threadNameCache actually useful
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 3dfe108 make threadNameCache actually useful
3dfe108 is described below
commit 3dfe1087dc7d4825ba10ee65c81be328cca137cb
Author: t-gergely <8715996+t-gerg...@users.noreply.github.com>
AuthorDate: Wed Sep 15 12:26:28 2021 +0200
make threadNameCache actually useful
---
java/org/apache/juli/OneLineFormatter.java| 8 +---
test/org/apache/juli/TestThreadNameCache.java | 61 +++
webapps/docs/changelog.xml| 4 ++
3 files changed, 67 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/juli/OneLineFormatter.java
b/java/org/apache/juli/OneLineFormatter.java
index ba340bd..3f1e4f6 100644
--- a/java/org/apache/juli/OneLineFormatter.java
+++ b/java/org/apache/juli/OneLineFormatter.java
@@ -43,7 +43,7 @@ public class OneLineFormatter extends Formatter {
private static final Object threadMxBeanLock = new Object();
private static volatile ThreadMXBean threadMxBean = null;
private static final int THREAD_NAME_CACHE_SIZE = 1;
-private static ThreadLocal threadNameCache =
+private static final ThreadLocal threadNameCache =
ThreadLocal.withInitial(() -> new
ThreadNameCache(THREAD_NAME_CACHE_SIZE));
/* Timestamp format */
@@ -221,11 +221,7 @@ public class OneLineFormatter extends Formatter {
*/
private static String getThreadName(int logRecordThreadId) {
Map cache = threadNameCache.get();
-String result = null;
-
-if (logRecordThreadId > (Integer.MAX_VALUE / 2)) {
-result = cache.get(Integer.valueOf(logRecordThreadId));
-}
+String result = cache.get(Integer.valueOf(logRecordThreadId));
if (result != null) {
return result;
diff --git a/test/org/apache/juli/TestThreadNameCache.java
b/test/org/apache/juli/TestThreadNameCache.java
new file mode 100644
index 000..d32efb81
--- /dev/null
+++ b/test/org/apache/juli/TestThreadNameCache.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.juli;
+
+import java.lang.reflect.Method;
+import java.util.concurrent.CountDownLatch;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestThreadNameCache {
+private Integer threadId;
+
+@Test
+public void testCache() throws Exception {
+final String THREAD_NAME = "t-TestThreadNameCache";
+final CountDownLatch threadIdLatch = new CountDownLatch(1);
+final CountDownLatch cacheLatch = new CountDownLatch(1);
+
+OneLineFormatter olf = new OneLineFormatter();
+Method getThreadName =
olf.getClass().getDeclaredMethod("getThreadName", int.class);
+getThreadName.setAccessible(true);
+Thread thread = new Thread() {
+@Override
+public void run() {
+setName(THREAD_NAME);
+threadId = Integer.valueOf((int) getId());
+threadIdLatch.countDown();
+try {
+cacheLatch.await();
+} catch (InterruptedException ex) {
+throw new RuntimeException(ex);
+}
+}
+};
+
+thread.start();
+threadIdLatch.await();
+Object name = getThreadName.invoke(olf, threadId);
+cacheLatch.countDown();
+Assert.assertEquals(THREAD_NAME, name);
+
+thread.join();
+name = getThreadName.invoke(olf, threadId);
+Assert.assertEquals(THREAD_NAME, name);
+}
+}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a06329a..42f226a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -126,6 +126,10 @@
correctly for directory lookups whether or not the provided directory
name includes the trailing /. (markt)
+
+451: Improve the usefulness of the thread name cache used in
+JULI. Pull request provided by t-gergely. (markt)
+
[tomcat] branch 10.0.x updated: make threadNameCache actually useful
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 8acff39 make threadNameCache actually useful
8acff39 is described below
commit 8acff39b53fc9c64ce29638074bdbc585b06d960
Author: t-gergely <8715996+t-gerg...@users.noreply.github.com>
AuthorDate: Wed Sep 15 12:26:28 2021 +0200
make threadNameCache actually useful
---
java/org/apache/juli/OneLineFormatter.java| 8 +---
test/org/apache/juli/TestThreadNameCache.java | 61 +++
webapps/docs/changelog.xml| 4 ++
3 files changed, 67 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/juli/OneLineFormatter.java
b/java/org/apache/juli/OneLineFormatter.java
index ba340bd..3f1e4f6 100644
--- a/java/org/apache/juli/OneLineFormatter.java
+++ b/java/org/apache/juli/OneLineFormatter.java
@@ -43,7 +43,7 @@ public class OneLineFormatter extends Formatter {
private static final Object threadMxBeanLock = new Object();
private static volatile ThreadMXBean threadMxBean = null;
private static final int THREAD_NAME_CACHE_SIZE = 1;
-private static ThreadLocal threadNameCache =
+private static final ThreadLocal threadNameCache =
ThreadLocal.withInitial(() -> new
ThreadNameCache(THREAD_NAME_CACHE_SIZE));
/* Timestamp format */
@@ -221,11 +221,7 @@ public class OneLineFormatter extends Formatter {
*/
private static String getThreadName(int logRecordThreadId) {
Map cache = threadNameCache.get();
-String result = null;
-
-if (logRecordThreadId > (Integer.MAX_VALUE / 2)) {
-result = cache.get(Integer.valueOf(logRecordThreadId));
-}
+String result = cache.get(Integer.valueOf(logRecordThreadId));
if (result != null) {
return result;
diff --git a/test/org/apache/juli/TestThreadNameCache.java
b/test/org/apache/juli/TestThreadNameCache.java
new file mode 100644
index 000..d32efb81
--- /dev/null
+++ b/test/org/apache/juli/TestThreadNameCache.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.juli;
+
+import java.lang.reflect.Method;
+import java.util.concurrent.CountDownLatch;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestThreadNameCache {
+private Integer threadId;
+
+@Test
+public void testCache() throws Exception {
+final String THREAD_NAME = "t-TestThreadNameCache";
+final CountDownLatch threadIdLatch = new CountDownLatch(1);
+final CountDownLatch cacheLatch = new CountDownLatch(1);
+
+OneLineFormatter olf = new OneLineFormatter();
+Method getThreadName =
olf.getClass().getDeclaredMethod("getThreadName", int.class);
+getThreadName.setAccessible(true);
+Thread thread = new Thread() {
+@Override
+public void run() {
+setName(THREAD_NAME);
+threadId = Integer.valueOf((int) getId());
+threadIdLatch.countDown();
+try {
+cacheLatch.await();
+} catch (InterruptedException ex) {
+throw new RuntimeException(ex);
+}
+}
+};
+
+thread.start();
+threadIdLatch.await();
+Object name = getThreadName.invoke(olf, threadId);
+cacheLatch.countDown();
+Assert.assertEquals(THREAD_NAME, name);
+
+thread.join();
+name = getThreadName.invoke(olf, threadId);
+Assert.assertEquals(THREAD_NAME, name);
+}
+}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 57d4070..e4485d0 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -126,6 +126,10 @@
correctly for directory lookups whether or not the provided directory
name includes the trailing /. (markt)
+
+451: Improve the usefulness of the thread name cache used in
+JULI. Pull request provided by t-gergely. (markt)
+
[tomcat] branch main updated: Add change log entry. Fix Checkstyle and IDE warnings.
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 3e6abee Add change log entry. Fix Checkstyle and IDE warnings.
3e6abee is described below
commit 3e6abeeec3f88fad7825880a5a963e1be34f6204
Author: Mark Thomas
AuthorDate: Tue Sep 28 09:06:23 2021 +0100
Add change log entry. Fix Checkstyle and IDE warnings.
---
test/org/apache/juli/TestThreadNameCache.java | 5 +++--
webapps/docs/changelog.xml| 4
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/test/org/apache/juli/TestThreadNameCache.java
b/test/org/apache/juli/TestThreadNameCache.java
index 8764c0d..d32efb81 100644
--- a/test/org/apache/juli/TestThreadNameCache.java
+++ b/test/org/apache/juli/TestThreadNameCache.java
@@ -18,11 +18,12 @@ package org.apache.juli;
import java.lang.reflect.Method;
import java.util.concurrent.CountDownLatch;
+
import org.junit.Assert;
import org.junit.Test;
public class TestThreadNameCache {
-private int threadId;
+private Integer threadId;
@Test
public void testCache() throws Exception {
@@ -37,7 +38,7 @@ public class TestThreadNameCache {
@Override
public void run() {
setName(THREAD_NAME);
-threadId= (int) getId();
+threadId = Integer.valueOf((int) getId());
threadIdLatch.countDown();
try {
cacheLatch.await();
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c5faa46..88a8279 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -138,6 +138,10 @@
correctly for directory lookups whether or not the provided directory
name includes the trailing /. (markt)
+
+451: Improve the usefulness of the thread name cache used in
+JULI. Pull request provided by t-gergely. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #451: make threadNameCache actually useful
markt-asf commented on pull request #451: URL: https://github.com/apache/tomcat/pull/451#issuecomment-928950075 Thanks for the PR. I'll add a change log entry and then back-port it. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf merged pull request #451: make threadNameCache actually useful
markt-asf merged pull request #451: URL: https://github.com/apache/tomcat/pull/451 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: make threadNameCache actually useful
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 fa768e3 make threadNameCache actually useful
fa768e3 is described below
commit fa768e3878ae56fbdfadf3a86e1d218e722c459d
Author: t-gergely <8715996+t-gerg...@users.noreply.github.com>
AuthorDate: Wed Sep 15 12:26:28 2021 +0200
make threadNameCache actually useful
---
java/org/apache/juli/OneLineFormatter.java| 8 +---
test/org/apache/juli/TestThreadNameCache.java | 60 +++
2 files changed, 62 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/juli/OneLineFormatter.java
b/java/org/apache/juli/OneLineFormatter.java
index ba340bd..3f1e4f6 100644
--- a/java/org/apache/juli/OneLineFormatter.java
+++ b/java/org/apache/juli/OneLineFormatter.java
@@ -43,7 +43,7 @@ public class OneLineFormatter extends Formatter {
private static final Object threadMxBeanLock = new Object();
private static volatile ThreadMXBean threadMxBean = null;
private static final int THREAD_NAME_CACHE_SIZE = 1;
-private static ThreadLocal threadNameCache =
+private static final ThreadLocal threadNameCache =
ThreadLocal.withInitial(() -> new
ThreadNameCache(THREAD_NAME_CACHE_SIZE));
/* Timestamp format */
@@ -221,11 +221,7 @@ public class OneLineFormatter extends Formatter {
*/
private static String getThreadName(int logRecordThreadId) {
Map cache = threadNameCache.get();
-String result = null;
-
-if (logRecordThreadId > (Integer.MAX_VALUE / 2)) {
-result = cache.get(Integer.valueOf(logRecordThreadId));
-}
+String result = cache.get(Integer.valueOf(logRecordThreadId));
if (result != null) {
return result;
diff --git a/test/org/apache/juli/TestThreadNameCache.java
b/test/org/apache/juli/TestThreadNameCache.java
new file mode 100644
index 000..8764c0d
--- /dev/null
+++ b/test/org/apache/juli/TestThreadNameCache.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.juli;
+
+import java.lang.reflect.Method;
+import java.util.concurrent.CountDownLatch;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestThreadNameCache {
+private int threadId;
+
+@Test
+public void testCache() throws Exception {
+final String THREAD_NAME = "t-TestThreadNameCache";
+final CountDownLatch threadIdLatch = new CountDownLatch(1);
+final CountDownLatch cacheLatch = new CountDownLatch(1);
+
+OneLineFormatter olf = new OneLineFormatter();
+Method getThreadName =
olf.getClass().getDeclaredMethod("getThreadName", int.class);
+getThreadName.setAccessible(true);
+Thread thread = new Thread() {
+@Override
+public void run() {
+setName(THREAD_NAME);
+threadId= (int) getId();
+threadIdLatch.countDown();
+try {
+cacheLatch.await();
+} catch (InterruptedException ex) {
+throw new RuntimeException(ex);
+}
+}
+};
+
+thread.start();
+threadIdLatch.await();
+Object name = getThreadName.invoke(olf, threadId);
+cacheLatch.countDown();
+Assert.assertEquals(THREAD_NAME, name);
+
+thread.join();
+name = getThreadName.invoke(olf, threadId);
+Assert.assertEquals(THREAD_NAME, name);
+}
+}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Refactoring handling of TRACE requests
On 28/09/2021 00:33, Konstantin Kolinko wrote: пн, 27 сент. 2021 г. в 14:03, Mark Thomas : Hi all, I've been having some conversations at $work about Tomcat's handling of TRACE requests and the allowTrace option on the Connector. Something that was said in that discussion got me thinking. Why do we have special handling for TRACE requests on the Connector? Why not use a security constraint in the global web.xml? I've done a quick test, setting allowTrace to true on the Connector and adding the following to the global web.xml: /* TRACE This blocks TRACE requests as expected. What do the folks here think about deprecating allowTrace on the Connector for 10.0.x and removing it (and the special handling in HttpServlet) in 10.1.x onwards - replacing it with the security constraint above. In short, it does not work. See point 1.c) below and my test runs below an "~" bar. I am leaving my other points as I wrote them, for completeness. Thanks for checking this. I hadn't fully thought through the implications of the rules for combining security constraints. I agree, my proposal isn't going to work. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in on tomcat-9.0.x
The Buildbot has detected a restored build on builder tomcat-9.0.x while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-9.0.x/builds/145 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-9.0-commit' triggered this build Build Source Stamp: [branch 9.0.x] dfc44ac3ce6987519f5afc714b29e694f585c58d Blamelist: Mark Thomas Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 65553] Orphaned thread by JNDIRealm / clearReferencesThreads reports memory leak
https://bz.apache.org/bugzilla/show_bug.cgi?id=65553 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #6 from Mark Thomas --- Work-around added in: - 10.1.x for 10.1.0-M6 onwards - 10.0.x for 10.0.12 onwards - 9.0.x for 9.0.54 onwards - 8.5.x for 8.5.72 onwards It will need to stay in place for these versions. Once there a fix in the JRE and Tomcat's minimum JRE version is known to include the fix, then we can remove the work-around. -- 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 8.5.x updated: Fix BZ 65553 - add workaround for JRE triggered memory leak
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 72cbdb9 Fix BZ 65553 - add workaround for JRE triggered memory leak
72cbdb9 is described below
commit 72cbdb92cad4d8ffbcac8945ca02036c9c2382f2
Author: Mark Thomas
AuthorDate: Tue Sep 28 08:19:14 2021 +0100
Fix BZ 65553 - add workaround for JRE triggered memory leak
https://bz.apache.org/bugzilla/show_bug.cgi?id=65553
https://bugs.openjdk.java.net/browse/JDK-8273874
---
java/org/apache/catalina/realm/JNDIRealm.java | 242 +-
webapps/docs/changelog.xml| 9 +
2 files changed, 208 insertions(+), 43 deletions(-)
diff --git a/java/org/apache/catalina/realm/JNDIRealm.java
b/java/org/apache/catalina/realm/JNDIRealm.java
index b0e75a5..c16a444 100644
--- a/java/org/apache/catalina/realm/JNDIRealm.java
+++ b/java/org/apache/catalina/realm/JNDIRealm.java
@@ -22,6 +22,7 @@ import java.net.URISyntaxException;
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
import java.security.Principal;
+import java.security.cert.X509Certificate;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
@@ -64,6 +65,7 @@ import javax.net.ssl.SSLSocketFactory;
import org.apache.catalina.LifecycleException;
import org.apache.tomcat.util.collections.SynchronizedStack;
+import org.ietf.jgss.GSSContext;
import org.ietf.jgss.GSSCredential;
import org.ietf.jgss.GSSName;
@@ -1223,10 +1225,19 @@ public class JNDIRealm extends RealmBase {
@Override
public Principal authenticate(String username, String credentials) {
+ClassLoader ocl = null;
JNDIConnection connection = null;
Principal principal = null;
try {
+// https://bz.apache.org/bugzilla/show_bug.cgi?id=65553
+// This can move back to open() once it is known that Tomcat must
be
+// running on a JVM that includes a fix for
+// https://bugs.openjdk.java.net/browse/JDK-8273874
+if (!isUseContextClassLoader()) {
+ocl = Thread.currentThread().getContextClassLoader();
+
Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
+}
// Ensure that we have a directory context available
connection = get();
@@ -1290,6 +1301,10 @@ public class JNDIRealm extends RealmBase {
containerLog.debug("Returning null principal.");
}
return null;
+} finally {
+if (!isUseContextClassLoader()) {
+Thread.currentThread().setContextClassLoader(ocl);
+}
}
}
@@ -1316,52 +1331,189 @@ public class JNDIRealm extends RealmBase {
return null;
}
-if (userPatternArray != null) {
-for (int curUserPattern = 0; curUserPattern <
userPatternArray.length; curUserPattern++) {
-// Retrieve user information
-User user = getUser(connection, username, credentials,
curUserPattern);
-if (user != null) {
-try {
-// Check the user's credentials
-if (checkCredentials(connection.context, user,
credentials)) {
-// Search for additional roles
-List roles = getRoles(connection, user);
-if (containerLog.isDebugEnabled()) {
-containerLog.debug("Found roles: " +
roles.toString());
+ClassLoader ocl = null;
+try {
+// https://bz.apache.org/bugzilla/show_bug.cgi?id=65553
+// This can move back to open() once it is known that Tomcat must
be
+// running on a JVM that includes a fix for
+// https://bugs.openjdk.java.net/browse/JDK-8273874
+if (!isUseContextClassLoader()) {
+ocl = Thread.currentThread().getContextClassLoader();
+
Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
+}
+
+if (userPatternArray != null) {
+for (int curUserPattern = 0; curUserPattern <
userPatternArray.length; curUserPattern++) {
+// Retrieve user information
+User user = getUser(connection, username, credentials,
curUserPattern);
+if (user != null) {
+try {
+// Check the user's credentials
+if (checkCredentials(connection.context, user,
credentials)) {
+// Search for additional roles
+List roles = getRoles(connection,
user);
[tomcat] branch 9.0.x updated: Fix BZ 65553 - add workaround for JRE triggered memory leak
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 30aa6a9 Fix BZ 65553 - add workaround for JRE triggered memory leak
30aa6a9 is described below
commit 30aa6a99b3c896235330c783e056b8e82c87a38c
Author: Mark Thomas
AuthorDate: Tue Sep 28 08:19:14 2021 +0100
Fix BZ 65553 - add workaround for JRE triggered memory leak
https://bz.apache.org/bugzilla/show_bug.cgi?id=65553
https://bugs.openjdk.java.net/browse/JDK-8273874
---
java/org/apache/catalina/realm/JNDIRealm.java | 242 +-
webapps/docs/changelog.xml| 5 +
2 files changed, 204 insertions(+), 43 deletions(-)
diff --git a/java/org/apache/catalina/realm/JNDIRealm.java
b/java/org/apache/catalina/realm/JNDIRealm.java
index dd43c0c..6312b1f 100644
--- a/java/org/apache/catalina/realm/JNDIRealm.java
+++ b/java/org/apache/catalina/realm/JNDIRealm.java
@@ -22,6 +22,7 @@ import java.net.URISyntaxException;
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
import java.security.Principal;
+import java.security.cert.X509Certificate;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
@@ -64,6 +65,7 @@ import javax.net.ssl.SSLSocketFactory;
import org.apache.catalina.LifecycleException;
import org.apache.tomcat.util.collections.SynchronizedStack;
+import org.ietf.jgss.GSSContext;
import org.ietf.jgss.GSSCredential;
import org.ietf.jgss.GSSName;
@@ -1215,10 +1217,19 @@ public class JNDIRealm extends RealmBase {
@Override
public Principal authenticate(String username, String credentials) {
+ClassLoader ocl = null;
JNDIConnection connection = null;
Principal principal = null;
try {
+// https://bz.apache.org/bugzilla/show_bug.cgi?id=65553
+// This can move back to open() once it is known that Tomcat must
be
+// running on a JVM that includes a fix for
+// https://bugs.openjdk.java.net/browse/JDK-8273874
+if (!isUseContextClassLoader()) {
+ocl = Thread.currentThread().getContextClassLoader();
+
Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
+}
// Ensure that we have a directory context available
connection = get();
@@ -1282,6 +1293,10 @@ public class JNDIRealm extends RealmBase {
containerLog.debug("Returning null principal.");
}
return null;
+} finally {
+if (!isUseContextClassLoader()) {
+Thread.currentThread().setContextClassLoader(ocl);
+}
}
}
@@ -1308,52 +1323,189 @@ public class JNDIRealm extends RealmBase {
return null;
}
-if (userPatternArray != null) {
-for (int curUserPattern = 0; curUserPattern <
userPatternArray.length; curUserPattern++) {
-// Retrieve user information
-User user = getUser(connection, username, credentials,
curUserPattern);
-if (user != null) {
-try {
-// Check the user's credentials
-if (checkCredentials(connection.context, user,
credentials)) {
-// Search for additional roles
-List roles = getRoles(connection, user);
-if (containerLog.isDebugEnabled()) {
-containerLog.debug("Found roles: " +
roles.toString());
+ClassLoader ocl = null;
+try {
+// https://bz.apache.org/bugzilla/show_bug.cgi?id=65553
+// This can move back to open() once it is known that Tomcat must
be
+// running on a JVM that includes a fix for
+// https://bugs.openjdk.java.net/browse/JDK-8273874
+if (!isUseContextClassLoader()) {
+ocl = Thread.currentThread().getContextClassLoader();
+
Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
+}
+
+if (userPatternArray != null) {
+for (int curUserPattern = 0; curUserPattern <
userPatternArray.length; curUserPattern++) {
+// Retrieve user information
+User user = getUser(connection, username, credentials,
curUserPattern);
+if (user != null) {
+try {
+// Check the user's credentials
+if (checkCredentials(connection.context, user,
credentials)) {
+// Search for additional roles
+List roles = getRoles(connection,
user);
[tomcat] branch 10.0.x updated: Fix BZ 65553 - add workaround for JRE triggered memory leak
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 879230e Fix BZ 65553 - add workaround for JRE triggered memory leak
879230e is described below
commit 879230e54a3871ba646a7aacac7f05f4177f7710
Author: Mark Thomas
AuthorDate: Tue Sep 28 08:19:14 2021 +0100
Fix BZ 65553 - add workaround for JRE triggered memory leak
https://bz.apache.org/bugzilla/show_bug.cgi?id=65553
https://bugs.openjdk.java.net/browse/JDK-8273874
---
java/org/apache/catalina/realm/JNDIRealm.java | 242 +-
webapps/docs/changelog.xml| 5 +
2 files changed, 204 insertions(+), 43 deletions(-)
diff --git a/java/org/apache/catalina/realm/JNDIRealm.java
b/java/org/apache/catalina/realm/JNDIRealm.java
index 7f71dbd..55f9f16 100644
--- a/java/org/apache/catalina/realm/JNDIRealm.java
+++ b/java/org/apache/catalina/realm/JNDIRealm.java
@@ -22,6 +22,7 @@ import java.net.URISyntaxException;
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
import java.security.Principal;
+import java.security.cert.X509Certificate;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
@@ -64,6 +65,7 @@ import javax.net.ssl.SSLSocketFactory;
import org.apache.catalina.LifecycleException;
import org.apache.tomcat.util.collections.SynchronizedStack;
+import org.ietf.jgss.GSSContext;
import org.ietf.jgss.GSSCredential;
import org.ietf.jgss.GSSName;
@@ -1215,10 +1217,19 @@ public class JNDIRealm extends RealmBase {
@Override
public Principal authenticate(String username, String credentials) {
+ClassLoader ocl = null;
JNDIConnection connection = null;
Principal principal = null;
try {
+// https://bz.apache.org/bugzilla/show_bug.cgi?id=65553
+// This can move back to open() once it is known that Tomcat must
be
+// running on a JVM that includes a fix for
+// https://bugs.openjdk.java.net/browse/JDK-8273874
+if (!isUseContextClassLoader()) {
+ocl = Thread.currentThread().getContextClassLoader();
+
Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
+}
// Ensure that we have a directory context available
connection = get();
@@ -1282,6 +1293,10 @@ public class JNDIRealm extends RealmBase {
containerLog.debug("Returning null principal.");
}
return null;
+} finally {
+if (!isUseContextClassLoader()) {
+Thread.currentThread().setContextClassLoader(ocl);
+}
}
}
@@ -1308,52 +1323,189 @@ public class JNDIRealm extends RealmBase {
return null;
}
-if (userPatternArray != null) {
-for (int curUserPattern = 0; curUserPattern <
userPatternArray.length; curUserPattern++) {
-// Retrieve user information
-User user = getUser(connection, username, credentials,
curUserPattern);
-if (user != null) {
-try {
-// Check the user's credentials
-if (checkCredentials(connection.context, user,
credentials)) {
-// Search for additional roles
-List roles = getRoles(connection, user);
-if (containerLog.isDebugEnabled()) {
-containerLog.debug("Found roles: " +
roles.toString());
+ClassLoader ocl = null;
+try {
+// https://bz.apache.org/bugzilla/show_bug.cgi?id=65553
+// This can move back to open() once it is known that Tomcat must
be
+// running on a JVM that includes a fix for
+// https://bugs.openjdk.java.net/browse/JDK-8273874
+if (!isUseContextClassLoader()) {
+ocl = Thread.currentThread().getContextClassLoader();
+
Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
+}
+
+if (userPatternArray != null) {
+for (int curUserPattern = 0; curUserPattern <
userPatternArray.length; curUserPattern++) {
+// Retrieve user information
+User user = getUser(connection, username, credentials,
curUserPattern);
+if (user != null) {
+try {
+// Check the user's credentials
+if (checkCredentials(connection.context, user,
credentials)) {
+// Search for additional roles
+List roles = getRoles(connection,
[tomcat] branch main updated: Fix BZ 65553 - add workaround for JRE triggered memory leak
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 4c2f459 Fix BZ 65553 - add workaround for JRE triggered memory leak
4c2f459 is described below
commit 4c2f459c5048bca2b350dc3395f4f80475eae244
Author: Mark Thomas
AuthorDate: Tue Sep 28 08:19:14 2021 +0100
Fix BZ 65553 - add workaround for JRE triggered memory leak
https://bz.apache.org/bugzilla/show_bug.cgi?id=65553
https://bugs.openjdk.java.net/browse/JDK-8273874
---
java/org/apache/catalina/realm/JNDIRealm.java | 242 +-
webapps/docs/changelog.xml| 5 +
2 files changed, 204 insertions(+), 43 deletions(-)
diff --git a/java/org/apache/catalina/realm/JNDIRealm.java
b/java/org/apache/catalina/realm/JNDIRealm.java
index 6e2a305..4f6cd07 100644
--- a/java/org/apache/catalina/realm/JNDIRealm.java
+++ b/java/org/apache/catalina/realm/JNDIRealm.java
@@ -22,6 +22,7 @@ import java.net.URISyntaxException;
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
import java.security.Principal;
+import java.security.cert.X509Certificate;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
@@ -64,6 +65,7 @@ import javax.net.ssl.SSLSocketFactory;
import org.apache.catalina.LifecycleException;
import org.apache.tomcat.util.collections.SynchronizedStack;
+import org.ietf.jgss.GSSContext;
import org.ietf.jgss.GSSCredential;
import org.ietf.jgss.GSSName;
@@ -1215,10 +1217,19 @@ public class JNDIRealm extends RealmBase {
@Override
public Principal authenticate(String username, String credentials) {
+ClassLoader ocl = null;
JNDIConnection connection = null;
Principal principal = null;
try {
+// https://bz.apache.org/bugzilla/show_bug.cgi?id=65553
+// This can move back to open() once it is known that Tomcat must
be
+// running on a JVM that includes a fix for
+// https://bugs.openjdk.java.net/browse/JDK-8273874
+if (!isUseContextClassLoader()) {
+ocl = Thread.currentThread().getContextClassLoader();
+
Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
+}
// Ensure that we have a directory context available
connection = get();
@@ -1282,6 +1293,10 @@ public class JNDIRealm extends RealmBase {
containerLog.debug("Returning null principal.");
}
return null;
+} finally {
+if (!isUseContextClassLoader()) {
+Thread.currentThread().setContextClassLoader(ocl);
+}
}
}
@@ -1308,52 +1323,189 @@ public class JNDIRealm extends RealmBase {
return null;
}
-if (userPatternArray != null) {
-for (int curUserPattern = 0; curUserPattern <
userPatternArray.length; curUserPattern++) {
-// Retrieve user information
-User user = getUser(connection, username, credentials,
curUserPattern);
-if (user != null) {
-try {
-// Check the user's credentials
-if (checkCredentials(connection.context, user,
credentials)) {
-// Search for additional roles
-List roles = getRoles(connection, user);
-if (containerLog.isDebugEnabled()) {
-containerLog.debug("Found roles: " +
roles.toString());
+ClassLoader ocl = null;
+try {
+// https://bz.apache.org/bugzilla/show_bug.cgi?id=65553
+// This can move back to open() once it is known that Tomcat must
be
+// running on a JVM that includes a fix for
+// https://bugs.openjdk.java.net/browse/JDK-8273874
+if (!isUseContextClassLoader()) {
+ocl = Thread.currentThread().getContextClassLoader();
+
Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
+}
+
+if (userPatternArray != null) {
+for (int curUserPattern = 0; curUserPattern <
userPatternArray.length; curUserPattern++) {
+// Retrieve user information
+User user = getUser(connection, username, credentials,
curUserPattern);
+if (user != null) {
+try {
+// Check the user's credentials
+if (checkCredentials(connection.context, user,
credentials)) {
+// Search for additional roles
+List roles = getRoles(connection,
user);
+
[tomcat] branch 9.0.x updated: Fix back-port. Use correct name for JAR.
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 dfc44ac Fix back-port. Use correct name for JAR.
dfc44ac is described below
commit dfc44ac3ce6987519f5afc714b29e694f585c58d
Author: Mark Thomas
AuthorDate: Tue Sep 28 07:39:31 2021 +0100
Fix back-port. Use correct name for JAR.
---
.../apache/catalina/webresources/TestAbstractArchiveResourceSet.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/test/org/apache/catalina/webresources/TestAbstractArchiveResourceSet.java
b/test/org/apache/catalina/webresources/TestAbstractArchiveResourceSet.java
index 7c5b2f2..378b7c8 100644
--- a/test/org/apache/catalina/webresources/TestAbstractArchiveResourceSet.java
+++ b/test/org/apache/catalina/webresources/TestAbstractArchiveResourceSet.java
@@ -35,7 +35,7 @@ public class TestAbstractArchiveResourceSet {
root.getContext().setUseBloomFilterForArchives(true);
-File file = new
File("webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.5-migrated-0.0.1.jar");
+File file = new
File("webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.5.jar");
JarResourceSet jarResourceSet = new JarResourceSet(root,
"/WEB-INF/classes", file.getAbsolutePath(), "/");
jarResourceSet.getArchiveEntries(false);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
