[Bug 69136] easy home furniture
https://bz.apache.org/bugzilla/show_bug.cgi?id=69136 easy home changed: What|Removed |Added OS||All URL||https://easyhomefurniture.c ||om.au/product-category/bed/ ||double-bed/ -- 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 69136] New: easy home furniture
https://bz.apache.org/bugzilla/show_bug.cgi?id=69136 Bug ID: 69136 Summary: easy home furniture Product: Tomcat Native Version: 3.0.0 Hardware: PC Status: NEW Severity: normal Priority: P2 Component: Documentation Assignee: dev@tomcat.apache.org Reporter: driphard...@gmail.com Target Milestone: --- EasyHome Furniture in Australia offers a wide range of stylish and affordable home furnishings. They provide modern designs for living rooms, bedrooms, dining areas, and offices. Customers can shop both in-store and online, with options for delivery and assembly. EasyHome focuses on quality products and good customer service to meet diverse needs. https://easyhomefurniture.com.au/product-category/bed/double-bed/ -- 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
Re: [PR] Simplify usage of custom ssl configuration [tomcat]
Hakky54 commented on PR #706: URL: https://github.com/apache/tomcat/pull/706#issuecomment-2168908756 > This wrapper class appears to specifically discard the key managers and trust managers. I used my own example from my own project to demonstrate the usage of it within the PR description, however the code changes are slightly different. It has a constructor requireding the SSLContext, KeyManager and TrustManager. > The constructor captures its arguments and then ignores them forever after that. Why bother capturing them in the first place? Well actually it is using the KeyManager and TrustManager, see here: https://github.com/apache/tomcat/pull/706/files#diff-8ed2a43a8b2f354b707c0fdb8cd5b794e5a476ecbf603b2ba69af5eea18b3cc4R73-R81 So it is using all of the objects from the constructor even the SSLContext itself. It just acts as a wrapper to simplifies the usage of a custom `org.apache.tomcat.util.net.SSLContext` > If the goal is to allow "instant" reloading of the SSL configuration... that capability already exists in Tomcat. In my pull request description I mentioned the usage of ssl reloading, but this was an example to demonstrate how I used it with the resulting wrapper which I needed to add to provide a custom ssl configuration. So I wanted to point out there that the developer who want's to have a custom ssl configurationn always needs to create a wrapper on their side or else it won't work. So the reloading of tomcat was just an example but I use it also for different use cases, such as: - Combining custom truststore, cacert and System keystore as a TrustManager - Fetching certificates as pem from a database and constructing the KeyManager and TrustManager - Using a custom TrustManager which can prompt when the certificate is not trusted yet and whether it needs to be trusted, ss it can be added to the exusting list of trusted certificates - Managing ssl sessions It might be that I am the only developer which is working in this kind of edge cases... So all of these scenario's are working for me already actually while using the [wrapper class](https://github.com/apache/tomcat/pull/706/files#diff-8ed2a43a8b2f354b707c0fdb8cd5b794e5a476ecbf603b2ba69af5eea18b3cc4), I thought it would be nice to move it to apache tomcat to simplify the usage of 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
(tomcat) branch 10.1.x updated: Added certificateKeystorePassword to commented element
This is an automated email from the ASF dual-hosted git repository. isapir pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new a448af36b0 Added certificateKeystorePassword to commented element a448af36b0 is described below commit a448af36b0b1c2ac2e3a7b8ecd250c38d91821bf Author: Igal Sapir AuthorDate: Fri Jun 14 15:22:39 2024 -0700 Added certificateKeystorePassword to commented element --- conf/server.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/server.xml b/conf/server.xml index 2beafa4a83..0ab6264792 100644 --- a/conf/server.xml +++ b/conf/server.xml @@ -96,7 +96,7 @@ + certificateKeystorePassword="changeit" type="RSA" /> --> - 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: Added certificateKeystorePassword to commented element
This is an automated email from the ASF dual-hosted git repository. isapir 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 acf587ae7e Added certificateKeystorePassword to commented element acf587ae7e is described below commit acf587ae7e6ff6ddae216b4fee29c959eca075e1 Author: Igal Sapir AuthorDate: Fri Jun 14 15:18:52 2024 -0700 Added certificateKeystorePassword to commented element --- conf/server.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/server.xml b/conf/server.xml index c18d1f6023..ee964fea2a 100644 --- a/conf/server.xml +++ b/conf/server.xml @@ -94,7 +94,7 @@ > + certificateKeystorePassword="changeit" type="RSA" /> --> - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Added certificateKeystorePassword to commented element
This is an automated email from the ASF dual-hosted git repository. isapir 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 d28de670cf Added certificateKeystorePassword to commented element d28de670cf is described below commit d28de670cff4dfd71963006953fdc8758b8cf667 Author: Igal Sapir AuthorDate: Fri Jun 14 15:15:22 2024 -0700 Added certificateKeystorePassword to commented element This was a bit confusing and there are a lot of wrong values on the internet that propose to use the wrong attribute --- conf/server.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/server.xml b/conf/server.xml index a5331fd048..aa75d338f9 100644 --- a/conf/server.xml +++ b/conf/server.xml @@ -90,7 +90,7 @@ + certificateKeystorePassword="changeit" type="RSA" /> --> - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 11.0.0-M21
On Fri, Jun 14, 2024 at 4:58 PM Mark Thomas wrote: > > The proposed Apache Tomcat 11.0.0-M21 release is now available for > voting. > > Apache Tomcat 11.0.0-M21 is a milestone release of the 11.0.x branch and > has been made to provide users with early access to the new features in > Apache Tomcat 11.0.x so that they may provide feedback. The notable > changes compared to the previous milestone include: > > - Ensure that static resources deployed via a JAR file remain accessible >when the context is configured to use a bloom filter. Based on a pull >request provided by bergander. > > - Ensure that static resources deployed via a JAR file remain accessible >when the context is configured to use a bloom filter. Based on pull >request #730 provided by bergander. > > - Update to Commons Daemon 1.4.0 > > For full details, see the change log: > https://nightlies.apache.org/tomcat/tomcat-11.0.x/docs/changelog.html > > Applications that run on Tomcat 9 and earlier will not run on Tomcat 11 > without changes. Java EE applications designed for Tomcat 9 and earlier > may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat > will automatically convert them to Jakarta EE and copy them to the > webapps directory. Applications using deprecated APIs may require > further changes. > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-11/v11.0.0-M21/ > > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1496 > > The tag is: > https://github.com/apache/tomcat/tree/11.0.0-M21 > 2acc5c10a303d6ae7a28c2959432aef98ae29016 > > The proposed 11.0.0-M21 release is: > [ ] -1 Broken - do not release > [X] +1 Beta - go ahead and release as 11.0.0-M21 Rémy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PR] Simplify usage of custom ssl configuration [tomcat]
ChristopherSchultz commented on PR #706: URL: https://github.com/apache/tomcat/pull/706#issuecomment-2168824675 This wrapper class appears to specifically discard the key managers and trust managers. The constructor captures its arguments and then ignores them forever after that. Why bother capturing them in the first place? If the goal is to allow "instant" reloading of the SSL configuration... that capability already exists in Tomcat. -- 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
Re: [VOTE] Release Apache Tomcat 10.1.25
On Fri, Jun 14, 2024 at 2:19 PM Christopher Schultz < ch...@christopherschultz.net> wrote: > The proposed Apache Tomcat 10.1.25 release is now available for > voting. > > All committers and PMC members are kindly requested to provide a vote if > possible. ANY TOMCAT USER MAY VOTE, though only PMC members votes are > binding. We welcome non-committer votes or comments on release builds. > > The notable changes compared to 10.1.24 are: > > - Ensure that static resources deployed via a JAR file remain accessible >when the context is configured to use a bloom filter. Based on pull >request #730 provided by bergander. > > - Update to Commons Daemon 1.4.0 > > - Improvements to HTTP/2 streams and timeouts > > For full details, see the change log: > https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/changelog.html > > Applications that run on Tomcat 9 and earlier will not run on Tomcat 10 > without changes. Java EE applications designed for Tomcat 9 and earlier > may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat > will automatically convert them to Jakarta EE and copy them to the > webapps directory. > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.25/ > > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1498 > > The tag is: > https://github.com/apache/tomcat/tree/10.1.25 > > https://github.com/apache/tomcat/commit/a0038178b617423537dc66b2f516c53da7093421 > > Please reply with a +1 for release or +0/-0/-1 with an explanation. > +1 Build is reproducible and unit tests pass on Linux with Java 21 Igal > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
Re: [PR] Simplify usage of custom ssl configuration [tomcat]
Hakky54 commented on PR #706: URL: https://github.com/apache/tomcat/pull/706#issuecomment-2168789527 Hi guys, any news regarding this topic? -- 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
Re: [VOTE] Release Apache Tomcat 9.0.90
On Fri, Jun 14, 2024 at 8:08 AM Rémy Maucherat wrote: > The proposed Apache Tomcat 9.0.90 release is now available for voting. > > The notable changes compared to 9.0.89 are: > > - Ensure that static resources deployed via a JAR file remain accessible >when the context is configured to use a bloom filter. Based on pull >request #730 provided by bergander. > > - Update to Commons Daemon 1.4.0 > > - The default value of the discardFacades attribute of the Connector is now > true for improved safety > > For full details, see the changelog: > https://nightlies.apache.org/tomcat/tomcat-9.0.x/docs/changelog.html > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.90/ > > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1497 > > The tag is: > https://github.com/apache/tomcat/tree/9.0.90 > 65977c7d1da9b6016e2b19de06c3be7373f40859 > > The proposed 9.0.90 release is: > [ ] -1, Broken - do not release > [X] +1, Stable - go ahead and release as 9.0.90 > I see now what you mean about the APR issue not being applicable outside the TEST suite. Unit tests pass on Linux with Java 21 Igal > > Rémy > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
Re: (tomcat) branch main updated: Port tweak to avoid counting down if not initialized
Rémy,
On 6/14/24 5:16 PM, r...@apache.org wrote:
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 075694ab2d Port tweak to avoid counting down if not initialized
075694ab2d is described below
commit 075694ab2d5a979eefca5bba273c72c5d785ce68
Author: remm
AuthorDate: Fri Jun 14 23:15:53 2024 +0200
Port tweak to avoid counting down if not initialized
---
java/org/apache/tomcat/util/net/openssl/panama/OpenSSLLibrary.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLLibrary.java
b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLLibrary.java
index f4501c7fa6..262e97b671 100644
--- a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLLibrary.java
+++ b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLLibrary.java
@@ -334,11 +334,11 @@ public class OpenSSLLibrary {
public static void destroy() {
synchronized (lock) {
-if (--referenceCount != 0) {
-// Still being used (note test is performed after reference
count is decremented)
+if (!OpenSSLStatus.isInitialized()) {
return;
}
-if (!OpenSSLStatus.isInitialized()) {
+if (--referenceCount != 0) {
+// Still being used (note test is performed after reference
count is decremented)
return;
}
I always like to use <= 0 for these kinds of things "just in case" the
value skips 0 when you aren't paying attention. You don't want this
value to be able to go very far into the negative and possibly weird
things can happen.
-chris
-
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.25
The proposed Apache Tomcat 10.1.25 release is now available for voting. All committers and PMC members are kindly requested to provide a vote if possible. ANY TOMCAT USER MAY VOTE, though only PMC members votes are binding. We welcome non-committer votes or comments on release builds. The notable changes compared to 10.1.24 are: - Ensure that static resources deployed via a JAR file remain accessible when the context is configured to use a bloom filter. Based on pull request #730 provided by bergander. - Update to Commons Daemon 1.4.0 - Improvements to HTTP/2 streams and timeouts For full details, see the change log: https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/changelog.html Applications that run on Tomcat 9 and earlier will not run on Tomcat 10 without changes. Java EE applications designed for Tomcat 9 and earlier may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will automatically convert them to Jakarta EE and copy them to the webapps directory. It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.25/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1498 The tag is: https://github.com/apache/tomcat/tree/10.1.25 https://github.com/apache/tomcat/commit/a0038178b617423537dc66b2f516c53da7093421 Please reply with a +1 for release or +0/-0/-1 with an explanation. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Port tweak to avoid counting down if not initialized
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new b784810745 Port tweak to avoid counting down if not initialized
b784810745 is described below
commit b78481074541a8af50cc9f182bbebb5d2141d93f
Author: remm
AuthorDate: Fri Jun 14 23:15:53 2024 +0200
Port tweak to avoid counting down if not initialized
---
java/org/apache/tomcat/util/net/openssl/panama/OpenSSLLibrary.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLLibrary.java
b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLLibrary.java
index f4501c7fa6..262e97b671 100644
--- a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLLibrary.java
+++ b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLLibrary.java
@@ -334,11 +334,11 @@ public class OpenSSLLibrary {
public static void destroy() {
synchronized (lock) {
-if (--referenceCount != 0) {
-// Still being used (note test is performed after reference
count is decremented)
+if (!OpenSSLStatus.isInitialized()) {
return;
}
-if (!OpenSSLStatus.isInitialized()) {
+if (--referenceCount != 0) {
+// Still being used (note test is performed after reference
count is decremented)
return;
}
OpenSSLStatus.setAvailable(false);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Port tweak to avoid counting down if not initialized
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 075694ab2d Port tweak to avoid counting down if not initialized
075694ab2d is described below
commit 075694ab2d5a979eefca5bba273c72c5d785ce68
Author: remm
AuthorDate: Fri Jun 14 23:15:53 2024 +0200
Port tweak to avoid counting down if not initialized
---
java/org/apache/tomcat/util/net/openssl/panama/OpenSSLLibrary.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLLibrary.java
b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLLibrary.java
index f4501c7fa6..262e97b671 100644
--- a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLLibrary.java
+++ b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLLibrary.java
@@ -334,11 +334,11 @@ public class OpenSSLLibrary {
public static void destroy() {
synchronized (lock) {
-if (--referenceCount != 0) {
-// Still being used (note test is performed after reference
count is decremented)
+if (!OpenSSLStatus.isInitialized()) {
return;
}
-if (!OpenSSLStatus.isInitialized()) {
+if (--referenceCount != 0) {
+// Still being used (note test is performed after reference
count is decremented)
return;
}
OpenSSLStatus.setAvailable(false);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Increment version numbers for next release.
This is an automated email from the ASF dual-hosted git repository. schultz pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new 4aaebf7c8c Increment version numbers for next release. 4aaebf7c8c is described below commit 4aaebf7c8cfd886ba71f6b0e3dc9e3a114cdea2b Author: Christopher Schultz AuthorDate: Fri Jun 14 17:15:00 2024 -0400 Increment version numbers for next release. --- build.properties.default | 2 +- res/maven/mvn.properties.default | 2 +- webapps/docs/changelog.xml | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.properties.default b/build.properties.default index a7a5c28e5b..0093a21da3 100644 --- a/build.properties.default +++ b/build.properties.default @@ -31,7 +31,7 @@ # - Version Control Flags - version.major=10 version.minor=1 -version.build=25 +version.build=26 version.patch=0 version.suffix= version.dev=-dev diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default index f02194e401..023b823c38 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.25 +maven.asf.release.deploy.version=10.1.26 #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 055aad9e85..5a5aef0b70 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 main updated: Added gitignore to modules
This is an automated email from the ASF dual-hosted git repository. isapir 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 89de59e800 Added gitignore to modules 89de59e800 is described below commit 89de59e80015cdc0f11fede00038c492173628ca Author: Igal Sapir AuthorDate: Fri Jun 14 14:12:32 2024 -0700 Added gitignore to modules --- modules/jdbc-pool/.gitignore | 1 + modules/stuffed/.gitignore | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/jdbc-pool/.gitignore b/modules/jdbc-pool/.gitignore new file mode 100644 index 00..2f7896d1d1 --- /dev/null +++ b/modules/jdbc-pool/.gitignore @@ -0,0 +1 @@ +target/ diff --git a/modules/stuffed/.gitignore b/modules/stuffed/.gitignore new file mode 100644 index 00..2f7896d1d1 --- /dev/null +++ b/modules/stuffed/.gitignore @@ -0,0 +1 @@ +target/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Nexus: Staging Completed
Message from: https://repository.apache.orgDescription:Apache Tomcat 10.1.25Deployer properties:"userAgent" = "Apache-Ant/Apache Ant(TM) version 1.10.14 compiled on August 16 2023 (Java 22.0.1; Mac OS X 12.7.4) Aether""userId" = "schultz""ip" = "74.96.213.166"Details:The following artifacts have been staged/org/apache/tomcat/tomcat/10.1.25/tomcat-10.1.25-windows-x86.zip(SHA1: f08cff8c3e0da314255fa0a725836c3da89a0738)/org/apache/tomcat/tomcat/10.1.25/tomcat-10.1.25.pom.asc(SHA1: 8afa8a1ac98d577e046c26a2d842de14fefe0a0b)/org/apache/tomcat/tomcat/10.1.25/tomcat-10.1.25-windows-x64.zip.asc(SHA1: 9951fe238c4a5b64a714c0453c048d90a08786ba)/org/apache/tomcat/tomcat/10.1.25/tomcat-10.1.25.pom(SHA1: 7070b7826821289043ba993a13055f8b341d7ebe)/org/apache/tomcat/tomcat/10.1.25/tomcat-10.1.25.tar.gz.asc(SHA1: 0acdc0e09807387f359dabebbd2c8fd58605c666)/org/apache/tomcat/tomcat/10.1.25/tomcat-10.1.25.zip.asc(SHA1: 94cbae2e960e90855fd7c2975468c81c283bc229)/org/apache/tomcat/tomcat/10.1.25/tomcat-10.1.25.zip(SHA1: da62ee0c08b6222a05e19907b748681c301fd83c)/org/apache/tomcat/tomcat/10.1.25/tomcat-10.1.25-windows-x86.zip.asc(SHA1: c1f9a7bb4da67d8fc724c21949d5ce5a512a2062)/org/apache/tomcat/tomcat/10.1.25/tomcat-10.1.25.tar.gz(SHA1: 9331da4844fd29cfcae5d0f4ed746a182f5d5a81)/org/apache/tomcat/tomcat/10.1.25/tomcat-10.1.25-windows-x64.zip(SHA1: 815b5444bd4974c7648b08383fcccf6898cb3fe5)/org/apache/tomcat/tomcat-websocket-client-api/10.1.25/tomcat-websocket-client-api-10.1.25-sources.jar.asc(SHA1: 44681ca813f98d06143cddbe0488f8733c382cb9)/org/apache/tomcat/tomcat-websocket-client-api/10.1.25/tomcat-websocket-client-api-10.1.25.pom.asc(SHA1: 6888f4509d0684b43dbde9734ce7d30992805e20)/org/apache/tomcat/tomcat-websocket-client-api/10.1.25/tomcat-websocket-client-api-10.1.25.pom(SHA1: ff32acb58c47872ea8b155eb1bf36b6e5e9daa9f)/org/apache/tomcat/tomcat-websocket-client-api/10.1.25/tomcat-websocket-client-api-10.1.25-sources.jar(SHA1: 6089d90df11e1c27f99f46cb807db9aa0c5e8f58)/org/apache/tomcat/tomcat-websocket-client-api/10.1.25/tomcat-websocket-client-api-10.1.25.jar(SHA1: 11f2c27b1d898f6f92209d82007d63dd77010954)/org/apache/tomcat/tomcat-websocket-client-api/10.1.25/tomcat-websocket-client-api-10.1.25.jar.asc(SHA1: fdfc5e49c1264d2468ecadebfa3a5e8f4141766b)/org/apache/tomcat/tomcat-util-scan/10.1.25/tomcat-util-scan-10.1.25.jar.asc(SHA1: f33d220b887bc4f0b550057ef07d2ed73b09e068)/org/apache/tomcat/tomcat-util-scan/10.1.25/tomcat-util-scan-10.1.25-sources.jar(SHA1: eb51b2b693926f5dd1433a6a3f49531afcf4701a)/org/apache/tomcat/tomcat-util-scan/10.1.25/tomcat-util-scan-10.1.25-sources.jar.asc(SHA1: e643cdc8980c461da6305ab9447414d8d35f3b60)/org/apache/tomcat/tomcat-util-scan/10.1.25/tomcat-util-scan-10.1.25.pom.asc(SHA1: 6b9f2fe0f82e8d88b645a2a124213586c537f93f)/org/apache/tomcat/tomcat-util-scan/10.1.25/tomcat-util-scan-10.1.25.pom(SHA1: 729de46b9a9684734728973c10ac200fe3347276)/org/apache/tomcat/tomcat-util-scan/10.1.25/tomcat-util-scan-10.1.25.jar(SHA1: f8960a9ce339f4c90b7e9f009cfa484aad23c601)/org/apache/tomcat/tomcat-jasper/10.1.25/tomcat-jasper-10.1.25.pom(SHA1: fd523f859ee019134fd438323f8639f222da3383)/org/apache/tomcat/tomcat-jasper/10.1.25/tomcat-jasper-10.1.25.jar(SHA1: 1004b74a79ca85a63ce43eb8e6423394f3eefedb)/org/apache/tomcat/tomcat-jasper/10.1.25/tomcat-jasper-10.1.25.pom.asc(SHA1: 588715e9eb459e72f1de7a18a7a10d43fd3f5f3d)/org/apache/tomcat/tomcat-jasper/10.1.25/tomcat-jasper-10.1.25-sources.jar(SHA1: a49b8d9dd324bee0dc5b48046f58dedae30d23e9)/org/apache/tomcat/tomcat-jasper/10.1.25/tomcat-jasper-10.1.25-sources.jar.asc(SHA1: 6393cc7707d3f6ca574abecebcdc405e98c6a426)/org/apache/tomcat/tomcat-jasper/10.1.25/tomcat-jasper-10.1.25.jar.asc(SHA1: 0cb39a4174d71d0e02079a31ec4bae7d91f34208)/org/apache/tomcat/tomcat-i18n-es/10.1.25/tomcat-i18n-es-10.1.25.jar(SHA1: 14403f71dc1de90013c82164fbab21714eb31a86)/org/apache/tomcat/tomcat-i18n-es/10.1.25/tomcat-i18n-es-10.1.25.pom(SHA1: 3e2c27b73e267ce2eb3f5c6282a6ce1b87924e6f)/org/apache/tomcat/tomcat-i18n-es/10.1.25/tomcat-i18n-es-10.1.25.pom.asc(SHA1: b36c10afb13d7d92534fc15d97215444e821cc27)/org/apache/tomcat/tomcat-i18n-es/10.1.25/tomcat-i18n-es-10.1.25.jar.asc(SHA1: 201a24f083e9bf5424810ac32beab65227984a56)/org/apache/tomcat/tomcat-i18n-ko/10.1.25/tomcat-i18n-ko-10.1.25.pom.asc(SHA1: 0bfe3007fa60ca1f749cd81989bce63193780eeb)/org/apache/tomcat/tomcat-i18n-ko/10.1.25/tomcat-i18n-ko-10.1.25.jar.asc(SHA1: 95e07a13fff6a75e6aad02a893611ead8858c2de)/org/apache/tomcat/tomcat-i18n-ko/10.1.25/tomcat-i18n-ko-10.1.25.jar(SHA1: 5d5ff6c0d4d2d14c467a42e400dca65f9602f400)/org/apache/tomcat/tomcat-i18n-ko/10.1.25/tomcat-i18n-ko-10.1.25.pom(SHA1: ca070edfd90cd5faf877723cc946bfdcb5ca463c)/org/apache/tomcat/tomcat-storeconfig/10.1.25/tomcat-storeconfig-10.1.25.jar.asc(SHA1: fbd022bde915ed88dd1aa0ff58dd863fc3be8954)/org/apache/tomcat/tomcat-storeconfig/10.1.25/tomcat-storeconfig-10.1.25.pom.asc(SHA1: 7b1102905428adb0efdb657b17ba8cab9147a657)/org/apache/tomcat/tomcat-storeconfig/10.1.25/tomcat-storeconfig-10.1.25-sour
(tomcat) branch 9.0.x updated: Added gitignore to modules
This is an automated email from the ASF dual-hosted git repository. isapir 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 eb87f19a69 Added gitignore to modules eb87f19a69 is described below commit eb87f19a69ec566419722cab70d1dceec722716f Author: Igal Sapir AuthorDate: Fri Jun 14 14:09:24 2024 -0700 Added gitignore to modules --- modules/jdbc-pool/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/jdbc-pool/.gitignore b/modules/jdbc-pool/.gitignore new file mode 100644 index 00..2f7896d1d1 --- /dev/null +++ b/modules/jdbc-pool/.gitignore @@ -0,0 +1 @@ +target/ - 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.90
On Fri, Jun 14, 2024 at 7:39 PM Mark Thomas wrote: > > On 14/06/2024 16:06, Rémy Maucherat wrote: > > > The proposed 9.0.90 release is: > > [ ] -1, Broken - do not release > > [X] +1, Stable - go ahead and release as 9.0.90 > > Tests pass on Linux, Windows, MacOS Intel and MacOS M1 with one caveat. > > APR tests that create an AprLifecycleListener instance and then destroy > it without initialising it will cause subsequent tests in that class > that require the AprLifecycleListener to fail. This is extremely > unlikely to occur in any real use case. I don't see how that is possible outside of the test case, so I would say it is ok. Rémy > That said, I would understand if you wanted to re-tag. > > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r69750 - in /dev/tomcat/tomcat-10/v10.1.25: ./ bin/ bin/embed/ src/
Author: schultz Date: Fri Jun 14 20:52:27 2024 New Revision: 69750 Log: Upload v10.1.25 for voting. Added: dev/tomcat/tomcat-10/v10.1.25/ dev/tomcat/tomcat-10/v10.1.25/KEYS dev/tomcat/tomcat-10/v10.1.25/README.html dev/tomcat/tomcat-10/v10.1.25/RELEASE-NOTES dev/tomcat/tomcat-10/v10.1.25/bin/ dev/tomcat/tomcat-10/v10.1.25/bin/README.html dev/tomcat/tomcat-10/v10.1.25/bin/apache-tomcat-10.1.25-deployer.tar.gz (with props) dev/tomcat/tomcat-10/v10.1.25/bin/apache-tomcat-10.1.25-deployer.tar.gz.asc dev/tomcat/tomcat-10/v10.1.25/bin/apache-tomcat-10.1.25-deployer.tar.gz.sha512 dev/tomcat/tomcat-10/v10.1.25/bin/apache-tomcat-10.1.25-deployer.zip (with props) dev/tomcat/tomcat-10/v10.1.25/bin/apache-tomcat-10.1.25-deployer.zip.asc dev/tomcat/tomcat-10/v10.1.25/bin/apache-tomcat-10.1.25-deployer.zip.sha512 dev/tomcat/tomcat-10/v10.1.25/bin/apache-tomcat-10.1.25-fulldocs.tar.gz (with props) dev/tomcat/tomcat-10/v10.1.25/bin/apache-tomcat-10.1.25-fulldocs.tar.gz.asc dev/tomcat/tomcat-10/v10.1.25/bin/apache-tomcat-10.1.25-fulldocs.tar.gz.sha512 dev/tomcat/tomcat-10/v10.1.25/bin/apache-tomcat-10.1.25-windows-x64.zip (with props) dev/tomcat/tomcat-10/v10.1.25/bin/apache-tomcat-10.1.25-windows-x64.zip.asc dev/tomcat/tomcat-10/v10.1.25/bin/apache-tomcat-10.1.25-windows-x64.zip.sha512 dev/tomcat/tomcat-10/v10.1.25/bin/apache-tomcat-10.1.25-windows-x86.zip (with props) dev/tomcat/tomcat-10/v10.1.25/bin/apache-tomcat-10.1.25-windows-x86.zip.asc dev/tomcat/tomcat-10/v10.1.25/bin/apache-tomcat-10.1.25-windows-x86.zip.sha512 dev/tomcat/tomcat-10/v10.1.25/bin/apache-tomcat-10.1.25.exe (with props) dev/tomcat/tomcat-10/v10.1.25/bin/apache-tomcat-10.1.25.exe.asc dev/tomcat/tomcat-10/v10.1.25/bin/apache-tomcat-10.1.25.exe.sha512 dev/tomcat/tomcat-10/v10.1.25/bin/apache-tomcat-10.1.25.tar.gz (with props) dev/tomcat/tomcat-10/v10.1.25/bin/apache-tomcat-10.1.25.tar.gz.asc dev/tomcat/tomcat-10/v10.1.25/bin/apache-tomcat-10.1.25.tar.gz.sha512 dev/tomcat/tomcat-10/v10.1.25/bin/apache-tomcat-10.1.25.zip (with props) dev/tomcat/tomcat-10/v10.1.25/bin/apache-tomcat-10.1.25.zip.asc dev/tomcat/tomcat-10/v10.1.25/bin/apache-tomcat-10.1.25.zip.sha512 dev/tomcat/tomcat-10/v10.1.25/bin/embed/ dev/tomcat/tomcat-10/v10.1.25/bin/embed/apache-tomcat-10.1.25-embed.tar.gz (with props) dev/tomcat/tomcat-10/v10.1.25/bin/embed/apache-tomcat-10.1.25-embed.tar.gz.asc dev/tomcat/tomcat-10/v10.1.25/bin/embed/apache-tomcat-10.1.25-embed.tar.gz.sha512 dev/tomcat/tomcat-10/v10.1.25/bin/embed/apache-tomcat-10.1.25-embed.zip (with props) dev/tomcat/tomcat-10/v10.1.25/bin/embed/apache-tomcat-10.1.25-embed.zip.asc dev/tomcat/tomcat-10/v10.1.25/bin/embed/apache-tomcat-10.1.25-embed.zip.sha512 dev/tomcat/tomcat-10/v10.1.25/src/ dev/tomcat/tomcat-10/v10.1.25/src/apache-tomcat-10.1.25-src.tar.gz (with props) dev/tomcat/tomcat-10/v10.1.25/src/apache-tomcat-10.1.25-src.tar.gz.asc dev/tomcat/tomcat-10/v10.1.25/src/apache-tomcat-10.1.25-src.tar.gz.sha512 dev/tomcat/tomcat-10/v10.1.25/src/apache-tomcat-10.1.25-src.zip (with props) dev/tomcat/tomcat-10/v10.1.25/src/apache-tomcat-10.1.25-src.zip.asc dev/tomcat/tomcat-10/v10.1.25/src/apache-tomcat-10.1.25-src.zip.sha512 Added: dev/tomcat/tomcat-10/v10.1.25/KEYS == --- dev/tomcat/tomcat-10/v10.1.25/KEYS (added) +++ dev/tomcat/tomcat-10/v10.1.25/KEYS Fri Jun 14 20:52:27 2024 @@ -0,0 +1,562 @@ +This file contains the PGP&GPG keys of various Apache developers. +Please don't use them for email unless you have to. Their main +purpose is code signing. + +Apache users: pgp < KEYS +Apache developers: +(pgpk -ll && pgpk -xa ) >> this file. + or +(gpg --fingerprint --list-sigs + && gpg --armor --export ) >> this file. + +Apache developers: please ensure that your key is also available via the +PGP keyservers (such as pgpkeys.mit.edu). + + +pub 4096R/2F6059E7 2009-09-18 + Key fingerprint = A9C5 DF4D 22E9 9998 D987 5A51 10C0 1C5A 2F60 59E7 +uid Mark E D Thomas +sub 4096R/5E763BEC 2009-09-18 + +-BEGIN PGP PUBLIC KEY BLOCK- +Comment: GPGTools - http://gpgtools.org + +mQINBEq0DukBEAD4jovHOPJDxoD+JnO1Go2kiwpgRULasGlrVKuSUdP6wzcaqWmX +pqtOJKKwW2MQFQLmg7nQ9RjJwy3QCbKNDJQA/bwbQT1F7WzTCz2S6vxC4zxKck4t +6RZBq2dJsYKF0CEh6ZfY4dmKvhq+3istSoFRdHYoOPGWZpuRDqfZPdGm/m335/6K +GH59oysn1NE7a2a+kZzjBSEgv23+l4Z1Rg7+fpz1JcdHSdC2Z+ZRxML25eVatRVz +4yvDOZItqDURP24zWOodxgboldV6Y88C3v/7KRR+1vklzkuA2FqF8Q4r/2f0su7M +UVviQcy29y/RlLSDTTYoVlCZ1ni14qFU7Hpw43KJtgXmcUwq31T1+SlXdYjNJ1aF +kUi8BjCHDcSgE/IReKUanjHzm4XSymKDTeqqzidi4k6PDD4jyHb8k8vxi6qT6Udn +lcfo5NBkkUT1TauhEy8ktHhbl9k60BvvMBP9l6cURiJg1WS77egI4P/82oPbzzFi +GFqXyJKULVgxtdQ3JikCpodp3f1fh6PlYZwkW4xCJLJucJ5MiQp07HAkMVW5w+k8 +Xvuk4i5quh3N+2kzKHOOiQCDmN0sz0X
(tomcat) tag 10.1.25 created (now a0038178b6)
This is an automated email from the ASF dual-hosted git repository. schultz pushed a change to tag 10.1.25 in repository https://gitbox.apache.org/repos/asf/tomcat.git at a0038178b6 (commit) This tag includes the following new commits: new a0038178b6 Tatg 10.1.25 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: Tatg 10.1.25
This is an automated email from the ASF dual-hosted git repository. schultz pushed a commit to tag 10.1.25 in repository https://gitbox.apache.org/repos/asf/tomcat.git commit a0038178b617423537dc66b2f516c53da7093421 Author: Christopher Schultz AuthorDate: Fri Jun 14 16:49:18 2024 -0400 Tatg 10.1.25 --- build.properties.release | 54 +++ res/install-win/Uninstall.exe.sig| Bin 0 -> 10202 bytes res/install-win/tomcat-installer.exe.sig | Bin 0 -> 10202 bytes res/maven/mvn.properties.release | 27 webapps/docs/changelog.xml | 2 +- 5 files changed, 82 insertions(+), 1 deletion(-) diff --git a/build.properties.release b/build.properties.release new file mode 100644 index 00..0d4a3b73ef --- /dev/null +++ b/build.properties.release @@ -0,0 +1,54 @@ +# - +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# - + +# This file was auto-generated by the pre-release Ant target. + +# Any unwanted settings may be over-ridden in a build.properties file located +# in the same directory as this file. + +# Set the version-dev to "" (empty string) as this is not a development release. +version.dev= + +# Ensure consistent timestamps for reproducible builds. +ant.tstamp.now.iso=2024-06-14T19:31:59Z + +# Enable insertion of detached signatures into the Windows installer. +do.codesigning=true + +# Re-use the same GPG executable. +gpg.exec=/path/to/gpg + +# Reproducible builds require the use of the build tools defined below. The +# vendors (where appropriate) and versions must match exactly for a reproducible +# build since this data is embedded in various files, particularly JAR file +# manifests, as part of the build process. +# +# Apache Ant: Apache Ant(TM) version 1.10.14 compiled on August 16 2023 +# +# Java Name: OpenJDK 64-Bit Server VM +# Java Vendor: Eclipse Adoptium +# Java Version:22.0.1+8 + +# The following is provided for information only. Builds will be repeatable +# whether or not the build environment is consistent with this information. +# +# OS: x86_64 Mac OS X 12.7.4 +# File encoding: UTF-8 +# +# Release Manager: schultz +release-java-version=22.0.1+8 +release-ant-version=1.10.14 diff --git a/res/install-win/Uninstall.exe.sig b/res/install-win/Uninstall.exe.sig new file mode 100644 index 00..d670743106 Binary files /dev/null and b/res/install-win/Uninstall.exe.sig differ diff --git a/res/install-win/tomcat-installer.exe.sig b/res/install-win/tomcat-installer.exe.sig new file mode 100644 index 00..1d9fc0c37b Binary files /dev/null and b/res/install-win/tomcat-installer.exe.sig differ diff --git a/res/maven/mvn.properties.release b/res/maven/mvn.properties.release new file mode 100644 index 00..6cbe3b226d --- /dev/null +++ b/res/maven/mvn.properties.release @@ -0,0 +1,27 @@ +# - +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# - + +# This file was auto-generated by the pre-release Ant target. + +# Remove "-dev" from the version since this is not a development release. +maven.asf.release.deploy.version=10.1.25 + +# Re-use the same GPG executable. +gpg.exec=/path/to/gpg + +# Set t
(tomcat) branch 10.1.x updated: Added gitignore to modules
This is an automated email from the ASF dual-hosted git repository. isapir pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new c7b1935293 Added gitignore to modules c7b1935293 is described below commit c7b193529356ef1d0c3dcc46a6e6a0e8cbd4a669 Author: Igal Sapir AuthorDate: Fri Jun 14 13:44:58 2024 -0700 Added gitignore to modules --- modules/jdbc-pool/.gitignore | 1 + modules/stuffed/.gitignore | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/jdbc-pool/.gitignore b/modules/jdbc-pool/.gitignore new file mode 100644 index 00..2f7896d1d1 --- /dev/null +++ b/modules/jdbc-pool/.gitignore @@ -0,0 +1 @@ +target/ diff --git a/modules/stuffed/.gitignore b/modules/stuffed/.gitignore new file mode 100644 index 00..2f7896d1d1 --- /dev/null +++ b/modules/stuffed/.gitignore @@ -0,0 +1 @@ +target/ - 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: Simplify (align with unlock accept)
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 6236f78024 Simplify (align with unlock accept)
6236f78024 is described below
commit 6236f78024b84be2498a5d8efbb54ee3ad1fb144
Author: Mark Thomas
AuthorDate: Fri Jun 14 20:21:19 2024 +0100
Simplify (align with unlock accept)
---
test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
b/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
index 1a63346831..f33ed90415 100644
--- a/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
+++ b/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
@@ -187,11 +187,7 @@ public class TestSocketServerAnyLocalAddress extends
AbstractJniTest {
Enumeration networkInterfaces =
NetworkInterface.getNetworkInterfaces();
while (networkInterfaces.hasMoreElements()) {
NetworkInterface networkInterface =
networkInterfaces.nextElement();
-if (networkInterface.isPointToPoint()) {
-// Skip point to point networks such as VPN tunnels
-continue;
-}
-if (networkInterface.isUp()) {
+if (!networkInterface.isPointToPoint() &&
networkInterface.isUp()) {
Enumeration inetAddresses =
networkInterface.getInetAddresses();
while (inetAddresses.hasMoreElements()) {
InetAddress inetAddress = inetAddresses.nextElement();
-
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: Improve the acceptor unlock process
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 3fa6690731 Improve the acceptor unlock process
3fa6690731 is described below
commit 3fa669073177694275c2ae0e8c2b82f471c31da0
Author: Mark Thomas
AuthorDate: Fri Jun 14 20:11:32 2024 +0100
Improve the acceptor unlock process
---
.../apache/tomcat/util/net/AbstractEndpoint.java | 30 --
webapps/docs/changelog.xml | 10
2 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index 468ab3e984..b636e9fa16 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -1261,21 +1261,23 @@ public abstract class AbstractEndpoint {
Enumeration networkInterfaces =
NetworkInterface.getNetworkInterfaces();
while (networkInterfaces.hasMoreElements()) {
NetworkInterface networkInterface =
networkInterfaces.nextElement();
-Enumeration inetAddresses =
networkInterface.getInetAddresses();
-while (inetAddresses.hasMoreElements()) {
-InetAddress inetAddress = inetAddresses.nextElement();
-if
(localAddress.getAddress().getClass().isAssignableFrom(inetAddress.getClass()))
{
-if (inetAddress.isLoopbackAddress()) {
-if (loopbackUnlockAddress == null) {
-loopbackUnlockAddress = inetAddress;
+if (!networkInterface.isPointToPoint() &&
networkInterface.isUp()) {
+Enumeration inetAddresses =
networkInterface.getInetAddresses();
+while (inetAddresses.hasMoreElements()) {
+InetAddress inetAddress = inetAddresses.nextElement();
+if
(localAddress.getAddress().getClass().isAssignableFrom(inetAddress.getClass()))
{
+if (inetAddress.isLoopbackAddress()) {
+if (loopbackUnlockAddress == null) {
+loopbackUnlockAddress = inetAddress;
+}
+} else if (inetAddress.isLinkLocalAddress()) {
+if (linkLocalUnlockAddress == null) {
+linkLocalUnlockAddress = inetAddress;
+}
+} else {
+// Use a non-link local, non-loop back address
by default
+return new InetSocketAddress(inetAddress,
localAddress.getPort());
}
-} else if (inetAddress.isLinkLocalAddress()) {
-if (linkLocalUnlockAddress == null) {
-linkLocalUnlockAddress = inetAddress;
-}
-} else {
-// Use a non-link local, non-loop back address by
default
-return new InetSocketAddress(inetAddress,
localAddress.getPort());
}
}
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 04a6fd0822..adf1d27ef2 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,16 @@
issues do not "pop up" wrt. others).
-->
+
+
+
+Improve the algorithm used to identify the IP address to use to unlock
+the acceptor thread when a Connector is listening on all local
+addresses. Interfaces that are configured for point to point
connections
+or are not currently up are now skipped. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Improve the acceptor unlock process
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 6980aadca8 Improve the acceptor unlock process
6980aadca8 is described below
commit 6980aadca8a6a1576f26e1b740138c0ca102d50e
Author: Mark Thomas
AuthorDate: Fri Jun 14 20:11:32 2024 +0100
Improve the acceptor unlock process
---
.../apache/tomcat/util/net/AbstractEndpoint.java | 30 --
webapps/docs/changelog.xml | 10
2 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index 76dbf09d42..4971c9dbfb 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -1348,21 +1348,23 @@ public abstract class AbstractEndpoint {
Enumeration networkInterfaces =
NetworkInterface.getNetworkInterfaces();
while (networkInterfaces.hasMoreElements()) {
NetworkInterface networkInterface =
networkInterfaces.nextElement();
-Enumeration inetAddresses =
networkInterface.getInetAddresses();
-while (inetAddresses.hasMoreElements()) {
-InetAddress inetAddress = inetAddresses.nextElement();
-if
(localAddress.getAddress().getClass().isAssignableFrom(inetAddress.getClass()))
{
-if (inetAddress.isLoopbackAddress()) {
-if (loopbackUnlockAddress == null) {
-loopbackUnlockAddress = inetAddress;
+if (!networkInterface.isPointToPoint() &&
networkInterface.isUp()) {
+Enumeration inetAddresses =
networkInterface.getInetAddresses();
+while (inetAddresses.hasMoreElements()) {
+InetAddress inetAddress = inetAddresses.nextElement();
+if
(localAddress.getAddress().getClass().isAssignableFrom(inetAddress.getClass()))
{
+if (inetAddress.isLoopbackAddress()) {
+if (loopbackUnlockAddress == null) {
+loopbackUnlockAddress = inetAddress;
+}
+} else if (inetAddress.isLinkLocalAddress()) {
+if (linkLocalUnlockAddress == null) {
+linkLocalUnlockAddress = inetAddress;
+}
+} else {
+// Use a non-link local, non-loop back address
by default
+return new InetSocketAddress(inetAddress,
localAddress.getPort());
}
-} else if (inetAddress.isLinkLocalAddress()) {
-if (linkLocalUnlockAddress == null) {
-linkLocalUnlockAddress = inetAddress;
-}
-} else {
-// Use a non-link local, non-loop back address by
default
-return new InetSocketAddress(inetAddress,
localAddress.getPort());
}
}
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cf8cbcd105..50b7674cc2 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,16 @@
issues do not "pop up" wrt. others).
-->
+
+
+
+Improve the algorithm used to identify the IP address to use to unlock
+the acceptor thread when a Connector is listening on all local
+addresses. Interfaces that are configured for point to point
connections
+or are not currently up are now skipped. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Improve the acceptor unlock process
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 3203c2dac4 Improve the acceptor unlock process
3203c2dac4 is described below
commit 3203c2dac40c6eba93ab584e4f9ff4a5c432e368
Author: Mark Thomas
AuthorDate: Fri Jun 14 20:11:32 2024 +0100
Improve the acceptor unlock process
---
.../apache/tomcat/util/net/AbstractEndpoint.java | 30 --
webapps/docs/changelog.xml | 6 +
2 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index 26040fd0d9..af06a1d202 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -1192,21 +1192,23 @@ public abstract class AbstractEndpoint {
Enumeration networkInterfaces =
NetworkInterface.getNetworkInterfaces();
while (networkInterfaces.hasMoreElements()) {
NetworkInterface networkInterface =
networkInterfaces.nextElement();
-Enumeration inetAddresses =
networkInterface.getInetAddresses();
-while (inetAddresses.hasMoreElements()) {
-InetAddress inetAddress = inetAddresses.nextElement();
-if
(localAddress.getAddress().getClass().isAssignableFrom(inetAddress.getClass()))
{
-if (inetAddress.isLoopbackAddress()) {
-if (loopbackUnlockAddress == null) {
-loopbackUnlockAddress = inetAddress;
+if (!networkInterface.isPointToPoint() &&
networkInterface.isUp()) {
+Enumeration inetAddresses =
networkInterface.getInetAddresses();
+while (inetAddresses.hasMoreElements()) {
+InetAddress inetAddress = inetAddresses.nextElement();
+if
(localAddress.getAddress().getClass().isAssignableFrom(inetAddress.getClass()))
{
+if (inetAddress.isLoopbackAddress()) {
+if (loopbackUnlockAddress == null) {
+loopbackUnlockAddress = inetAddress;
+}
+} else if (inetAddress.isLinkLocalAddress()) {
+if (linkLocalUnlockAddress == null) {
+linkLocalUnlockAddress = inetAddress;
+}
+} else {
+// Use a non-link local, non-loop back address
by default
+return new InetSocketAddress(inetAddress,
localAddress.getPort());
}
-} else if (inetAddress.isLinkLocalAddress()) {
-if (linkLocalUnlockAddress == null) {
-linkLocalUnlockAddress = inetAddress;
-}
-} else {
-// Use a non-link local, non-loop back address by
default
-return new InetSocketAddress(inetAddress,
localAddress.getPort());
}
}
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 09da98d76c..055aad9e85 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -168,6 +168,12 @@
Add support for TLS 1.3 client initiated re-keying. (markt)
+
+Improve the algorithm used to identify the IP address to use to unlock
+the acceptor thread when a Connector is listening on all local
+addresses. Interfaces that are configured for point to point
connections
+or are not currently up are now skipped. (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: Allow users to add local scripts that will not be tracked by git
This is an automated email from the ASF dual-hosted git repository. isapir 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 3dd2328edb Allow users to add local scripts that will not be tracked by git 3dd2328edb is described below commit 3dd2328edbbfe42eacc7f9160c594d305e87f5ac Author: Igal Sapir AuthorDate: Fri Jun 14 12:11:29 2024 -0700 Allow users to add local scripts that will not be tracked by git --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 41cd573f4f..d2f1ac409f 100644 --- a/.gitignore +++ b/.gitignore @@ -29,6 +29,7 @@ mvn.properties .externalToolBuilders .fbprefs .idea +.local .project .sdkmanrc .settings - 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 hanging test
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 ee1eb4ffe3 Fix hanging test
ee1eb4ffe3 is described below
commit ee1eb4ffe32b5788f0a7b3f6454a85772b8363dc
Author: Mark Thomas
AuthorDate: Fri Jun 14 20:06:04 2024 +0100
Fix hanging test
---
test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java | 4
1 file changed, 4 insertions(+)
diff --git a/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
b/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
index ac709fe1d2..1a63346831 100644
--- a/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
+++ b/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
@@ -187,6 +187,10 @@ public class TestSocketServerAnyLocalAddress extends
AbstractJniTest {
Enumeration networkInterfaces =
NetworkInterface.getNetworkInterfaces();
while (networkInterfaces.hasMoreElements()) {
NetworkInterface networkInterface =
networkInterfaces.nextElement();
+if (networkInterface.isPointToPoint()) {
+// Skip point to point networks such as VPN tunnels
+continue;
+}
if (networkInterface.isUp()) {
Enumeration inetAddresses =
networkInterface.getInetAddresses();
while (inetAddresses.hasMoreElements()) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Allow users to add local scripts that will not be tracked by git
This is an automated email from the ASF dual-hosted git repository. isapir pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new 08d00a4825 Allow users to add local scripts that will not be tracked by git 08d00a4825 is described below commit 08d00a4825f7bbf5c2af437f13c31006c47e362a Author: Igal Sapir AuthorDate: Fri Jun 14 12:04:23 2024 -0700 Allow users to add local scripts that will not be tracked by git --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 41cd573f4f..d2f1ac409f 100644 --- a/.gitignore +++ b/.gitignore @@ -29,6 +29,7 @@ mvn.properties .externalToolBuilders .fbprefs .idea +.local .project .sdkmanrc .settings - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Allow users to add local scripts that will not be tracked by git
This is an automated email from the ASF dual-hosted git repository. isapir 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 2b34da89e1 Allow users to add local scripts that will not be tracked by git 2b34da89e1 is described below commit 2b34da89e1226f949e948ec7501eac6f861681e4 Author: Igal Sapir AuthorDate: Fri Jun 14 11:51:24 2024 -0700 Allow users to add local scripts that will not be tracked by git --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 3e0daf152d..3993b03abf 100644 --- a/.gitignore +++ b/.gitignore @@ -29,6 +29,7 @@ mvn.properties .externalToolBuilders .fbprefs .idea +.local .pmd .project .sdkmanrc - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 11.0.0-M21
On Fri, Jun 14, 2024 at 7:59 AM Mark Thomas wrote: > The proposed Apache Tomcat 11.0.0-M21 release is now available for > voting. > > Apache Tomcat 11.0.0-M21 is a milestone release of the 11.0.x branch and > has been made to provide users with early access to the new features in > Apache Tomcat 11.0.x so that they may provide feedback. The notable > changes compared to the previous milestone include: > > - Ensure that static resources deployed via a JAR file remain accessible >when the context is configured to use a bloom filter. Based on a pull >request provided by bergander. > > - Ensure that static resources deployed via a JAR file remain accessible >when the context is configured to use a bloom filter. Based on pull >request #730 provided by bergander. > > - Update to Commons Daemon 1.4.0 > > For full details, see the change log: > https://nightlies.apache.org/tomcat/tomcat-11.0.x/docs/changelog.html > > Applications that run on Tomcat 9 and earlier will not run on Tomcat 11 > without changes. Java EE applications designed for Tomcat 9 and earlier > may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat > will automatically convert them to Jakarta EE and copy them to the > webapps directory. Applications using deprecated APIs may require > further changes. > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-11/v11.0.0-M21/ > > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1496 > > The tag is: > https://github.com/apache/tomcat/tree/11.0.0-M21 > 2acc5c10a303d6ae7a28c2959432aef98ae29016 > > The proposed 11.0.0-M21 release is: > [ ] -1 Broken - do not release > [X] +1 Beta - go ahead and release as 11.0.0-M21 > Unit tests passed on Linux with Java 21 Igal > > - > 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
Build status: Build succeeded! Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/37/builds/986 Blamelist: Mark Thomas , remm Build Text: build successful Status Detected: restored build Build Source Stamp: [branch 9.0.x] 2a362e8a014e7857dc9491e9fcb22b243e268b9c Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 1 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 9.0.90
On Fri, Jun 14, 2024 at 10:39 AM Mark Thomas wrote: > On 14/06/2024 16:06, Rémy Maucherat wrote: > > > The proposed 9.0.90 release is: > > [ ] -1, Broken - do not release > > [X] +1, Stable - go ahead and release as 9.0.90 > > Tests pass on Linux, Windows, MacOS Intel and MacOS M1 with one caveat. > > APR tests that create an AprLifecycleListener instance and then destroy > it without initialising it will cause subsequent tests in that class > that require the AprLifecycleListener to fail. This is extremely > unlikely to occur in any real use case. > > That said, I would understand if you wanted to re-tag. > Since many users run Tomcat 9 in production, IMO it'd be safer to re-tag and include commit 2a362e8. Igal > > Mark > > - > 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.90
On 14/06/2024 16:06, Rémy Maucherat wrote: The proposed 9.0.90 release is: [ ] -1, Broken - do not release [X] +1, Stable - go ahead and release as 9.0.90 Tests pass on Linux, Windows, MacOS Intel and MacOS M1 with one caveat. APR tests that create an AprLifecycleListener instance and then destroy it without initialising it will cause subsequent tests in that class that require the AprLifecycleListener to fail. This is extremely unlikely to occur in any real use case. That said, I would understand if you wanted to re-tag. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Handle case where listener receives destroy but not init event
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 b052c3c122 Handle case where listener receives destroy but not init
event
b052c3c122 is described below
commit b052c3c122a23a9e3a15ac623e29cf8ed6f2669f
Author: Mark Thomas
AuthorDate: Fri Jun 14 18:34:10 2024 +0100
Handle case where listener receives destroy but not init event
---
java/org/apache/catalina/core/AprLifecycleListener.java | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java
b/java/org/apache/catalina/core/AprLifecycleListener.java
index a06d9672c8..1db75895b9 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -103,6 +103,7 @@ public class AprLifecycleListener implements
LifecycleListener {
// Guarded by lock
private static int referenceCount = 0;
+private boolean instanceInitialized = false;
public static boolean isAprAvailable() {
@@ -131,6 +132,7 @@ public class AprLifecycleListener implements
LifecycleListener {
if (Lifecycle.BEFORE_INIT_EVENT.equals(event.getType())) {
synchronized (lock) {
+instanceInitialized = true;
if (!(event.getLifecycle() instanceof Server)) {
log.warn(sm.getString("listener.notServer",
event.getLifecycle().getClass().getSimpleName()));
}
@@ -163,8 +165,12 @@ public class AprLifecycleListener implements
LifecycleListener {
}
} else if (Lifecycle.AFTER_DESTROY_EVENT.equals(event.getType())) {
synchronized (lock) {
-if (--referenceCount != 0) {
-// Still being used (note test is performed after
reference count is decremented)
+// Instance may get destroyed without ever being initialized
+if (instanceInitialized) {
+referenceCount --;
+}
+if (referenceCount != 0) {
+// Still being used
return;
}
if (!AprStatus.isAprAvailable()) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Handle case where listener receives destroy but not init event
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new d7c46a6302 Handle case where listener receives destroy but not init
event
d7c46a6302 is described below
commit d7c46a6302b2dcf6eb92608cec452b9684a02bb2
Author: Mark Thomas
AuthorDate: Fri Jun 14 18:34:10 2024 +0100
Handle case where listener receives destroy but not init event
---
java/org/apache/catalina/core/AprLifecycleListener.java | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java
b/java/org/apache/catalina/core/AprLifecycleListener.java
index a06d9672c8..1db75895b9 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -103,6 +103,7 @@ public class AprLifecycleListener implements
LifecycleListener {
// Guarded by lock
private static int referenceCount = 0;
+private boolean instanceInitialized = false;
public static boolean isAprAvailable() {
@@ -131,6 +132,7 @@ public class AprLifecycleListener implements
LifecycleListener {
if (Lifecycle.BEFORE_INIT_EVENT.equals(event.getType())) {
synchronized (lock) {
+instanceInitialized = true;
if (!(event.getLifecycle() instanceof Server)) {
log.warn(sm.getString("listener.notServer",
event.getLifecycle().getClass().getSimpleName()));
}
@@ -163,8 +165,12 @@ public class AprLifecycleListener implements
LifecycleListener {
}
} else if (Lifecycle.AFTER_DESTROY_EVENT.equals(event.getType())) {
synchronized (lock) {
-if (--referenceCount != 0) {
-// Still being used (note test is performed after
reference count is decremented)
+// Instance may get destroyed without ever being initialized
+if (instanceInitialized) {
+referenceCount --;
+}
+if (referenceCount != 0) {
+// Still being used
return;
}
if (!AprStatus.isAprAvailable()) {
-
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: Handle case where listener receives destroy but not init event
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 2a362e8a01 Handle case where listener receives destroy but not init
event
2a362e8a01 is described below
commit 2a362e8a014e7857dc9491e9fcb22b243e268b9c
Author: Mark Thomas
AuthorDate: Fri Jun 14 18:34:10 2024 +0100
Handle case where listener receives destroy but not init event
---
java/org/apache/catalina/core/AprLifecycleListener.java | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java
b/java/org/apache/catalina/core/AprLifecycleListener.java
index f65c040d07..5ef6585fc9 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -103,6 +103,7 @@ public class AprLifecycleListener implements
LifecycleListener {
// Guarded by lock
private static int referenceCount = 0;
+private boolean instanceInitialized = false;
public static boolean isAprAvailable() {
@@ -131,6 +132,7 @@ public class AprLifecycleListener implements
LifecycleListener {
if (Lifecycle.BEFORE_INIT_EVENT.equals(event.getType())) {
synchronized (lock) {
+instanceInitialized = true;
if (!(event.getLifecycle() instanceof Server)) {
log.warn(sm.getString("listener.notServer",
event.getLifecycle().getClass().getSimpleName()));
}
@@ -163,8 +165,12 @@ public class AprLifecycleListener implements
LifecycleListener {
}
} else if (Lifecycle.AFTER_DESTROY_EVENT.equals(event.getType())) {
synchronized (lock) {
-if (--referenceCount != 0) {
-// Still being used (note test is performed after
reference count is decremented)
+// Instance may get destroyed without ever being initialized
+if (instanceInitialized) {
+referenceCount --;
+}
+if (referenceCount != 0) {
+// Still being used
return;
}
if (!AprStatus.isAprAvailable()) {
-
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.90
On 14/06/2024 17:34, Mark Thomas wrote: On 14/06/2024 16:06, Rémy Maucherat wrote: The proposed 9.0.90 release is: [ ] -1, Broken - do not release [ ] +1, Stable - go ahead and release as 9.0.90 I am seeing issues with APR tests on 9.0.x on Windows, MacOS M1 but not Linux. MacOS Intel is still running. My guess at this point is that my reference counting fix is the cause of the problem. I am currently investigating. Confirmed. It doesn't handle the case where the destroy event occurs for a listener without the init event. Pretty much only going to happen with unit tests but I'll fix it anyway. Mark - 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.90
On 14/06/2024 16:06, Rémy Maucherat wrote: The proposed 9.0.90 release is: [ ] -1, Broken - do not release [ ] +1, Stable - go ahead and release as 9.0.90 I am seeing issues with APR tests on 9.0.x on Windows, MacOS M1 but not Linux. MacOS Intel is still running. My guess at this point is that my reference counting fix is the cause of the problem. I am currently investigating. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 11.0.0-M21
On 14/06/2024 15:57, Mark Thomas wrote: The proposed 11.0.0-M21 release is: [ ] -1 Broken - do not release [X] +1 Beta - go ahead and release as 11.0.0-M21 Unit tests pass on Linux, MacOS M1, MacOS Intel and Windows. Mark - 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.90
The proposed Apache Tomcat 9.0.90 release is now available for voting. The notable changes compared to 9.0.89 are: - Ensure that static resources deployed via a JAR file remain accessible when the context is configured to use a bloom filter. Based on pull request #730 provided by bergander. - Update to Commons Daemon 1.4.0 - The default value of the discardFacades attribute of the Connector is now true for improved safety For full details, see the changelog: https://nightlies.apache.org/tomcat/tomcat-9.0.x/docs/changelog.html It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.90/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1497 The tag is: https://github.com/apache/tomcat/tree/9.0.90 65977c7d1da9b6016e2b19de06c3be7373f40859 The proposed 9.0.90 release is: [ ] -1, Broken - do not release [ ] +1, Stable - go ahead and release as 9.0.90 Rémy - 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 is 9.0.91
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 30b0bd4e4c Next is 9.0.91 30b0bd4e4c is described below commit 30b0bd4e4c4ce8ec54b1c62cf13d25d15de25330 Author: remm AuthorDate: Fri Jun 14 16:58:16 2024 +0200 Next is 9.0.91 --- 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 0730f75a92..898c2f29c6 100644 --- a/build.properties.default +++ b/build.properties.default @@ -31,7 +31,7 @@ # - Version Control Flags - version.major=9 version.minor=0 -version.build=90 +version.build=91 version.patch=0 version.suffix= version.dev=-dev diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default index ad34255b6f..fc02cb105b 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.90 +maven.asf.release.deploy.version=9.0.91 #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 0d012e7bf8..04a6fd0822 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) tag 9.0.90 created (now 65977c7d1d)
This is an automated email from the ASF dual-hosted git repository. remm pushed a change to tag 9.0.90 in repository https://gitbox.apache.org/repos/asf/tomcat.git at 65977c7d1d (commit) This tag includes the following new commits: new 65977c7d1d Tag 9.0.90 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
svn commit: r69741 - in /dev/tomcat/tomcat-9/v9.0.90: ./ bin/ bin/embed/ src/
Author: remm Date: Fri Jun 14 15:01:31 2024 New Revision: 69741 Log: Upload 9.0.90 for voting Added: dev/tomcat/tomcat-9/v9.0.90/ dev/tomcat/tomcat-9/v9.0.90/KEYS dev/tomcat/tomcat-9/v9.0.90/README.html dev/tomcat/tomcat-9/v9.0.90/RELEASE-NOTES dev/tomcat/tomcat-9/v9.0.90/bin/ dev/tomcat/tomcat-9/v9.0.90/bin/README.html dev/tomcat/tomcat-9/v9.0.90/bin/apache-tomcat-9.0.90-deployer.tar.gz (with props) dev/tomcat/tomcat-9/v9.0.90/bin/apache-tomcat-9.0.90-deployer.tar.gz.asc (with props) dev/tomcat/tomcat-9/v9.0.90/bin/apache-tomcat-9.0.90-deployer.tar.gz.sha512 dev/tomcat/tomcat-9/v9.0.90/bin/apache-tomcat-9.0.90-deployer.zip (with props) dev/tomcat/tomcat-9/v9.0.90/bin/apache-tomcat-9.0.90-deployer.zip.asc (with props) dev/tomcat/tomcat-9/v9.0.90/bin/apache-tomcat-9.0.90-deployer.zip.sha512 dev/tomcat/tomcat-9/v9.0.90/bin/apache-tomcat-9.0.90-fulldocs.tar.gz (with props) dev/tomcat/tomcat-9/v9.0.90/bin/apache-tomcat-9.0.90-fulldocs.tar.gz.asc (with props) dev/tomcat/tomcat-9/v9.0.90/bin/apache-tomcat-9.0.90-fulldocs.tar.gz.sha512 dev/tomcat/tomcat-9/v9.0.90/bin/apache-tomcat-9.0.90-windows-x64.zip (with props) dev/tomcat/tomcat-9/v9.0.90/bin/apache-tomcat-9.0.90-windows-x64.zip.asc (with props) dev/tomcat/tomcat-9/v9.0.90/bin/apache-tomcat-9.0.90-windows-x64.zip.sha512 dev/tomcat/tomcat-9/v9.0.90/bin/apache-tomcat-9.0.90-windows-x86.zip (with props) dev/tomcat/tomcat-9/v9.0.90/bin/apache-tomcat-9.0.90-windows-x86.zip.asc (with props) dev/tomcat/tomcat-9/v9.0.90/bin/apache-tomcat-9.0.90-windows-x86.zip.sha512 dev/tomcat/tomcat-9/v9.0.90/bin/apache-tomcat-9.0.90.exe (with props) dev/tomcat/tomcat-9/v9.0.90/bin/apache-tomcat-9.0.90.exe.asc (with props) dev/tomcat/tomcat-9/v9.0.90/bin/apache-tomcat-9.0.90.exe.sha512 dev/tomcat/tomcat-9/v9.0.90/bin/apache-tomcat-9.0.90.tar.gz (with props) dev/tomcat/tomcat-9/v9.0.90/bin/apache-tomcat-9.0.90.tar.gz.asc (with props) dev/tomcat/tomcat-9/v9.0.90/bin/apache-tomcat-9.0.90.tar.gz.sha512 dev/tomcat/tomcat-9/v9.0.90/bin/apache-tomcat-9.0.90.zip (with props) dev/tomcat/tomcat-9/v9.0.90/bin/apache-tomcat-9.0.90.zip.asc (with props) dev/tomcat/tomcat-9/v9.0.90/bin/apache-tomcat-9.0.90.zip.sha512 dev/tomcat/tomcat-9/v9.0.90/bin/embed/ dev/tomcat/tomcat-9/v9.0.90/bin/embed/apache-tomcat-9.0.90-embed.tar.gz (with props) dev/tomcat/tomcat-9/v9.0.90/bin/embed/apache-tomcat-9.0.90-embed.tar.gz.asc (with props) dev/tomcat/tomcat-9/v9.0.90/bin/embed/apache-tomcat-9.0.90-embed.tar.gz.sha512 dev/tomcat/tomcat-9/v9.0.90/bin/embed/apache-tomcat-9.0.90-embed.zip (with props) dev/tomcat/tomcat-9/v9.0.90/bin/embed/apache-tomcat-9.0.90-embed.zip.asc (with props) dev/tomcat/tomcat-9/v9.0.90/bin/embed/apache-tomcat-9.0.90-embed.zip.sha512 dev/tomcat/tomcat-9/v9.0.90/src/ dev/tomcat/tomcat-9/v9.0.90/src/apache-tomcat-9.0.90-src.tar.gz (with props) dev/tomcat/tomcat-9/v9.0.90/src/apache-tomcat-9.0.90-src.tar.gz.asc (with props) dev/tomcat/tomcat-9/v9.0.90/src/apache-tomcat-9.0.90-src.tar.gz.sha512 dev/tomcat/tomcat-9/v9.0.90/src/apache-tomcat-9.0.90-src.zip (with props) dev/tomcat/tomcat-9/v9.0.90/src/apache-tomcat-9.0.90-src.zip.asc (with props) dev/tomcat/tomcat-9/v9.0.90/src/apache-tomcat-9.0.90-src.zip.sha512 Added: dev/tomcat/tomcat-9/v9.0.90/KEYS == --- dev/tomcat/tomcat-9/v9.0.90/KEYS (added) +++ dev/tomcat/tomcat-9/v9.0.90/KEYS Fri Jun 14 15:01:31 2024 @@ -0,0 +1,237 @@ +This file contains the PGP&GPG keys of various Apache developers. +Please don't use them for email unless you have to. Their main +purpose is code signing. + +Apache users: pgp < KEYS +Apache developers: +(pgpk -ll && pgpk -xa ) >> this file. + or +(gpg --fingerprint --list-sigs + && gpg --armor --export ) >> this file. + +Apache developers: please ensure that your key is also available via the +PGP keyservers (such as pgpkeys.mit.edu). + + +pub 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 +tT0cYipAp5IcYt6Zq5QzHiZreyQXLAjItDS2oGCIXfNbTYJ3kxxJTCU/3wlefV
svn commit: r69739 - in /dev/tomcat/tomcat-11/v11.0.0-M21: ./ bin/ bin/embed/ src/
Author: markt Date: Fri Jun 14 14:49:45 2024 New Revision: 69739 Log: Upload 11.0.0-M21 for voting Added: dev/tomcat/tomcat-11/v11.0.0-M21/ dev/tomcat/tomcat-11/v11.0.0-M21/KEYS dev/tomcat/tomcat-11/v11.0.0-M21/README.html dev/tomcat/tomcat-11/v11.0.0-M21/RELEASE-NOTES dev/tomcat/tomcat-11/v11.0.0-M21/bin/ dev/tomcat/tomcat-11/v11.0.0-M21/bin/README.html dev/tomcat/tomcat-11/v11.0.0-M21/bin/apache-tomcat-11.0.0-M21-deployer.tar.gz (with props) dev/tomcat/tomcat-11/v11.0.0-M21/bin/apache-tomcat-11.0.0-M21-deployer.tar.gz.asc dev/tomcat/tomcat-11/v11.0.0-M21/bin/apache-tomcat-11.0.0-M21-deployer.tar.gz.sha512 dev/tomcat/tomcat-11/v11.0.0-M21/bin/apache-tomcat-11.0.0-M21-deployer.zip (with props) dev/tomcat/tomcat-11/v11.0.0-M21/bin/apache-tomcat-11.0.0-M21-deployer.zip.asc dev/tomcat/tomcat-11/v11.0.0-M21/bin/apache-tomcat-11.0.0-M21-deployer.zip.sha512 dev/tomcat/tomcat-11/v11.0.0-M21/bin/apache-tomcat-11.0.0-M21-fulldocs.tar.gz (with props) dev/tomcat/tomcat-11/v11.0.0-M21/bin/apache-tomcat-11.0.0-M21-fulldocs.tar.gz.asc dev/tomcat/tomcat-11/v11.0.0-M21/bin/apache-tomcat-11.0.0-M21-fulldocs.tar.gz.sha512 dev/tomcat/tomcat-11/v11.0.0-M21/bin/apache-tomcat-11.0.0-M21-windows-x64.zip (with props) dev/tomcat/tomcat-11/v11.0.0-M21/bin/apache-tomcat-11.0.0-M21-windows-x64.zip.asc dev/tomcat/tomcat-11/v11.0.0-M21/bin/apache-tomcat-11.0.0-M21-windows-x64.zip.sha512 dev/tomcat/tomcat-11/v11.0.0-M21/bin/apache-tomcat-11.0.0-M21.exe (with props) dev/tomcat/tomcat-11/v11.0.0-M21/bin/apache-tomcat-11.0.0-M21.exe.asc dev/tomcat/tomcat-11/v11.0.0-M21/bin/apache-tomcat-11.0.0-M21.exe.sha512 dev/tomcat/tomcat-11/v11.0.0-M21/bin/apache-tomcat-11.0.0-M21.tar.gz (with props) dev/tomcat/tomcat-11/v11.0.0-M21/bin/apache-tomcat-11.0.0-M21.tar.gz.asc dev/tomcat/tomcat-11/v11.0.0-M21/bin/apache-tomcat-11.0.0-M21.tar.gz.sha512 dev/tomcat/tomcat-11/v11.0.0-M21/bin/apache-tomcat-11.0.0-M21.zip (with props) dev/tomcat/tomcat-11/v11.0.0-M21/bin/apache-tomcat-11.0.0-M21.zip.asc dev/tomcat/tomcat-11/v11.0.0-M21/bin/apache-tomcat-11.0.0-M21.zip.sha512 dev/tomcat/tomcat-11/v11.0.0-M21/bin/embed/ dev/tomcat/tomcat-11/v11.0.0-M21/bin/embed/apache-tomcat-11.0.0-M21-embed.tar.gz (with props) dev/tomcat/tomcat-11/v11.0.0-M21/bin/embed/apache-tomcat-11.0.0-M21-embed.tar.gz.asc dev/tomcat/tomcat-11/v11.0.0-M21/bin/embed/apache-tomcat-11.0.0-M21-embed.tar.gz.sha512 dev/tomcat/tomcat-11/v11.0.0-M21/bin/embed/apache-tomcat-11.0.0-M21-embed.zip (with props) dev/tomcat/tomcat-11/v11.0.0-M21/bin/embed/apache-tomcat-11.0.0-M21-embed.zip.asc dev/tomcat/tomcat-11/v11.0.0-M21/bin/embed/apache-tomcat-11.0.0-M21-embed.zip.sha512 dev/tomcat/tomcat-11/v11.0.0-M21/src/ dev/tomcat/tomcat-11/v11.0.0-M21/src/apache-tomcat-11.0.0-M21-src.tar.gz (with props) dev/tomcat/tomcat-11/v11.0.0-M21/src/apache-tomcat-11.0.0-M21-src.tar.gz.asc dev/tomcat/tomcat-11/v11.0.0-M21/src/apache-tomcat-11.0.0-M21-src.tar.gz.sha512 dev/tomcat/tomcat-11/v11.0.0-M21/src/apache-tomcat-11.0.0-M21-src.zip (with props) dev/tomcat/tomcat-11/v11.0.0-M21/src/apache-tomcat-11.0.0-M21-src.zip.asc dev/tomcat/tomcat-11/v11.0.0-M21/src/apache-tomcat-11.0.0-M21-src.zip.sha512 Added: dev/tomcat/tomcat-11/v11.0.0-M21/KEYS == --- dev/tomcat/tomcat-11/v11.0.0-M21/KEYS (added) +++ dev/tomcat/tomcat-11/v11.0.0-M21/KEYS Fri Jun 14 14:49:45 2024 @@ -0,0 +1,573 @@ +This file contains the PGP&GPG keys of various Apache developers. +Please don't use them for email unless you have to. Their main +purpose is code signing. + +Apache users: pgp < KEYS +Apache developers: +(pgpk -ll && pgpk -xa ) >> this file. + or +(gpg --fingerprint --list-sigs + && gpg --armor --export ) >> this file. + +Apache developers: please ensure that your key is also available via the +PGP keyservers (such as pgpkeys.mit.edu). + + +pub 4096R/2F6059E7 2009-09-18 + Key fingerprint = A9C5 DF4D 22E9 9998 D987 5A51 10C0 1C5A 2F60 59E7 +uid Mark E D Thomas +sub 4096R/5E763BEC 2009-09-18 + +-BEGIN PGP PUBLIC KEY BLOCK- +Comment: GPGTools - http://gpgtools.org + +mQINBEq0DukBEAD4jovHOPJDxoD+JnO1Go2kiwpgRULasGlrVKuSUdP6wzcaqWmX +pqtOJKKwW2MQFQLmg7nQ9RjJwy3QCbKNDJQA/bwbQT1F7WzTCz2S6vxC4zxKck4t +6RZBq2dJsYKF0CEh6ZfY4dmKvhq+3istSoFRdHYoOPGWZpuRDqfZPdGm/m335/6K +GH59oysn1NE7a2a+kZzjBSEgv23+l4Z1Rg7+fpz1JcdHSdC2Z+ZRxML25eVatRVz +4yvDOZItqDURP24zWOodxgboldV6Y88C3v/7KRR+1vklzkuA2FqF8Q4r/2f0su7M +UVviQcy29y/RlLSDTTYoVlCZ1ni14qFU7Hpw43KJtgXmcUwq31T1+SlXdYjNJ1aF +kUi8BjCHDcSgE/IReKUanjHzm4XSymKDTeqqzidi4k6PDD4jyHb8k8vxi6qT6Udn +lcfo5NBkkUT1TauhEy8ktHhbl9k60BvvMBP9l6cURiJg1WS77egI4P/82oPbzzFi +GFqXyJKULVgxtdQ3JikCpodp3f1fh6PlYZwkW4xCJLJucJ5MiQp07HAkMVW5w+k8 +Xvuk4i5quh3N+2kzKHOOiQCDmN0sz0XjOE+7XBvM1lv
[VOTE] Release Apache Tomcat 11.0.0-M21
The proposed Apache Tomcat 11.0.0-M21 release is now available for voting. Apache Tomcat 11.0.0-M21 is a milestone release of the 11.0.x branch and has been made to provide users with early access to the new features in Apache Tomcat 11.0.x so that they may provide feedback. The notable changes compared to the previous milestone include: - Ensure that static resources deployed via a JAR file remain accessible when the context is configured to use a bloom filter. Based on a pull request provided by bergander. - Ensure that static resources deployed via a JAR file remain accessible when the context is configured to use a bloom filter. Based on pull request #730 provided by bergander. - Update to Commons Daemon 1.4.0 For full details, see the change log: https://nightlies.apache.org/tomcat/tomcat-11.0.x/docs/changelog.html Applications that run on Tomcat 9 and earlier will not run on Tomcat 11 without changes. Java EE applications designed for Tomcat 9 and earlier may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will automatically convert them to Jakarta EE and copy them to the webapps directory. Applications using deprecated APIs may require further changes. It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-11/v11.0.0-M21/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1496 The tag is: https://github.com/apache/tomcat/tree/11.0.0-M21 2acc5c10a303d6ae7a28c2959432aef98ae29016 The proposed 11.0.0-M21 release is: [ ] -1 Broken - do not release [ ] +1 Beta - go ahead and release as 11.0.0-M21 - 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.90
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to tag 9.0.90 in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 65977c7d1da9b6016e2b19de06c3be7373f40859 Author: remm AuthorDate: Fri Jun 14 16:51:27 2024 +0200 Tag 9.0.90 --- build.properties.release | 54 +++ res/install-win/Uninstall.exe.sig| Bin 0 -> 10202 bytes res/install-win/tomcat-installer.exe.sig | Bin 0 -> 10202 bytes res/maven/mvn.properties.release | 27 webapps/docs/changelog.xml | 2 +- 5 files changed, 82 insertions(+), 1 deletion(-) diff --git a/build.properties.release b/build.properties.release new file mode 100644 index 00..3a7db57ec3 --- /dev/null +++ b/build.properties.release @@ -0,0 +1,54 @@ +# - +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# - + +# This file was auto-generated by the pre-release Ant target. + +# Any unwanted settings may be over-ridden in a build.properties file located +# in the same directory as this file. + +# Set the version-dev to "" (empty string) as this is not a development release. +version.dev= + +# Ensure consistent timestamps for reproducible builds. +ant.tstamp.now.iso=2024-06-14T14:45:13Z + +# Enable insertion of detached signatures into the Windows installer. +do.codesigning=true + +# Re-use the same GPG executable. +gpg.exec=/usr/bin/gpg + +# Reproducible builds require the use of the build tools defined below. The +# vendors (where appropriate) and versions must match exactly for a reproducible +# build since this data is embedded in various files, particularly JAR file +# manifests, as part of the build process. +# +# Apache Ant: Apache Ant(TM) version 1.10.14 compiled on August 16 2023 +# +# Java Name: OpenJDK 64-Bit Server VM +# Java Vendor: Eclipse Adoptium +# Java Version:17.0.11+9 + +# The following is provided for information only. Builds will be repeatable +# whether or not the build environment is consistent with this information. +# +# OS: amd64 Linux 6.8.11-300.fc40.x86_64 +# File encoding: UTF-8 +# +# Release Manager: remm +release-java-version=17.0.11+9 +release-ant-version=1.10.14 diff --git a/res/install-win/Uninstall.exe.sig b/res/install-win/Uninstall.exe.sig new file mode 100644 index 00..8fe3b9448a Binary files /dev/null and b/res/install-win/Uninstall.exe.sig differ diff --git a/res/install-win/tomcat-installer.exe.sig b/res/install-win/tomcat-installer.exe.sig new file mode 100644 index 00..df9d86100c Binary files /dev/null and b/res/install-win/tomcat-installer.exe.sig differ diff --git a/res/maven/mvn.properties.release b/res/maven/mvn.properties.release new file mode 100644 index 00..b245bdc035 --- /dev/null +++ b/res/maven/mvn.properties.release @@ -0,0 +1,27 @@ +# - +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# - + +# This file was auto-generated by the pre-release Ant target. + +# Remove "-dev" from the version since this is not a development release. +maven.asf.release.deploy.version=9.0.90 + +# Re-use the same GPG executable. +gpg.exec=/usr/bin/gpg + +# Set the user nam
(tomcat) 01/01: Tag 11.0.0-M21
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to tag 11.0.0-M21 in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 2acc5c10a303d6ae7a28c2959432aef98ae29016 Author: Mark Thomas AuthorDate: Fri Jun 14 15:31:39 2024 +0100 Tag 11.0.0-M21 --- build.properties.release | 54 +++ res/install-win/Uninstall.exe.sig| Bin 0 -> 10202 bytes res/install-win/tomcat-installer.exe.sig | Bin 0 -> 10202 bytes res/maven/mvn.properties.release | 27 webapps/docs/changelog.xml | 2 +- 5 files changed, 82 insertions(+), 1 deletion(-) diff --git a/build.properties.release b/build.properties.release new file mode 100644 index 00..1975029d30 --- /dev/null +++ b/build.properties.release @@ -0,0 +1,54 @@ +# - +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# - + +# This file was auto-generated by the pre-release Ant target. + +# Any unwanted settings may be over-ridden in a build.properties file located +# in the same directory as this file. + +# Set the version-dev to "" (empty string) as this is not a development release. +version.dev= + +# Ensure consistent timestamps for reproducible builds. +ant.tstamp.now.iso=2024-06-14T14:18:24Z + +# Enable insertion of detached signatures into the Windows installer. +do.codesigning=true + +# Re-use the same GPG executable. +gpg.exec=C:/Program Files (x86)/GnuPG/bin/gpg.exe + +# Reproducible builds require the use of the build tools defined below. The +# vendors (where appropriate) and versions must match exactly for a reproducible +# build since this data is embedded in various files, particularly JAR file +# manifests, as part of the build process. +# +# Apache Ant: Apache Ant(TM) version 1.10.13 compiled on January 4 2023 +# +# Java Name: OpenJDK 64-Bit Server VM +# Java Vendor: Eclipse Adoptium +# Java Version:22.0.1+8 + +# The following is provided for information only. Builds will be repeatable +# whether or not the build environment is consistent with this information. +# +# OS: amd64 Windows Server 2022 10.0 +# File encoding: UTF-8 +# +# Release Manager: markt +release-java-version=22.0.1+8 +release-ant-version=1.10.13 diff --git a/res/install-win/Uninstall.exe.sig b/res/install-win/Uninstall.exe.sig new file mode 100644 index 00..d45d85d81c Binary files /dev/null and b/res/install-win/Uninstall.exe.sig differ diff --git a/res/install-win/tomcat-installer.exe.sig b/res/install-win/tomcat-installer.exe.sig new file mode 100644 index 00..4d3cc9516d Binary files /dev/null and b/res/install-win/tomcat-installer.exe.sig differ diff --git a/res/maven/mvn.properties.release b/res/maven/mvn.properties.release new file mode 100644 index 00..6a01b859fc --- /dev/null +++ b/res/maven/mvn.properties.release @@ -0,0 +1,27 @@ +# - +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# - + +# This file was auto-generated by the pre-release Ant target. + +# Remove "-dev" from the version since this is not a development release. +maven.asf.release.deploy.version=11.0.0-M21 + +# Re-use the same GPG executable. +
(tomcat) tag 11.0.0-M21 created (now 2acc5c10a3)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to tag 11.0.0-M21 in repository https://gitbox.apache.org/repos/asf/tomcat.git at 2acc5c10a3 (commit) This tag includes the following new commits: new 2acc5c10a3 Tag 11.0.0-M21 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
Re: [PR] Rename method `getUseVirtualThreads` to `isUseVirtualThreads` [tomcat]
ChristopherSchultz commented on PR #734: URL: https://github.com/apache/tomcat/pull/734#issuecomment-2168032699 The Javabean specification says that boolean properties must have accessors (for readable properties) and mutators (for writable ones) called `boolean getFoo()` and/or `boolean getFoo()` and `void setFoo(boolean b)`. There is no requirement for `isFoo` versus `getFoo`. Ar Mark says, it's entirely a matter of style. Some examples including references: https://stackoverflow.com/a/39307501/276232 In English "get use-virtual-threads" is more readable and natural to me than "is use-virtual-threads". The best method name would probably be "should use-virtual-threads", but that breaks all accessor naming conventions, and therefore we wouldn't choose 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
(tomcat) branch 10.1.x updated: Add DataSource realm unit test
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new a2b290ec42 Add DataSource realm unit test
a2b290ec42 is described below
commit a2b290ec425498cbd4a5bb840fabce7520c0fac4
Author: remm
AuthorDate: Fri Jun 14 15:04:14 2024 +0200
Add DataSource realm unit test
---
.../apache/catalina/realm/TestDataSourceRealm.java | 161 +
1 file changed, 161 insertions(+)
diff --git a/test/org/apache/catalina/realm/TestDataSourceRealm.java
b/test/org/apache/catalina/realm/TestDataSourceRealm.java
new file mode 100644
index 00..57486a54c9
--- /dev/null
+++ b/test/org/apache/catalina/realm/TestDataSourceRealm.java
@@ -0,0 +1,161 @@
+/*
+ * 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.catalina.realm;
+
+import java.io.File;
+import java.security.Principal;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.Statement;
+import java.util.List;
+
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.catalina.LifecycleException;
+import org.apache.catalina.startup.LoggingBaseTest;
+
+public class TestDataSourceRealm extends LoggingBaseTest {
+
+public static final String SIMPLE_SCHEMA =
+"create table users (\n"
++ " user_name varchar(15) not null primary key,\n"
++ " user_pass varchar(15) not null\n"
++ ");\n"
++ "create table user_roles (\n"
++ " user_name varchar(15) not null,\n"
++ " role_name varchar(15) not null,\n"
++ " primary key (user_name, role_name)\n"
++ ");";
+public static final String USERS_INSERT = "INSERT INTO users(user_name,
user_pass) VALUES(?, ?)";
+public static final String ROLES_INSERT = "INSERT INTO
user_roles(user_name, role_name) VALUES(?, ?)";
+
+protected class DerbyDataSourceRealm extends DataSourceRealm {
+protected final String name;
+protected Connection connection = null;
+public DerbyDataSourceRealm(String name) {
+this.name = "/" + name;
+}
+@Override
+protected Connection open() {
+// Replace DataSource use and JNDI access with direct Derby
+// connection
+if (connection == null) {
+try {
+Class.forName("org.apache.derby.jdbc.EmbeddedDriver");
+connection = DriverManager.getConnection("jdbc:derby:" +
getTemporaryDirectory().getAbsolutePath()
++ name + ";create=true");
+} catch (Exception e) {
+throw new IllegalStateException(e);
+}
+}
+return connection;
+}
+@Override
+protected void close(Connection dbConnection) {
+// Only one connection so don't close it here
+}
+@Override
+public void initInternal() throws LifecycleException {
+// Avoid heavy lifecycle and JMX, however container log is needed
+containerLog = log;
+}
+@Override
+public void stopInternal() throws LifecycleException {
+super.stopInternal();
+if (connection != null) {
+super.close(connection);
+}
+}
+}
+
+private DerbyDataSourceRealm db;
+
+@AfterClass
+public static void derbyCleanup() {
+System.out.println("Deleted derby.log: " + (new
File("derby.log")).delete());
+}
+
+@Test
+public void testRealm() throws Exception {
+
+db = new DerbyDataSourceRealm("dsRealm");
+db.setUserTable("users");
+db.setUserNameCol("user_name");
+db.setUserCredCol("user_pass");
+db.setUserRoleTable("user_roles");
+db.setRoleNameCol("role_name");
+
+// First create the users and roles tables
+Connection connection = db.open();
+for (String sql: SIMPLE_SCHEMA.
(tomcat) branch 9.0.x updated: Add DataSource realm unit test
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 487534dbdf Add DataSource realm unit test
487534dbdf is described below
commit 487534dbdf06906949f9b8932f65e36cbff5bdc5
Author: remm
AuthorDate: Fri Jun 14 15:04:14 2024 +0200
Add DataSource realm unit test
---
.../apache/catalina/realm/TestDataSourceRealm.java | 161 +
1 file changed, 161 insertions(+)
diff --git a/test/org/apache/catalina/realm/TestDataSourceRealm.java
b/test/org/apache/catalina/realm/TestDataSourceRealm.java
new file mode 100644
index 00..57486a54c9
--- /dev/null
+++ b/test/org/apache/catalina/realm/TestDataSourceRealm.java
@@ -0,0 +1,161 @@
+/*
+ * 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.catalina.realm;
+
+import java.io.File;
+import java.security.Principal;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.Statement;
+import java.util.List;
+
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.catalina.LifecycleException;
+import org.apache.catalina.startup.LoggingBaseTest;
+
+public class TestDataSourceRealm extends LoggingBaseTest {
+
+public static final String SIMPLE_SCHEMA =
+"create table users (\n"
++ " user_name varchar(15) not null primary key,\n"
++ " user_pass varchar(15) not null\n"
++ ");\n"
++ "create table user_roles (\n"
++ " user_name varchar(15) not null,\n"
++ " role_name varchar(15) not null,\n"
++ " primary key (user_name, role_name)\n"
++ ");";
+public static final String USERS_INSERT = "INSERT INTO users(user_name,
user_pass) VALUES(?, ?)";
+public static final String ROLES_INSERT = "INSERT INTO
user_roles(user_name, role_name) VALUES(?, ?)";
+
+protected class DerbyDataSourceRealm extends DataSourceRealm {
+protected final String name;
+protected Connection connection = null;
+public DerbyDataSourceRealm(String name) {
+this.name = "/" + name;
+}
+@Override
+protected Connection open() {
+// Replace DataSource use and JNDI access with direct Derby
+// connection
+if (connection == null) {
+try {
+Class.forName("org.apache.derby.jdbc.EmbeddedDriver");
+connection = DriverManager.getConnection("jdbc:derby:" +
getTemporaryDirectory().getAbsolutePath()
++ name + ";create=true");
+} catch (Exception e) {
+throw new IllegalStateException(e);
+}
+}
+return connection;
+}
+@Override
+protected void close(Connection dbConnection) {
+// Only one connection so don't close it here
+}
+@Override
+public void initInternal() throws LifecycleException {
+// Avoid heavy lifecycle and JMX, however container log is needed
+containerLog = log;
+}
+@Override
+public void stopInternal() throws LifecycleException {
+super.stopInternal();
+if (connection != null) {
+super.close(connection);
+}
+}
+}
+
+private DerbyDataSourceRealm db;
+
+@AfterClass
+public static void derbyCleanup() {
+System.out.println("Deleted derby.log: " + (new
File("derby.log")).delete());
+}
+
+@Test
+public void testRealm() throws Exception {
+
+db = new DerbyDataSourceRealm("dsRealm");
+db.setUserTable("users");
+db.setUserNameCol("user_name");
+db.setUserCredCol("user_pass");
+db.setUserRoleTable("user_roles");
+db.setRoleNameCol("role_name");
+
+// First create the users and roles tables
+Connection connection = db.open();
+for (String sql: SIMPLE_SCHEMA.sp
(tomcat) branch main updated: Add DataSource realm unit test
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 abb6f222ee Add DataSource realm unit test
abb6f222ee is described below
commit abb6f222ee6cd7129bb6bb303536a4a504a02b22
Author: remm
AuthorDate: Fri Jun 14 15:04:14 2024 +0200
Add DataSource realm unit test
---
.../apache/catalina/realm/TestDataSourceRealm.java | 161 +
1 file changed, 161 insertions(+)
diff --git a/test/org/apache/catalina/realm/TestDataSourceRealm.java
b/test/org/apache/catalina/realm/TestDataSourceRealm.java
new file mode 100644
index 00..57486a54c9
--- /dev/null
+++ b/test/org/apache/catalina/realm/TestDataSourceRealm.java
@@ -0,0 +1,161 @@
+/*
+ * 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.catalina.realm;
+
+import java.io.File;
+import java.security.Principal;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.Statement;
+import java.util.List;
+
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.catalina.LifecycleException;
+import org.apache.catalina.startup.LoggingBaseTest;
+
+public class TestDataSourceRealm extends LoggingBaseTest {
+
+public static final String SIMPLE_SCHEMA =
+"create table users (\n"
++ " user_name varchar(15) not null primary key,\n"
++ " user_pass varchar(15) not null\n"
++ ");\n"
++ "create table user_roles (\n"
++ " user_name varchar(15) not null,\n"
++ " role_name varchar(15) not null,\n"
++ " primary key (user_name, role_name)\n"
++ ");";
+public static final String USERS_INSERT = "INSERT INTO users(user_name,
user_pass) VALUES(?, ?)";
+public static final String ROLES_INSERT = "INSERT INTO
user_roles(user_name, role_name) VALUES(?, ?)";
+
+protected class DerbyDataSourceRealm extends DataSourceRealm {
+protected final String name;
+protected Connection connection = null;
+public DerbyDataSourceRealm(String name) {
+this.name = "/" + name;
+}
+@Override
+protected Connection open() {
+// Replace DataSource use and JNDI access with direct Derby
+// connection
+if (connection == null) {
+try {
+Class.forName("org.apache.derby.jdbc.EmbeddedDriver");
+connection = DriverManager.getConnection("jdbc:derby:" +
getTemporaryDirectory().getAbsolutePath()
++ name + ";create=true");
+} catch (Exception e) {
+throw new IllegalStateException(e);
+}
+}
+return connection;
+}
+@Override
+protected void close(Connection dbConnection) {
+// Only one connection so don't close it here
+}
+@Override
+public void initInternal() throws LifecycleException {
+// Avoid heavy lifecycle and JMX, however container log is needed
+containerLog = log;
+}
+@Override
+public void stopInternal() throws LifecycleException {
+super.stopInternal();
+if (connection != null) {
+super.close(connection);
+}
+}
+}
+
+private DerbyDataSourceRealm db;
+
+@AfterClass
+public static void derbyCleanup() {
+System.out.println("Deleted derby.log: " + (new
File("derby.log")).delete());
+}
+
+@Test
+public void testRealm() throws Exception {
+
+db = new DerbyDataSourceRealm("dsRealm");
+db.setUserTable("users");
+db.setUserNameCol("user_name");
+db.setUserCredCol("user_pass");
+db.setUserRoleTable("user_roles");
+db.setRoleNameCol("role_name");
+
+// First create the users and roles tables
+Connection connection = db.open();
+for (String sql: SIMPLE_SCHEMA.spli
(tomcat) branch 9.0.x updated: Add support for re-keying with TLS 1.3
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 76c5cce6f0 Add support for re-keying with TLS 1.3
76c5cce6f0 is described below
commit 76c5cce6f0bcef14b0c21c38910371ca7d322d13
Author: Mark Thomas
AuthorDate: Wed Jun 12 19:43:39 2024 +0100
Add support for re-keying with TLS 1.3
---
.../apache/tomcat/util/net/LocalStrings.properties | 2 ++
.../apache/tomcat/util/net/SecureNio2Channel.java | 26 --
.../apache/tomcat/util/net/SecureNioChannel.java | 19
webapps/docs/changelog.xml | 3 +++
4 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/LocalStrings.properties
b/java/org/apache/tomcat/util/net/LocalStrings.properties
index 10b4fc1f47..9c7c601e59 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings.properties
@@ -26,6 +26,8 @@ channel.nio.ssl.expandNetInBuffer=Expanding network input
buffer to [{0}] bytes
channel.nio.ssl.expandNetOutBuffer=Expanding network output buffer to [{0}]
bytes
channel.nio.ssl.foundHttp=Found an plain text HTTP request on what should be
an encrypted TLS connection
channel.nio.ssl.handshakeError=Handshake error
+channel.nio.ssl.handshakeWrapPending=There is already handshake data waiting
to be wrapped
+channel.nio.ssl.handshakeWrapQueueTooLong=The queue of handshake data to be
wrapped has grown too long
channel.nio.ssl.incompleteHandshake=Handshake incomplete, you must complete
handshake before reading data.
channel.nio.ssl.invalidCloseState=Invalid close state, will not send network
data.
channel.nio.ssl.invalidStatus=Unexpected status [{0}].
diff --git a/java/org/apache/tomcat/util/net/SecureNio2Channel.java
b/java/org/apache/tomcat/util/net/SecureNio2Channel.java
index 4ec1b3c1c7..0a3624bc26 100644
--- a/java/org/apache/tomcat/util/net/SecureNio2Channel.java
+++ b/java/org/apache/tomcat/util/net/SecureNio2Channel.java
@@ -54,10 +54,12 @@ public class SecureNio2Channel extends Nio2Channel {
private static final Log log = LogFactory.getLog(SecureNio2Channel.class);
private static final StringManager sm =
StringManager.getManager(SecureNio2Channel.class);
-// Value determined by observation of what the SSL Engine requested in
-// various scenarios
+// Value determined by observation of what the SSL Engine requested in
various scenarios
private static final int DEFAULT_NET_BUFFER_SIZE = 16921;
+// Much longer than it should ever need to be but short enough to trigger
connection closure if something goes wrong
+private static final int HANDSHAKE_WRAP_QUEUE_LENGTH_LIMIT = 100;
+
protected final Nio2Endpoint endpoint;
protected ByteBuffer netInBuffer;
@@ -68,6 +70,7 @@ public class SecureNio2Channel extends Nio2Channel {
protected volatile boolean sniComplete = false;
private volatile boolean handshakeComplete = false;
+private volatile int handshakeWrapQueueLength = 0;
private volatile HandshakeStatus handshakeStatus; //gets set by handshake
protected boolean closed;
@@ -764,6 +767,11 @@ public class SecureNio2Channel extends Nio2Channel {
//perform any tasks if needed
if (unwrap.getHandshakeStatus() ==
HandshakeStatus.NEED_TASK) {
tasks();
+} else if (unwrap.getHandshakeStatus() ==
HandshakeStatus.NEED_WRAP) {
+if (++handshakeWrapQueueLength >
HANDSHAKE_WRAP_QUEUE_LENGTH_LIMIT) {
+throw new ExecutionException(
+new
IOException(sm.getString("channel.nio.ssl.handshakeWrapQueueTooLong")));
+}
}
//if we need more network data, then bail out for now.
if (unwrap.getStatus() == Status.BUFFER_UNDERFLOW) {
@@ -894,6 +902,8 @@ public class SecureNio2Channel extends Nio2Channel {
if (!netOutBuffer.hasRemaining()) {
netOutBuffer.clear();
SSLEngineResult result = sslEngine.wrap(src, netOutBuffer);
+// Call to wrap() will have included any required
handshake data
+handshakeWrapQueueLength = 0;
written = result.bytesConsumed();
netOutBuffer.flip();
if (result.getStatus() == Status.OK) {
@@ -959,6 +969,11 @@ public class SecureNio2Channel extends Nio2Channel {
//perform any tasks if needed
if (unwrap.getHandshakeStatus() ==
HandshakeStatus.NEED_TASK) {
tasks();
+} else
(tomcat) branch 10.1.x updated: Add support for re-keying with TLS 1.3
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 3344c17cef Add support for re-keying with TLS 1.3
3344c17cef is described below
commit 3344c17cef094da4bb616f4186ed32039627b543
Author: Mark Thomas
AuthorDate: Wed Jun 12 19:43:39 2024 +0100
Add support for re-keying with TLS 1.3
---
.../apache/tomcat/util/net/LocalStrings.properties | 2 ++
.../apache/tomcat/util/net/SecureNio2Channel.java | 26 --
.../apache/tomcat/util/net/SecureNioChannel.java | 19
webapps/docs/changelog.xml | 3 +++
4 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/LocalStrings.properties
b/java/org/apache/tomcat/util/net/LocalStrings.properties
index 35c9d890c2..de72354e30 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings.properties
@@ -26,6 +26,8 @@ channel.nio.ssl.expandNetInBuffer=Expanding network input
buffer to [{0}] bytes
channel.nio.ssl.expandNetOutBuffer=Expanding network output buffer to [{0}]
bytes
channel.nio.ssl.foundHttp=Found an plain text HTTP request on what should be
an encrypted TLS connection
channel.nio.ssl.handshakeError=Handshake error
+channel.nio.ssl.handshakeWrapPending=There is already handshake data waiting
to be wrapped
+channel.nio.ssl.handshakeWrapQueueTooLong=The queue of handshake data to be
wrapped has grown too long
channel.nio.ssl.incompleteHandshake=Handshake incomplete, you must complete
handshake before reading data.
channel.nio.ssl.invalidCloseState=Invalid close state, will not send network
data.
channel.nio.ssl.invalidStatus=Unexpected status [{0}].
diff --git a/java/org/apache/tomcat/util/net/SecureNio2Channel.java
b/java/org/apache/tomcat/util/net/SecureNio2Channel.java
index 076f336bb8..c2167f6683 100644
--- a/java/org/apache/tomcat/util/net/SecureNio2Channel.java
+++ b/java/org/apache/tomcat/util/net/SecureNio2Channel.java
@@ -53,10 +53,12 @@ public class SecureNio2Channel extends Nio2Channel {
private static final Log log = LogFactory.getLog(SecureNio2Channel.class);
private static final StringManager sm =
StringManager.getManager(SecureNio2Channel.class);
-// Value determined by observation of what the SSL Engine requested in
-// various scenarios
+// Value determined by observation of what the SSL Engine requested in
various scenarios
private static final int DEFAULT_NET_BUFFER_SIZE = 16921;
+// Much longer than it should ever need to be but short enough to trigger
connection closure if something goes wrong
+private static final int HANDSHAKE_WRAP_QUEUE_LENGTH_LIMIT = 100;
+
protected final Nio2Endpoint endpoint;
protected ByteBuffer netInBuffer;
@@ -67,6 +69,7 @@ public class SecureNio2Channel extends Nio2Channel {
protected volatile boolean sniComplete = false;
private volatile boolean handshakeComplete = false;
+private volatile int handshakeWrapQueueLength = 0;
private volatile HandshakeStatus handshakeStatus; //gets set by handshake
protected boolean closed;
@@ -762,6 +765,11 @@ public class SecureNio2Channel extends Nio2Channel {
//perform any tasks if needed
if (unwrap.getHandshakeStatus() ==
HandshakeStatus.NEED_TASK) {
tasks();
+} else if (unwrap.getHandshakeStatus() ==
HandshakeStatus.NEED_WRAP) {
+if (++handshakeWrapQueueLength >
HANDSHAKE_WRAP_QUEUE_LENGTH_LIMIT) {
+throw new ExecutionException(
+new
IOException(sm.getString("channel.nio.ssl.handshakeWrapQueueTooLong")));
+}
}
//if we need more network data, then bail out for now.
if (unwrap.getStatus() == Status.BUFFER_UNDERFLOW) {
@@ -892,6 +900,8 @@ public class SecureNio2Channel extends Nio2Channel {
if (!netOutBuffer.hasRemaining()) {
netOutBuffer.clear();
SSLEngineResult result = sslEngine.wrap(src, netOutBuffer);
+// Call to wrap() will have included any required
handshake data
+handshakeWrapQueueLength = 0;
written = result.bytesConsumed();
netOutBuffer.flip();
if (result.getStatus() == Status.OK) {
@@ -957,6 +967,11 @@ public class SecureNio2Channel extends Nio2Channel {
//perform any tasks if needed
if (unwrap.getHandshakeStatus() ==
HandshakeStatus.NEED_TASK) {
tasks();
+} els
(tomcat) branch main updated: Add support for re-keying with TLS 1.3
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 3197862639 Add support for re-keying with TLS 1.3
3197862639 is described below
commit 3197862639732e16ec1164557bcd289ebc116c93
Author: Mark Thomas
AuthorDate: Wed Jun 12 19:43:39 2024 +0100
Add support for re-keying with TLS 1.3
---
.../apache/tomcat/util/net/LocalStrings.properties | 2 ++
.../apache/tomcat/util/net/SecureNio2Channel.java | 26 --
.../apache/tomcat/util/net/SecureNioChannel.java | 19
webapps/docs/changelog.xml | 3 +++
4 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/LocalStrings.properties
b/java/org/apache/tomcat/util/net/LocalStrings.properties
index f10dfafc03..2cc689c25c 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings.properties
@@ -26,6 +26,8 @@ channel.nio.ssl.expandNetInBuffer=Expanding network input
buffer to [{0}] bytes
channel.nio.ssl.expandNetOutBuffer=Expanding network output buffer to [{0}]
bytes
channel.nio.ssl.foundHttp=Found an plain text HTTP request on what should be
an encrypted TLS connection
channel.nio.ssl.handshakeError=Handshake error
+channel.nio.ssl.handshakeWrapPending=There is already handshake data waiting
to be wrapped
+channel.nio.ssl.handshakeWrapQueueTooLong=The queue of handshake data to be
wrapped has grown too long
channel.nio.ssl.incompleteHandshake=Handshake incomplete, you must complete
handshake before reading data.
channel.nio.ssl.invalidCloseState=Invalid close state, will not send network
data.
channel.nio.ssl.invalidStatus=Unexpected status [{0}].
diff --git a/java/org/apache/tomcat/util/net/SecureNio2Channel.java
b/java/org/apache/tomcat/util/net/SecureNio2Channel.java
index 92b5f3d5c4..7d5df2e007 100644
--- a/java/org/apache/tomcat/util/net/SecureNio2Channel.java
+++ b/java/org/apache/tomcat/util/net/SecureNio2Channel.java
@@ -53,10 +53,12 @@ public class SecureNio2Channel extends Nio2Channel {
private static final Log log = LogFactory.getLog(SecureNio2Channel.class);
private static final StringManager sm =
StringManager.getManager(SecureNio2Channel.class);
-// Value determined by observation of what the SSL Engine requested in
-// various scenarios
+// Value determined by observation of what the SSL Engine requested in
various scenarios
private static final int DEFAULT_NET_BUFFER_SIZE = 16921;
+// Much longer than it should ever need to be but short enough to trigger
connection closure if something goes wrong
+private static final int HANDSHAKE_WRAP_QUEUE_LENGTH_LIMIT = 100;
+
protected final Nio2Endpoint endpoint;
protected ByteBuffer netInBuffer;
@@ -67,6 +69,7 @@ public class SecureNio2Channel extends Nio2Channel {
protected volatile boolean sniComplete = false;
private volatile boolean handshakeComplete = false;
+private volatile int handshakeWrapQueueLength = 0;
private volatile HandshakeStatus handshakeStatus; //gets set by handshake
protected boolean closed;
@@ -767,6 +770,11 @@ public class SecureNio2Channel extends Nio2Channel {
//perform any tasks if needed
if (unwrap.getHandshakeStatus() ==
HandshakeStatus.NEED_TASK) {
tasks();
+} else if (unwrap.getHandshakeStatus() ==
HandshakeStatus.NEED_WRAP) {
+if (++handshakeWrapQueueLength >
HANDSHAKE_WRAP_QUEUE_LENGTH_LIMIT) {
+throw new ExecutionException(
+new
IOException(sm.getString("channel.nio.ssl.handshakeWrapQueueTooLong")));
+}
}
//if we need more network data, then bail out for now.
if (unwrap.getStatus() == Status.BUFFER_UNDERFLOW) {
@@ -897,6 +905,8 @@ public class SecureNio2Channel extends Nio2Channel {
if (!netOutBuffer.hasRemaining()) {
netOutBuffer.clear();
SSLEngineResult result = sslEngine.wrap(src, netOutBuffer);
+// Call to wrap() will have included any required
handshake data
+handshakeWrapQueueLength = 0;
written = result.bytesConsumed();
netOutBuffer.flip();
if (result.getStatus() == Status.OK) {
@@ -962,6 +972,11 @@ public class SecureNio2Channel extends Nio2Channel {
//perform any tasks if needed
if (unwrap.getHandshakeStatus() ==
HandshakeStatus.NEED_TASK) {
tasks();
+} else if
(tomcat) branch 9.0.x updated: Make counting of active streams more robust
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 9fec9a8288 Make counting of active streams more robust
9fec9a8288 is described below
commit 9fec9a82887853402833a80b584e3762c7423f5f
Author: Mark Thomas
AuthorDate: Wed May 8 08:36:43 2024 +0100
Make counting of active streams more robust
---
.../coyote/http2/Http2AsyncUpgradeHandler.java | 2 +-
.../org/apache/coyote/http2/Http2UpgradeHandler.java | 20 ++--
java/org/apache/coyote/http2/Stream.java | 16
webapps/docs/changelog.xml | 4
4 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
b/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
index 758b63e666..bedc8788d9 100644
--- a/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
@@ -156,7 +156,7 @@ public class Http2AsyncUpgradeHandler extends
Http2UpgradeHandler {
boolean active = state.isActive();
state.sendReset();
if (active) {
-decrementActiveRemoteStreamCount();
+
decrementActiveRemoteStreamCount(getStream(se.getStreamId()));
}
}
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index a50f62287d..2ac1b969b3 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -288,8 +288,8 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
}
-protected void decrementActiveRemoteStreamCount() {
-
setConnectionTimeoutForStreamCount(activeRemoteStreamCount.decrementAndGet());
+protected void decrementActiveRemoteStreamCount(Stream stream) {
+
setConnectionTimeoutForStreamCount(stream.decrementAndGetActiveRemoteStreamCount());
}
@@ -596,7 +596,7 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
boolean active = state.isActive();
state.sendReset();
if (active) {
-decrementActiveRemoteStreamCount();
+
decrementActiveRemoteStreamCount(getStream(se.getStreamId()));
}
}
socketWrapper.write(true, rstFrame, 0, rstFrame.length);
@@ -839,7 +839,7 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
protected void sentEndOfStream(Stream stream) {
stream.sentEndOfStream();
if (!stream.isActive()) {
-decrementActiveRemoteStreamCount();
+decrementActiveRemoteStreamCount(stream);
}
}
@@ -1221,7 +1221,7 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
}
-private Stream getStream(int streamId) {
+Stream getStream(int streamId) {
Integer key = Integer.valueOf(streamId);
AbstractStream result = streams.get(key);
if (result instanceof Stream) {
@@ -1590,6 +1590,7 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
Stream stream = getStream(streamId, false);
if (stream == null) {
stream = createRemoteStream(streamId);
+activeRemoteStreamCount.incrementAndGet();
}
if (streamId < maxActiveRemoteStreamId) {
throw new
ConnectionException(sm.getString("upgradeHandler.stream.old",
Integer.valueOf(streamId),
@@ -1668,9 +1669,8 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
Stream stream = (Stream) abstractNonZeroStream;
if (stream.isActive()) {
if (stream.receivedEndOfHeaders()) {
-
-if (localSettings.getMaxConcurrentStreams() <
activeRemoteStreamCount.incrementAndGet()) {
-decrementActiveRemoteStreamCount();
+if (localSettings.getMaxConcurrentStreams() <
activeRemoteStreamCount.get()) {
+decrementActiveRemoteStreamCount(stream);
// Ignoring maxConcurrentStreams increases the
overhead count
increaseOverheadCount(FrameType.HEADERS);
throw new StreamException(
@@ -1714,7 +1714,7 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
private void receivedEndOfStream(Stream stream) throws ConnectionException
{
stream.receivedEndOfStream();
if (!stream.isActive()) {
-decrementActiveRemoteStrea
(tomcat) branch 10.1.x updated: Make counting of active streams more robust
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 2afae300c9 Make counting of active streams more robust
2afae300c9 is described below
commit 2afae300c9ac9c0e516e2e9de580847d925365c3
Author: Mark Thomas
AuthorDate: Wed May 8 08:36:43 2024 +0100
Make counting of active streams more robust
---
.../coyote/http2/Http2AsyncUpgradeHandler.java | 2 +-
.../org/apache/coyote/http2/Http2UpgradeHandler.java | 20 ++--
java/org/apache/coyote/http2/Stream.java | 16
webapps/docs/changelog.xml | 4
4 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
b/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
index 2d873b049d..ea046d7b6a 100644
--- a/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
@@ -157,7 +157,7 @@ public class Http2AsyncUpgradeHandler extends
Http2UpgradeHandler {
boolean active = state.isActive();
state.sendReset();
if (active) {
-decrementActiveRemoteStreamCount();
+
decrementActiveRemoteStreamCount(getStream(se.getStreamId()));
}
}
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 3e6383ba17..3a87692e2d 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -291,8 +291,8 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
}
-protected void decrementActiveRemoteStreamCount() {
-
setConnectionTimeoutForStreamCount(activeRemoteStreamCount.decrementAndGet());
+protected void decrementActiveRemoteStreamCount(Stream stream) {
+
setConnectionTimeoutForStreamCount(stream.decrementAndGetActiveRemoteStreamCount());
}
@@ -599,7 +599,7 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
boolean active = state.isActive();
state.sendReset();
if (active) {
-decrementActiveRemoteStreamCount();
+
decrementActiveRemoteStreamCount(getStream(se.getStreamId()));
}
}
socketWrapper.write(true, rstFrame, 0, rstFrame.length);
@@ -844,7 +844,7 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
protected void sentEndOfStream(Stream stream) {
stream.sentEndOfStream();
if (!stream.isActive()) {
-decrementActiveRemoteStreamCount();
+decrementActiveRemoteStreamCount(stream);
}
}
@@ -1227,7 +1227,7 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
}
-private Stream getStream(int streamId) {
+Stream getStream(int streamId) {
Integer key = Integer.valueOf(streamId);
AbstractStream result = streams.get(key);
if (result instanceof Stream) {
@@ -1596,6 +1596,7 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
Stream stream = getStream(streamId, false);
if (stream == null) {
stream = createRemoteStream(streamId);
+activeRemoteStreamCount.incrementAndGet();
}
if (streamId < maxActiveRemoteStreamId) {
throw new
ConnectionException(sm.getString("upgradeHandler.stream.old",
Integer.valueOf(streamId),
@@ -1674,9 +1675,8 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
Stream stream = (Stream) abstractNonZeroStream;
if (stream.isActive()) {
if (stream.receivedEndOfHeaders()) {
-
-if (localSettings.getMaxConcurrentStreams() <
activeRemoteStreamCount.incrementAndGet()) {
-decrementActiveRemoteStreamCount();
+if (localSettings.getMaxConcurrentStreams() <
activeRemoteStreamCount.get()) {
+decrementActiveRemoteStreamCount(stream);
// Ignoring maxConcurrentStreams increases the
overhead count
increaseOverheadCount(FrameType.HEADERS);
throw new StreamException(
@@ -1720,7 +1720,7 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
private void receivedEndOfStream(Stream stream) throws ConnectionException
{
stream.receivedEndOfStream();
if (!stream.isActive()) {
-decrementActiveRemoteStr
(tomcat) branch main updated: Make counting of active streams more robust
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 2344a4c0d0 Make counting of active streams more robust
2344a4c0d0 is described below
commit 2344a4c0d03e307ba6b8ab6dc8b894cc8bac63f2
Author: Mark Thomas
AuthorDate: Wed May 8 08:36:43 2024 +0100
Make counting of active streams more robust
---
.../coyote/http2/Http2AsyncUpgradeHandler.java | 2 +-
.../org/apache/coyote/http2/Http2UpgradeHandler.java | 20 ++--
java/org/apache/coyote/http2/Stream.java | 16
webapps/docs/changelog.xml | 4
4 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
b/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
index 14062c98b8..afdb2617a8 100644
--- a/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
@@ -157,7 +157,7 @@ public class Http2AsyncUpgradeHandler extends
Http2UpgradeHandler {
boolean active = state.isActive();
state.sendReset();
if (active) {
-decrementActiveRemoteStreamCount();
+
decrementActiveRemoteStreamCount(getStream(se.getStreamId()));
}
}
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index d656a564ae..db73830d45 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -290,8 +290,8 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
}
-protected void decrementActiveRemoteStreamCount() {
-
setConnectionTimeoutForStreamCount(activeRemoteStreamCount.decrementAndGet());
+protected void decrementActiveRemoteStreamCount(Stream stream) {
+
setConnectionTimeoutForStreamCount(stream.decrementAndGetActiveRemoteStreamCount());
}
@@ -598,7 +598,7 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
boolean active = state.isActive();
state.sendReset();
if (active) {
-decrementActiveRemoteStreamCount();
+
decrementActiveRemoteStreamCount(getStream(se.getStreamId()));
}
}
socketWrapper.write(true, rstFrame, 0, rstFrame.length);
@@ -825,7 +825,7 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
protected void sentEndOfStream(Stream stream) {
stream.sentEndOfStream();
if (!stream.isActive()) {
-decrementActiveRemoteStreamCount();
+decrementActiveRemoteStreamCount(stream);
}
}
@@ -1208,7 +1208,7 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
}
-private Stream getStream(int streamId) {
+Stream getStream(int streamId) {
Integer key = Integer.valueOf(streamId);
AbstractStream result = streams.get(key);
if (result instanceof Stream) {
@@ -1536,6 +1536,7 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
Stream stream = getStream(streamId, false);
if (stream == null) {
stream = createRemoteStream(streamId);
+activeRemoteStreamCount.incrementAndGet();
}
if (streamId < maxActiveRemoteStreamId) {
throw new
ConnectionException(sm.getString("upgradeHandler.stream.old",
Integer.valueOf(streamId),
@@ -1597,9 +1598,8 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
Stream stream = (Stream) abstractNonZeroStream;
if (stream.isActive()) {
if (stream.receivedEndOfHeaders()) {
-
-if (localSettings.getMaxConcurrentStreams() <
activeRemoteStreamCount.incrementAndGet()) {
-decrementActiveRemoteStreamCount();
+if (localSettings.getMaxConcurrentStreams() <
activeRemoteStreamCount.get()) {
+decrementActiveRemoteStreamCount(stream);
// Ignoring maxConcurrentStreams increases the
overhead count
increaseOverheadCount(FrameType.HEADERS);
throw new StreamException(
@@ -1643,7 +1643,7 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
private void receivedEndOfStream(Stream stream) throws ConnectionException
{
stream.receivedEndOfStream();
if (!stream.isActive()) {
-decrementActiveRemoteStreamC
(tomcat) branch 10.1.x updated: Port fix
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 69d2ea3f3d Port fix
69d2ea3f3d is described below
commit 69d2ea3f3df1584b94e60889f120b5df9acea7e7
Author: remm
AuthorDate: Fri Jun 14 11:52:09 2024 +0200
Port fix
---
java/org/apache/catalina/core/OpenSSLLifecycleListener.java | 4
1 file changed, 4 insertions(+)
diff --git a/java/org/apache/catalina/core/OpenSSLLifecycleListener.java
b/java/org/apache/catalina/core/OpenSSLLifecycleListener.java
index e8b42ee855..5b0ea02531 100644
--- a/java/org/apache/catalina/core/OpenSSLLifecycleListener.java
+++ b/java/org/apache/catalina/core/OpenSSLLifecycleListener.java
@@ -20,6 +20,7 @@ package org.apache.catalina.core;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleListener;
+import org.apache.catalina.Server;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
@@ -82,6 +83,9 @@ public class OpenSSLLifecycleListener implements
LifecycleListener {
boolean initError = false;
if (Lifecycle.BEFORE_INIT_EVENT.equals(event.getType())) {
+if (!(event.getLifecycle() instanceof Server)) {
+log.warn(sm.getString("listener.notServer",
event.getLifecycle().getClass().getSimpleName()));
+}
synchronized (lock) {
if (!JreCompat.isJre22Available()) {
log.info(sm.getString("openssllistener.java22"));
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: (tomcat) branch main updated: Restore warning to use only this listener with Server
On 2024/06/14 09:39:23 ma...@apache.org wrote:
> 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 65e0baa525 Restore warning to use only this listener with Server
> 65e0baa525 is described below
>
> commit 65e0baa525f81a585bfb249c5db1ed3c812763f4
> Author: Mark Thomas
> AuthorDate: Fri Jun 14 10:38:48 2024 +0100
>
> Restore warning to use only this listener with Server
> ---
> java/org/apache/catalina/core/AprLifecycleListener.java | 6 ++
> 1 file changed, 6 insertions(+)
>
> diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java
> b/java/org/apache/catalina/core/AprLifecycleListener.java
> index 848eacf647..a06d9672c8 100644
> --- a/java/org/apache/catalina/core/AprLifecycleListener.java
> +++ b/java/org/apache/catalina/core/AprLifecycleListener.java
> @@ -23,6 +23,7 @@ import java.util.List;
> import org.apache.catalina.Lifecycle;
> import org.apache.catalina.LifecycleEvent;
> import org.apache.catalina.LifecycleListener;
> +import org.apache.catalina.Server;
> import org.apache.juli.logging.Log;
> import org.apache.juli.logging.LogFactory;
> import org.apache.tomcat.jni.Library;
> @@ -34,6 +35,8 @@ import org.apache.tomcat.util.res.StringManager;
> /**
> * Implementation of LifecycleListener that will init and and
> destroy APR.
> *
> + * This listener must only be nested within {@link Server} elements.
> + *
> * Only one instance of the APR/Native library may be loaded per JVM.
> Loading multiple instances will trigger a JVM
> * crash - typically when the Connectors are destroyed. This listener
> utilises reference counting to ensure that only
> * one instance of the APR/Native library is loaded at any one time.
> @@ -128,6 +131,9 @@ public class AprLifecycleListener implements
> LifecycleListener {
>
> if (Lifecycle.BEFORE_INIT_EVENT.equals(event.getType())) {
> synchronized (lock) {
> +if (!(event.getLifecycle() instanceof Server)) {
> +log.warn(sm.getString("listener.notServer",
> event.getLifecycle().getClass().getSimpleName()));
> +}
> if (referenceCount++ != 0) {
> // Already loaded (note test is performed before
> reference count is incremented)
> return;
Thank you, Mark. Restore appreciated!
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Port fix
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 550ef0391a Port fix
550ef0391a is described below
commit 550ef0391a1994a4f335db43526f08fa8c32d46a
Author: remm
AuthorDate: Fri Jun 14 11:52:09 2024 +0200
Port fix
---
java/org/apache/catalina/core/OpenSSLLifecycleListener.java | 4
1 file changed, 4 insertions(+)
diff --git a/java/org/apache/catalina/core/OpenSSLLifecycleListener.java
b/java/org/apache/catalina/core/OpenSSLLifecycleListener.java
index e8b42ee855..5b0ea02531 100644
--- a/java/org/apache/catalina/core/OpenSSLLifecycleListener.java
+++ b/java/org/apache/catalina/core/OpenSSLLifecycleListener.java
@@ -20,6 +20,7 @@ package org.apache.catalina.core;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleListener;
+import org.apache.catalina.Server;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
@@ -82,6 +83,9 @@ public class OpenSSLLifecycleListener implements
LifecycleListener {
boolean initError = false;
if (Lifecycle.BEFORE_INIT_EVENT.equals(event.getType())) {
+if (!(event.getLifecycle() instanceof Server)) {
+log.warn(sm.getString("listener.notServer",
event.getLifecycle().getClass().getSimpleName()));
+}
synchronized (lock) {
if (!JreCompat.isJre22Available()) {
log.info(sm.getString("openssllistener.java22"));
-
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: Restore warning to use only this listener with Server
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 53c368b14e Restore warning to use only this listener with Server
53c368b14e is described below
commit 53c368b14e047921ffa1775e9abb253588466bf0
Author: Mark Thomas
AuthorDate: Fri Jun 14 10:38:48 2024 +0100
Restore warning to use only this listener with Server
---
java/org/apache/catalina/core/AprLifecycleListener.java | 6 ++
1 file changed, 6 insertions(+)
diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java
b/java/org/apache/catalina/core/AprLifecycleListener.java
index 112b458f5a..f65c040d07 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -23,6 +23,7 @@ import java.util.List;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleListener;
+import org.apache.catalina.Server;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.jni.Library;
@@ -34,6 +35,8 @@ import org.apache.tomcat.util.res.StringManager;
/**
* Implementation of LifecycleListener that will init and and
destroy APR.
*
+ * This listener must only be nested within {@link Server} elements.
+ *
* Only one instance of the APR/Native library may be loaded per JVM. Loading
multiple instances will trigger a JVM
* crash - typically when the Connectors are destroyed. This listener utilises
reference counting to ensure that only
* one instance of the APR/Native library is loaded at any one time.
@@ -128,6 +131,9 @@ public class AprLifecycleListener implements
LifecycleListener {
if (Lifecycle.BEFORE_INIT_EVENT.equals(event.getType())) {
synchronized (lock) {
+if (!(event.getLifecycle() instanceof Server)) {
+log.warn(sm.getString("listener.notServer",
event.getLifecycle().getClass().getSimpleName()));
+}
if (referenceCount++ != 0) {
// Already loaded (note test is performed before reference
count is incremented)
return;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Restore warning to use only this listener with Server
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 875b515ede Restore warning to use only this listener with Server
875b515ede is described below
commit 875b515ede23324da0bed1ac232beb1feed6e186
Author: Mark Thomas
AuthorDate: Fri Jun 14 10:38:48 2024 +0100
Restore warning to use only this listener with Server
---
java/org/apache/catalina/core/AprLifecycleListener.java | 6 ++
1 file changed, 6 insertions(+)
diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java
b/java/org/apache/catalina/core/AprLifecycleListener.java
index 848eacf647..a06d9672c8 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -23,6 +23,7 @@ import java.util.List;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleListener;
+import org.apache.catalina.Server;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.jni.Library;
@@ -34,6 +35,8 @@ import org.apache.tomcat.util.res.StringManager;
/**
* Implementation of LifecycleListener that will init and and
destroy APR.
*
+ * This listener must only be nested within {@link Server} elements.
+ *
* Only one instance of the APR/Native library may be loaded per JVM. Loading
multiple instances will trigger a JVM
* crash - typically when the Connectors are destroyed. This listener utilises
reference counting to ensure that only
* one instance of the APR/Native library is loaded at any one time.
@@ -128,6 +131,9 @@ public class AprLifecycleListener implements
LifecycleListener {
if (Lifecycle.BEFORE_INIT_EVENT.equals(event.getType())) {
synchronized (lock) {
+if (!(event.getLifecycle() instanceof Server)) {
+log.warn(sm.getString("listener.notServer",
event.getLifecycle().getClass().getSimpleName()));
+}
if (referenceCount++ != 0) {
// Already loaded (note test is performed before reference
count is incremented)
return;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Restore warning to use only this listener with Server
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 65e0baa525 Restore warning to use only this listener with Server
65e0baa525 is described below
commit 65e0baa525f81a585bfb249c5db1ed3c812763f4
Author: Mark Thomas
AuthorDate: Fri Jun 14 10:38:48 2024 +0100
Restore warning to use only this listener with Server
---
java/org/apache/catalina/core/AprLifecycleListener.java | 6 ++
1 file changed, 6 insertions(+)
diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java
b/java/org/apache/catalina/core/AprLifecycleListener.java
index 848eacf647..a06d9672c8 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -23,6 +23,7 @@ import java.util.List;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleListener;
+import org.apache.catalina.Server;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.jni.Library;
@@ -34,6 +35,8 @@ import org.apache.tomcat.util.res.StringManager;
/**
* Implementation of LifecycleListener that will init and and
destroy APR.
*
+ * This listener must only be nested within {@link Server} elements.
+ *
* Only one instance of the APR/Native library may be loaded per JVM. Loading
multiple instances will trigger a JVM
* crash - typically when the Connectors are destroyed. This listener utilises
reference counting to ensure that only
* one instance of the APR/Native library is loaded at any one time.
@@ -128,6 +131,9 @@ public class AprLifecycleListener implements
LifecycleListener {
if (Lifecycle.BEFORE_INIT_EVENT.equals(event.getType())) {
synchronized (lock) {
+if (!(event.getLifecycle() instanceof Server)) {
+log.warn(sm.getString("listener.notServer",
event.getLifecycle().getClass().getSimpleName()));
+}
if (referenceCount++ != 0) {
// Already loaded (note test is performed before reference
count is incremented)
return;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PR] Rename method `getUseVirtualThreads` to `isUseVirtualThreads` [tomcat]
markt-asf commented on PR #734: URL: https://github.com/apache/tomcat/pull/734#issuecomment-2167440923 No, it is a coding style choice. The Tomcat code uses both. Currently about 70% use `isXxx` and 30% use `getXxx`. Personally, I tend to use whichever one feels more natural at the time. `getXxx` feels more natural to me for this case. While users of the standard distribution won't notice this change (`IntrospectionUtils` will take care of it), it will break backwards compatibility for programmatic users. Any change like this needs to retain the old version with a deprecation annotation for at least the current major version before removal. There needs to be a good reason for changing the API and breaking backwards compatibility. I don't see any such reason here. -- 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
Re: [PR] Rename method `getUseVirtualThreads` to `isUseVirtualThreads` [tomcat]
quaff commented on PR #734: URL: https://github.com/apache/tomcat/pull/734#issuecomment-2167411725 > no explanation. I thought it's common sense that boolean property getter should be `is*`. -- 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
Re: [PR] Rename method `getUseVirtualThreads` to `isUseVirtualThreads` [tomcat]
markt-asf commented on PR #734: URL: https://github.com/apache/tomcat/pull/734#issuecomment-2167400050 No prior discussion, no explanation. Therefore close without merging. -- 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
Re: [PR] Rename method `getUseVirtualThreads` to `isUseVirtualThreads` [tomcat]
markt-asf closed pull request #734: Rename method `getUseVirtualThreads` to `isUseVirtualThreads` URL: https://github.com/apache/tomcat/pull/734 -- 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
