[GitHub] [tomcat] markt-asf opened a new pull request, #623: BZ 66513: Enforce one concurrent request per session requirement
markt-asf opened a new pull request, #623: URL: https://github.com/apache/tomcat/pull/623 This is untested. If accepted, this will need some documentation updates. The purpose of this draft is to obtain early feedback on the approach. -- 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: PersistentValve removal ?
On 29/05/2023 08:36, Mark Thomas wrote: On 26/05/2023 09:56, Rémy Maucherat wrote: Hi, After looking at BZ 66513, reading things online, the javadoc with its heavy handed usage warnings, code of PersistentValve and tracing back all the calls in the PersistentManager itself, my conclusion is that the functionality provided by that valve is probably not doable without significant compromises that would likely break most of its usefulness. This seems to be a core design issue basically, or at least this is a far more complex problem than what can be achieved using a quick hack. I'd like to see if we can find an acceptable hack to enforce the no more than one concurrent request per session rule. I have some ideas but need to think them through to find all the edge cases I have missed. As a result, I would be inclined to propose dropping PersistentValve in Tomcat 11, and deprecating it in the other branches. Given bug 66513 it seems that some folks do find it useful. If there is a set of users for which the Valve is useful then I'd prefer to keep it if we can (with clearly documented constraints). If t just isn't possible then removal / deprecation seems reasonable. How about this? https://github.com/apache/tomcat/pull/623 I think this is an approach that could work. It addresses the thread-safety concerns with the first couple of attempts I had at solving this. If folks think that a) I haven't missed any other thread-safety issues and b) enforcing max one request per session is a viable approach then I'm happy to do the work to clean this up (docs, tests, etc.) Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66616] French: Misleading HTTP 401 error description ("La requête nécessite une authentification HTTP.")
https://bz.apache.org/bugzilla/show_bug.cgi?id=66616 Philippe Cloutier changed: What|Removed |Added Resolution|MOVED |--- Status|RESOLVED|REOPENED --- Comment #2 from Philippe Cloutier --- Ah, I never suspected that; thank you very much for that precious piece of information Mark. I reported that in https://www.rfc-editor.org/errata/eid7530 I don't even have an account at POEditor and surely can't fix this myself, but I think French should stick to the English version as much as possible, if only to make it easier to accurately translate from French to another language. Thanks for the information anyway, I might submit a revision if the English version gets fixed. -- 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: PersistentValve removal ?
On Tue, May 30, 2023 at 1:27 PM Mark Thomas wrote: > > On 29/05/2023 08:36, Mark Thomas wrote: > > On 26/05/2023 09:56, Rémy Maucherat wrote: > >> Hi, > >> > >> After looking at BZ 66513, reading things online, the javadoc with its > >> heavy handed usage warnings, code of PersistentValve and tracing back > >> all the calls in the PersistentManager itself, my conclusion is that > >> the functionality provided by that valve is probably not doable > >> without significant compromises that would likely break most of its > >> usefulness. This seems to be a core design issue basically, or at > >> least this is a far more complex problem than what can be achieved > >> using a quick hack. > > > > I'd like to see if we can find an acceptable hack to enforce the no more > > than one concurrent request per session rule. I have some ideas but need > > to think them through to find all the edge cases I have missed. > > > >> As a result, I would be inclined to propose dropping PersistentValve > >> in Tomcat 11, and deprecating it in the other branches. > > > > Given bug 66513 it seems that some folks do find it useful. If there is > > a set of users for which the Valve is useful then I'd prefer to keep it > > if we can (with clearly documented constraints). > > > > If t just isn't possible then removal / deprecation seems reasonable. > > How about this? > > https://github.com/apache/tomcat/pull/623 > > I think this is an approach that could work. It addresses the > thread-safety concerns with the first couple of attempts I had at > solving this. > > If folks think that a) I haven't missed any other thread-safety issues > and b) enforcing max one request per session is a viable approach then > I'm happy to do the work to clean this up (docs, tests, etc.) Ok. I proposed the removal based on "It is intended to be used with non-sticky load-balancers" from the javadoc. I think the clustering and stickness have to be used instead of this valve, to comply with all reasonable concurrency requirements from the container and application in that use case. Basically the BZ can be fixed only if there's one Tomcat. I understand this valve is in use since we got the BZ, but given everything I don't understand how it is useful, I considered users should either stop using it or move to session clustering. Rémy > 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
[GitHub] [tomcat] rmaucher commented on pull request #623: BZ 66513: Enforce one concurrent request per session requirement
rmaucher commented on PR #623: URL: https://github.com/apache/tomcat/pull/623#issuecomment-1568565624 That seems like the better way to do it. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] rmannibucau commented on pull request #623: BZ 66513: Enforce one concurrent request per session requirement
rmannibucau commented on PR #623: URL: https://github.com/apache/tomcat/pull/623#issuecomment-1568571457 * Is there a plan for the map eviction? background thread? * How does it work in a cluster since counter is local, should it be a cluster event? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #623: BZ 66513: Enforce one concurrent request per session requirement
markt-asf commented on PR #623: URL: https://github.com/apache/tomcat/pull/623#issuecomment-1568591682 Map eviction is handled in the finally block. That we can only make this work on a single node is why Rémy is proposing that we remove/deprecate this Valve. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Bump OpenSSL version number.
This is an automated email from the ASF dual-hosted git repository.
schultz 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 f6fe0ddf0b Bump OpenSSL version number.
f6fe0ddf0b is described below
commit f6fe0ddf0bfa2dce1171035b32cc62af82dab5b1
Author: Christopher Schultz
AuthorDate: Tue May 30 11:51:12 2023 -0400
Bump OpenSSL version number.
---
build.properties.default | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.properties.default b/build.properties.default
index 8a11739e02..09621a5b0b 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -140,7 +140,7 @@
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ec
# - Tomcat native library -
tomcat-native.version=2.0.3
-tomcat-native-openssl.version=3.0.8
+tomcat-native-openssl.version=3.0.9
tomcat-native.src.checksum.enabled=true
tomcat-native.src.checksum.algorithm=SHA-512
tomcat-native.src.checksum.value=d80e6b76295bb253eaf6eab4d722f3ba2f683f33a96310838b4c44b99f0b47a49ed9c09bb53ed23698db057ce765e3fcbfcd4ac4b75d2bdbe691f916be3be339
-
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: Bump OpenSSL version number.
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 5dcee5fd4b Bump OpenSSL version number.
5dcee5fd4b is described below
commit 5dcee5fd4b8823a53e6a526476bd459f4be0c650
Author: Christopher Schultz
AuthorDate: Tue May 30 11:51:12 2023 -0400
Bump OpenSSL version number.
---
build.properties.default | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.properties.default b/build.properties.default
index 0e170b2e22..e0ac0c66ec 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -158,7 +158,7 @@
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ec
# - Tomcat native library -
tomcat-native.version=2.0.3
-tomcat-native-openssl.version=3.0.8
+tomcat-native-openssl.version=3.0.9
tomcat-native.src.checksum.enabled=true
tomcat-native.src.checksum.algorithm=SHA-512
tomcat-native.src.checksum.value=d80e6b76295bb253eaf6eab4d722f3ba2f683f33a96310838b4c44b99f0b47a49ed9c09bb53ed23698db057ce765e3fcbfcd4ac4b75d2bdbe691f916be3be339
-
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: Bump OpenSSL version.
This is an automated email from the ASF dual-hosted git repository.
schultz 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 b666cc1a8c Bump OpenSSL version.
b666cc1a8c is described below
commit b666cc1a8cc03dfb213984167e3878bc5af3d4d1
Author: Christopher Schultz
AuthorDate: Tue May 30 11:53:11 2023 -0400
Bump OpenSSL version.
---
build.properties.default | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.properties.default b/build.properties.default
index 765ad173d9..cac84e74ff 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -163,7 +163,7 @@
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ec
# - Tomcat native library -
tomcat-native.version=1.2.36
-tomcat-native-openssl.version=1.1.1t
+tomcat-native-openssl.version=1.1.1u
tomcat-native.src.checksum.enabled=true
tomcat-native.src.checksum.algorithm=SHA-512
tomcat-native.src.checksum.value=ae89a872b8331035e01387665539a0c08096ae1abdb5dc7a25a197650a641ba3637f01437f1bee27b442c1c59c4d2fe2e5679d1595e8c5d121b9b219da2fb094
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Bump OpenSSL version.
This is an automated email from the ASF dual-hosted git repository.
schultz pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new f2fa60d168 Bump OpenSSL version.
f2fa60d168 is described below
commit f2fa60d16846da45df67a419a703c10179700784
Author: Christopher Schultz
AuthorDate: Tue May 30 11:53:11 2023 -0400
Bump OpenSSL version.
---
build.properties.default | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.properties.default b/build.properties.default
index 8874848e4f..ad1a2061fa 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -167,7 +167,7 @@
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ec
# - Tomcat native library -
tomcat-native.version=1.2.36
-tomcat-native-openssl.version=1.1.1t
+tomcat-native-openssl.version=1.1.1u
tomcat-native.src.checksum.enabled=true
tomcat-native.src.checksum.algorithm=SHA-512
tomcat-native.src.checksum.value=ae89a872b8331035e01387665539a0c08096ae1abdb5dc7a25a197650a641ba3637f01437f1bee27b442c1c59c4d2fe2e5679d1595e8c5d121b9b219da2fb094
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Timing for June releases
All, On 5/26/23 13:46, Christopher Schultz wrote: Mark, On 5/24/23 04:28, Mark Thomas wrote: OpenSSL has just announced a security fix release for 30 May. We won't know what the security issues are until then so my tentative plan is to tag and release Native 1.2.x and 2.0.x on 31 May, release Native 1.2.x and 2.0.x relatively quickly, update all Tomcat versions to use the new Native versions and then start the June releases. Thoughts? Sounds good. I can set aside some time on Wednesday morning to roll 10.1.x and 8.5.x as well. Having read the announcement, I don't think there is a particular rush to get the June release out ASAP. We bundle OpenSSL 1.1.1 with official Tomcat releases and the announcement seems to indicate that 1.1.1 is even less affected than usual. -chris - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch main updated: Bump OpenSSL version number.
On 30/05/2023 16:51, schu...@apache.org wrote:
This is an automated email from the ASF dual-hosted git repository.
schultz 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 f6fe0ddf0b Bump OpenSSL version number.
f6fe0ddf0b is described below
commit f6fe0ddf0bfa2dce1171035b32cc62af82dab5b1
Author: Christopher Schultz
AuthorDate: Tue May 30 11:51:12 2023 -0400
Bump OpenSSL version number.
-1. veto. This breaks the build.
The OpenSSL version number is the version that the most recent Tomcat
Native library was built with, not the version we would like to build with.
This veto applies to all back-ports as well.
Mark
---
build.properties.default | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.properties.default b/build.properties.default
index 8a11739e02..09621a5b0b 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -140,7 +140,7 @@
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ec
# - Tomcat native library -
tomcat-native.version=2.0.3
-tomcat-native-openssl.version=3.0.8
+tomcat-native-openssl.version=3.0.9
tomcat-native.src.checksum.enabled=true
tomcat-native.src.checksum.algorithm=SHA-512
tomcat-native.src.checksum.value=d80e6b76295bb253eaf6eab4d722f3ba2f683f33a96310838b4c44b99f0b47a49ed9c09bb53ed23698db057ce765e3fcbfcd4ac4b75d2bdbe691f916be3be339
-
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
Re: PersistentValve removal ?
On 30/05/2023 15:10, Rémy Maucherat wrote: Ok. I proposed the removal based on "It is intended to be used with non-sticky load-balancers" from the javadoc. I think the clustering and stickness have to be used instead of this valve, to comply with all reasonable concurrency requirements from the container and application in that use case. Basically the BZ can be fixed only if there's one Tomcat. I understand this valve is in use since we got the BZ, but given everything I don't understand how it is useful, I considered users should either stop using it or move to session clustering. Ah. Now I see why you were suggesting deprecation. Non-sticky LB implies more than one Tomcat instance. The requirement for no more than one concurrent request per session is something we can enforce on a single Tomcat node (with something like PR #623) but we can't enforce it across multiple nodes. Given we can't enforce it across multiple nodes, there is no point trying to enforce it on a single node. Similarly, PersistentManager isn't going to work well with non-sticky load balancers. We should document that. The question becomes, is there a use case for the following: - multiple nodes - non-sticky LB - PersistentManager - client(s) guarantee of no more than one concurrent request per session The last point can't be enforced by Tomcat and stuff will break if a client breaks the guarantee. If there is a use case, we should keep PersistentValve, document the requirements even more clearly that they are already. If there is no use case, we should remove PersistentValve from Tomcat 11 and deprecate it in earlier versions as per your suggestion. Either way, BZ 66513 gets resolved as WONTFIX (more like can't fix). I can't think of a use case that justifies keeping PersistentValve. BZ 66513 talks about non-sticky LB with containers. I'll ask some follow-up questions to see if there is something we are missing but my sense is that this was always broken but the users using it either never observed breakage or it happened rarely enough it wasn't followed up. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66513] Primary Key Violation using PersistentManager + PersistentValves +
https://bz.apache.org/bugzilla/show_bug.cgi?id=66513 Mark Thomas changed: What|Removed |Added Status|NEW |NEEDINFO --- Comment #9 from Mark Thomas --- This bug is heading towards being resolved as WONTFIX. For a long explanation see https://markmail.org/message/5gtpirnouqfraw6w The short version is that while we can construct a solution to ensure no more than one concurrent request per session on a single Tomcat node, we can't do it across multiple nodes. Given we can't fix the multiple node issue we have to rely on the clients not issuing more than one concurrent request per session. If the clients break that guarantee, stuff will break. Is the PersistenceValve still useful in these circumstances? Re-reading this issue, you mention both using this with containers plus non-sticky load-balancing and with a single node. What is the use case for a single node? Is there any benefit to Tomcat guaranteeing no more than one concurrent request per session for a single node. If so, how and why is that a benefit for your use case? -- 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: Timing for June releases
On 30/05/2023 16:54, Christopher Schultz wrote: All, On 5/26/23 13:46, Christopher Schultz wrote: Mark, On 5/24/23 04:28, Mark Thomas wrote: OpenSSL has just announced a security fix release for 30 May. We won't know what the security issues are until then so my tentative plan is to tag and release Native 1.2.x and 2.0.x on 31 May, release Native 1.2.x and 2.0.x relatively quickly, update all Tomcat versions to use the new Native versions and then start the June releases. Thoughts? Sounds good. I can set aside some time on Wednesday morning to roll 10.1.x and 8.5.x as well. Having read the announcement, I don't think there is a particular rush to get the June release out ASAP. We bundle OpenSSL 1.1.1 with official Tomcat releases and the announcement seems to indicate that 1.1.1 is even less affected than usual. Tomcat Native 2.x binaries (for Windows) are built with OpenSSL 3.0.x Tomcat Native 1.x binaries (for Windows) are built with OpenSSL 1.1.1 It looks like the only risk is if CLIENT-CERT authentication is used and even then with the limits OpenSSL has in place the DoS opportunities are pretty small. I'm leaning towards doing a release any way. I should be able to get it done later today. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch main updated: Bump OpenSSL version number.
Mark,
On 5/30/23 11:55, Mark Thomas wrote:
On 30/05/2023 16:51, schu...@apache.org wrote:
This is an automated email from the ASF dual-hosted git repository.
schultz 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 f6fe0ddf0b Bump OpenSSL version number.
f6fe0ddf0b is described below
commit f6fe0ddf0bfa2dce1171035b32cc62af82dab5b1
Author: Christopher Schultz
AuthorDate: Tue May 30 11:51:12 2023 -0400
Bump OpenSSL version number.
-1. veto. This breaks the build.
Ugh, sorry. I will revert.
The OpenSSL version number is the version that the most recent Tomcat
Native library was built with, not the version we would like to build with.
This veto applies to all back-ports as well.
Sorry about that.
-chris
---
build.properties.default | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.properties.default b/build.properties.default
index 8a11739e02..09621a5b0b 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -140,7 +140,7 @@
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ec
# - Tomcat native library -
tomcat-native.version=2.0.3
-tomcat-native-openssl.version=3.0.8
+tomcat-native-openssl.version=3.0.9
tomcat-native.src.checksum.enabled=true
tomcat-native.src.checksum.algorithm=SHA-512
tomcat-native.src.checksum.value=d80e6b76295bb253eaf6eab4d722f3ba2f683f33a96310838b4c44b99f0b47a49ed9c09bb53ed23698db057ce765e3fcbfcd4ac4b75d2bdbe691f916be3be339
-
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
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Revert "Bump OpenSSL version."
This is an automated email from the ASF dual-hosted git repository.
schultz pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 38de8bce63 Revert "Bump OpenSSL version."
38de8bce63 is described below
commit 38de8bce63598ea33eeefcd0281443778b94cdfd
Author: Christopher Schultz
AuthorDate: Tue May 30 13:15:04 2023 -0400
Revert "Bump OpenSSL version."
This reverts commit f2fa60d16846da45df67a419a703c10179700784.
---
build.properties.default | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.properties.default b/build.properties.default
index ad1a2061fa..8874848e4f 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -167,7 +167,7 @@
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ec
# - Tomcat native library -
tomcat-native.version=1.2.36
-tomcat-native-openssl.version=1.1.1u
+tomcat-native-openssl.version=1.1.1t
tomcat-native.src.checksum.enabled=true
tomcat-native.src.checksum.algorithm=SHA-512
tomcat-native.src.checksum.value=ae89a872b8331035e01387665539a0c08096ae1abdb5dc7a25a197650a641ba3637f01437f1bee27b442c1c59c4d2fe2e5679d1595e8c5d121b9b219da2fb094
-
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: Revert "Bump OpenSSL version."
This is an automated email from the ASF dual-hosted git repository.
schultz 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 554eda4fa7 Revert "Bump OpenSSL version."
554eda4fa7 is described below
commit 554eda4fa7121bf0d17f78b1577b0b34b27aeff6
Author: Christopher Schultz
AuthorDate: Tue May 30 13:15:25 2023 -0400
Revert "Bump OpenSSL version."
This reverts commit b666cc1a8cc03dfb213984167e3878bc5af3d4d1.
---
build.properties.default | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.properties.default b/build.properties.default
index cac84e74ff..765ad173d9 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -163,7 +163,7 @@
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ec
# - Tomcat native library -
tomcat-native.version=1.2.36
-tomcat-native-openssl.version=1.1.1u
+tomcat-native-openssl.version=1.1.1t
tomcat-native.src.checksum.enabled=true
tomcat-native.src.checksum.algorithm=SHA-512
tomcat-native.src.checksum.value=ae89a872b8331035e01387665539a0c08096ae1abdb5dc7a25a197650a641ba3637f01437f1bee27b442c1c59c4d2fe2e5679d1595e8c5d121b9b219da2fb094
-
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: Revert "Bump OpenSSL version number."
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 3442033549 Revert "Bump OpenSSL version number."
3442033549 is described below
commit 3442033549496ae2df4d8b13c1b84f8998b4ffc2
Author: Christopher Schultz
AuthorDate: Tue May 30 13:15:58 2023 -0400
Revert "Bump OpenSSL version number."
This reverts commit 5dcee5fd4b8823a53e6a526476bd459f4be0c650.
---
build.properties.default | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.properties.default b/build.properties.default
index e0ac0c66ec..0e170b2e22 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -158,7 +158,7 @@
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ec
# - Tomcat native library -
tomcat-native.version=2.0.3
-tomcat-native-openssl.version=3.0.9
+tomcat-native-openssl.version=3.0.8
tomcat-native.src.checksum.enabled=true
tomcat-native.src.checksum.algorithm=SHA-512
tomcat-native.src.checksum.value=d80e6b76295bb253eaf6eab4d722f3ba2f683f33a96310838b4c44b99f0b47a49ed9c09bb53ed23698db057ce765e3fcbfcd4ac4b75d2bdbe691f916be3be339
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Revert "Bump OpenSSL version number."
This is an automated email from the ASF dual-hosted git repository.
schultz 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 a25cb7910d Revert "Bump OpenSSL version number."
a25cb7910d is described below
commit a25cb7910d6622e7b4e1507cfbf2600dacf350d3
Author: Christopher Schultz
AuthorDate: Tue May 30 13:16:28 2023 -0400
Revert "Bump OpenSSL version number."
This reverts commit f6fe0ddf0bfa2dce1171035b32cc62af82dab5b1.
---
build.properties.default | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.properties.default b/build.properties.default
index 09621a5b0b..8a11739e02 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -140,7 +140,7 @@
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ec
# - Tomcat native library -
tomcat-native.version=2.0.3
-tomcat-native-openssl.version=3.0.9
+tomcat-native-openssl.version=3.0.8
tomcat-native.src.checksum.enabled=true
tomcat-native.src.checksum.algorithm=SHA-512
tomcat-native.src.checksum.value=d80e6b76295bb253eaf6eab4d722f3ba2f683f33a96310838b4c44b99f0b47a49ed9c09bb53ed23698db057ce765e3fcbfcd4ac4b75d2bdbe691f916be3be339
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Timing for June releases
Mark, On 5/30/23 13:14, Mark Thomas wrote: On 30/05/2023 16:54, Christopher Schultz wrote: All, On 5/26/23 13:46, Christopher Schultz wrote: Mark, On 5/24/23 04:28, Mark Thomas wrote: OpenSSL has just announced a security fix release for 30 May. We won't know what the security issues are until then so my tentative plan is to tag and release Native 1.2.x and 2.0.x on 31 May, release Native 1.2.x and 2.0.x relatively quickly, update all Tomcat versions to use the new Native versions and then start the June releases. Thoughts? Sounds good. I can set aside some time on Wednesday morning to roll 10.1.x and 8.5.x as well. Having read the announcement, I don't think there is a particular rush to get the June release out ASAP. We bundle OpenSSL 1.1.1 with official Tomcat releases and the announcement seems to indicate that 1.1.1 is even less affected than usual. Tomcat Native 2.x binaries (for Windows) are built with OpenSSL 3.0.x Tomcat Native 1.x binaries (for Windows) are built with OpenSSL 1.1.1 It looks like the only risk is if CLIENT-CERT authentication is used and even then with the limits OpenSSL has in place the DoS opportunities are pretty small. I'm leaning towards doing a release any way. I should be able to get it done later today. I think I misread your initial email; you were suggesting going a tcnative release today/tomorrow and then doing the Tomct releases immediately thereafter. +1 to that plan. -chris - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] branch main updated (e021c75da -> c5e886f53)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat-native.git from e021c75da Move script to better location (it is native specific) new f981ef6b6 Bump recommended APR version 1.7.4 new c5e886f53 Bump recommended OPenSSL version to 3.0.9 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: native/download_deps.sh | 4 ++-- native/srclib/VERSIONS| 4 ++-- xdocs/miscellaneous/changelog.xml | 10 ++ 3 files changed, 14 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] 02/02: Bump recommended OPenSSL version to 3.0.9
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat-native.git commit c5e886f53c7ad48d8ce59bf197f02d0d15e215af Author: Mark Thomas AuthorDate: Tue May 30 19:05:25 2023 +0100 Bump recommended OPenSSL version to 3.0.9 --- native/download_deps.sh | 2 +- native/srclib/VERSIONS| 2 +- xdocs/miscellaneous/changelog.xml | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/native/download_deps.sh b/native/download_deps.sh index 22295e9ae..de0d1fad4 100755 --- a/native/download_deps.sh +++ b/native/download_deps.sh @@ -5,7 +5,7 @@ cd $(dirname $0) -SSL=openssl-3.0.8.tar.gz +SSL=openssl-3.0.9.tar.gz APR=apr-1.7.4.tar.gz mkdir -p deps diff --git a/native/srclib/VERSIONS b/native/srclib/VERSIONS index 460c17f75..b5c4cd7c9 100644 --- a/native/srclib/VERSIONS +++ b/native/srclib/VERSIONS @@ -5,7 +5,7 @@ The current minimum versions are: The following version of the libraries are recommended: - APR 1.7.4 or later, http://apr.apache.org -- OpenSSL 3.0.8 or later, http://www.openssl.org +- OpenSSL 3.0.9 or later, http://www.openssl.org Older versions should also work but are not as thoroughly tested by the Tomcat Native team diff --git a/xdocs/miscellaneous/changelog.xml b/xdocs/miscellaneous/changelog.xml index 7c5e49c01..eecc6a271 100644 --- a/xdocs/miscellaneous/changelog.xml +++ b/xdocs/miscellaneous/changelog.xml @@ -36,6 +36,9 @@ Update the recommended minimum version of APR to 1.7.4. (markt) + + Update the recommended minimum version of OpenSSL to 3.0.9. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] 01/02: Bump recommended APR version 1.7.4
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat-native.git commit f981ef6b6c8200571061ee2ded18af2ef3f11b6c Author: Mark Thomas AuthorDate: Tue May 30 19:04:52 2023 +0100 Bump recommended APR version 1.7.4 --- native/download_deps.sh | 2 +- native/srclib/VERSIONS| 2 +- xdocs/miscellaneous/changelog.xml | 7 +++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/native/download_deps.sh b/native/download_deps.sh index e015d81ea..22295e9ae 100755 --- a/native/download_deps.sh +++ b/native/download_deps.sh @@ -6,7 +6,7 @@ cd $(dirname $0) SSL=openssl-3.0.8.tar.gz -APR=apr-1.7.2.tar.gz +APR=apr-1.7.4.tar.gz mkdir -p deps if [ ! -f deps/$SSL ] ; then diff --git a/native/srclib/VERSIONS b/native/srclib/VERSIONS index 372e6826a..460c17f75 100644 --- a/native/srclib/VERSIONS +++ b/native/srclib/VERSIONS @@ -4,7 +4,7 @@ The current minimum versions are: The following version of the libraries are recommended: -- APR 1.7.2 or later, http://apr.apache.org +- APR 1.7.4 or later, http://apr.apache.org - OpenSSL 3.0.8 or later, http://www.openssl.org Older versions should also work but are not as thoroughly tested by the Tomcat diff --git a/xdocs/miscellaneous/changelog.xml b/xdocs/miscellaneous/changelog.xml index d46731e90..7c5e49c01 100644 --- a/xdocs/miscellaneous/changelog.xml +++ b/xdocs/miscellaneous/changelog.xml @@ -31,6 +31,13 @@ branch started from the 1.2.33 tag. + + + + Update the recommended minimum version of APR to 1.7.4. (markt) + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] branch main updated: Increment version for next development cycle
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
The following commit(s) were added to refs/heads/main by this push:
new 130f080b6 Increment version for next development cycle
130f080b6 is described below
commit 130f080b639ebc0a9d32310822f9eb60921a38df
Author: Mark Thomas
AuthorDate: Tue May 30 19:16:55 2023 +0100
Increment version for next development cycle
---
build.properties.default | 2 +-
native/include/tcn_version.h | 2 +-
native/os/win32/libtcnative.rc | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 83251ee0d..5605d48c2 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -18,7 +18,7 @@
# - Version Control Flags -
version.major=2
version.minor=0
-version.build=3
+version.build=4
version.patch=0
version.suffix=-dev
diff --git a/native/include/tcn_version.h b/native/include/tcn_version.h
index 9fcaee1eb..ba76996e9 100644
--- a/native/include/tcn_version.h
+++ b/native/include/tcn_version.h
@@ -63,7 +63,7 @@ extern "C" {
#define TCN_MINOR_VERSION 0
/** patch level */
-#define TCN_PATCH_VERSION 3
+#define TCN_PATCH_VERSION 4
/**
* This symbol is defined for internal, "development" copies of TCN. This
diff --git a/native/os/win32/libtcnative.rc b/native/os/win32/libtcnative.rc
index 117eda330..ecedd7344 100644
--- a/native/os/win32/libtcnative.rc
+++ b/native/os/win32/libtcnative.rc
@@ -19,7 +19,7 @@ LANGUAGE 0x9,0x1
"See the License for the specific language governing " \
"permissions and limitations under the License."
-#define TCN_VERSION "2.0.3"
+#define TCN_VERSION "2.0.4"
1000 ICON "apache.ico"
1001 DIALOGEX 0, 0, 252, 51
@@ -35,8 +35,8 @@ BEGIN
END
1 VERSIONINFO
- FILEVERSION 2,0,3,0
- PRODUCTVERSION 2,0,3,0
+ FILEVERSION 2,0,4,0
+ PRODUCTVERSION 2,0,4,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] tag 2.0.4 created (now d44c44690)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to tag 2.0.4 in repository https://gitbox.apache.org/repos/asf/tomcat-native.git at d44c44690 (commit) This tag includes the following new commits: new d44c44690 Tag 2.0.4 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-native] 01/01: Tag 2.0.4
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to tag 2.0.4
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
commit d44c446902bf5e4bcae7ce0a8dba8447e737710c
Author: Mark Thomas
AuthorDate: Tue May 30 19:18:42 2023 +0100
Tag 2.0.4
---
build.properties.default | 2 +-
native/include/tcn_version.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 5605d48c2..7e6a8b0af 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -20,7 +20,7 @@ version.major=2
version.minor=0
version.build=4
version.patch=0
-version.suffix=-dev
+version.suffix=
# - Default Base Path for Dependent Packages -
# Please note this path must be absolute, not relative,
diff --git a/native/include/tcn_version.h b/native/include/tcn_version.h
index ba76996e9..26a17a281 100644
--- a/native/include/tcn_version.h
+++ b/native/include/tcn_version.h
@@ -69,7 +69,7 @@ extern "C" {
* This symbol is defined for internal, "development" copies of TCN. This
* symbol will be #undef'd for releases.
*/
-#define TCN_IS_DEV_VERSION 1
+#define TCN_IS_DEV_VERSION 0
/** The formatted string of APU's version */
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] tag 2.0.4 deleted (was d44c44690)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to tag 2.0.4 in repository https://gitbox.apache.org/repos/asf/tomcat-native.git *** WARNING: tag 2.0.4 was deleted! *** was d44c44690 Tag 2.0.4 This change permanently discards the following revisions: discard d44c44690 Tag 2.0.4 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] branch main updated: Update Java code to align with Tomcat 11
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
The following commit(s) were added to refs/heads/main by this push:
new f1fb928d1 Update Java code to align with Tomcat 11
f1fb928d1 is described below
commit f1fb928d17e38e3d113551949ea77d694e52c5bc
Author: Mark Thomas
AuthorDate: Tue May 30 19:24:08 2023 +0100
Update Java code to align with Tomcat 11
---
java/org/apache/tomcat/jni/Library.java| 8 +---
java/org/apache/tomcat/jni/SSLContext.java | 4 ++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/tomcat/jni/Library.java
b/java/org/apache/tomcat/jni/Library.java
index f22c32cb8..2fa3b07ec 100644
--- a/java/org/apache/tomcat/jni/Library.java
+++ b/java/org/apache/tomcat/jni/Library.java
@@ -22,6 +22,8 @@ public final class Library {
/* Default library names */
private static final String [] NAMES = {"tcnative-2", "libtcnative-2",
"tcnative-1", "libtcnative-1"};
+/* System property used to define CATALINA_HOME */
+private static final String CATALINA_HOME_PROP = "catalina.home";
/*
* A handle to the unique Library singleton instance.
*/
@@ -30,13 +32,13 @@ public final class Library {
private Library() throws Exception {
boolean loaded = false;
StringBuilder err = new StringBuilder();
-File binLib = new File(System.getProperty("catalina.home"), "bin");
+File binLib = new File(System.getProperty(CATALINA_HOME_PROP), "bin");
for (int i = 0; i < NAMES.length; i++) {
File library = new File(binLib, System.mapLibraryName(NAMES[i]));
try {
System.load(library.getAbsolutePath());
loaded = true;
-} catch (ThreadDeath | VirtualMachineError t) {
+} catch (VirtualMachineError t) {
throw t;
} catch (Throwable t) {
if (library.exists()) {
@@ -59,7 +61,7 @@ public final class Library {
try {
System.loadLibrary(value);
loaded = true;
-} catch (ThreadDeath | VirtualMachineError t) {
+} catch (VirtualMachineError t) {
throw t;
} catch (Throwable t) {
String name = System.mapLibraryName(value);
diff --git a/java/org/apache/tomcat/jni/SSLContext.java
b/java/org/apache/tomcat/jni/SSLContext.java
index b26324f32..730a38ce8 100644
--- a/java/org/apache/tomcat/jni/SSLContext.java
+++ b/java/org/apache/tomcat/jni/SSLContext.java
@@ -360,7 +360,7 @@ public final class SSLContext {
* select an OpenSSL SSLContext based on the host name requested by the
* client.
*/
-public static interface SNICallBack {
+public interface SNICallBack {
/**
* This callback is made during the TLS handshake when the client uses
@@ -373,7 +373,7 @@ public final class SSLContext {
* SSLContext to use for the given host or zero if no
SSLContext
* could be identified
*/
-public long getSslContext(String sniHostName);
+long getSslContext(String sniHostName);
}
/**
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] tag 2.0.4 created (now 2f080011a)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to tag 2.0.4 in repository https://gitbox.apache.org/repos/asf/tomcat-native.git at 2f080011a (commit) This tag includes the following new commits: new 2f080011a Tag 2.0.4 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-native] 01/01: Tag 2.0.4
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to tag 2.0.4
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
commit 2f080011a624527420c202331c0eb4880c7cc035
Author: Mark Thomas
AuthorDate: Tue May 30 19:27:49 2023 +0100
Tag 2.0.4
---
build.properties.default | 2 +-
native/include/tcn_version.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 5605d48c2..7e6a8b0af 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -20,7 +20,7 @@ version.major=2
version.minor=0
version.build=4
version.patch=0
-version.suffix=-dev
+version.suffix=
# - Default Base Path for Dependent Packages -
# Please note this path must be absolute, not relative,
diff --git a/native/include/tcn_version.h b/native/include/tcn_version.h
index ba76996e9..26a17a281 100644
--- a/native/include/tcn_version.h
+++ b/native/include/tcn_version.h
@@ -69,7 +69,7 @@ extern "C" {
* This symbol is defined for internal, "development" copies of TCN. This
* symbol will be #undef'd for releases.
*/
-#define TCN_IS_DEV_VERSION 1
+#define TCN_IS_DEV_VERSION 0
/** The formatted string of APU's version */
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: PersistentValve removal ?
Mark, On 5/30/23 12:46, Mark Thomas wrote: On 30/05/2023 15:10, Rémy Maucherat wrote: Ok. I proposed the removal based on "It is intended to be used with non-sticky load-balancers" from the javadoc. I think the clustering and stickness have to be used instead of this valve, to comply with all reasonable concurrency requirements from the container and application in that use case. Basically the BZ can be fixed only if there's one Tomcat. I understand this valve is in use since we got the BZ, but given everything I don't understand how it is useful, I considered users should either stop using it or move to session clustering. Ah. Now I see why you were suggesting deprecation. Non-sticky LB implies more than one Tomcat instance. The requirement for no more than one concurrent request per session is something we can enforce on a single Tomcat node (with something like PR #623) but we can't enforce it across multiple nodes. Given we can't enforce it across multiple nodes, there is no point trying to enforce it on a single node. +1 Similarly, PersistentManager isn't going to work well with non-sticky load balancers. We should document that. The question becomes, is there a use case for the following: - multiple nodes - non-sticky LB - PersistentManager - client(s) guarantee of no more than one concurrent request per session The last point can't be enforced by Tomcat and stuff will break if a client breaks the guarantee. I think that last point is one that maybe even the client cannot guarantee. If there is a use case, we should keep PersistentValve, document the requirements even more clearly that they are already. If there is no use case, we should remove PersistentValve from Tomcat 11 and deprecate it in earlier versions as per your suggestion. Either way, BZ 66513 gets resolved as WONTFIX (more like can't fix). Part of it we can sort-of fix... a single Tomcat can trip-over itself which is not good. I started working on this in https://github.com/apache/tomcat/pull/596 but I think I will close that PR and instead propose subclasses of the DataSourceStore which use different strategies for "replacing" session data in the database. I think there is still scope for work on BZ 66513. I can't think of a use case that justifies keeping PersistentValve. BZ 66513 talks about non-sticky LB with containers. I'll ask some follow-up questions to see if there is something we are missing but my sense is that this was always broken but the users using it either never observed breakage or it happened rarely enough it wasn't followed up. +1 -chris - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r62240 - in /dev/tomcat/tomcat-connectors/native/2.0.4: ./ binaries/ source/
Author: markt Date: Tue May 30 20:57:46 2023 New Revision: 62240 Log: Upload Tomcat Native 2.0.4 for voting Added: dev/tomcat/tomcat-connectors/native/2.0.4/ dev/tomcat/tomcat-connectors/native/2.0.4/binaries/ dev/tomcat/tomcat-connectors/native/2.0.4/binaries/tomcat-native-2.0.4-openssl-3.0.9-ocsp-win32-bin.zip (with props) dev/tomcat/tomcat-connectors/native/2.0.4/binaries/tomcat-native-2.0.4-openssl-3.0.9-ocsp-win32-bin.zip.asc dev/tomcat/tomcat-connectors/native/2.0.4/binaries/tomcat-native-2.0.4-openssl-3.0.9-ocsp-win32-bin.zip.sha512 dev/tomcat/tomcat-connectors/native/2.0.4/binaries/tomcat-native-2.0.4-openssl-3.0.9-win32-bin.zip (with props) dev/tomcat/tomcat-connectors/native/2.0.4/binaries/tomcat-native-2.0.4-openssl-3.0.9-win32-bin.zip.asc dev/tomcat/tomcat-connectors/native/2.0.4/binaries/tomcat-native-2.0.4-openssl-3.0.9-win32-bin.zip.sha512 dev/tomcat/tomcat-connectors/native/2.0.4/source/ dev/tomcat/tomcat-connectors/native/2.0.4/source/tomcat-native-2.0.4-src.tar.gz (with props) dev/tomcat/tomcat-connectors/native/2.0.4/source/tomcat-native-2.0.4-src.tar.gz.asc dev/tomcat/tomcat-connectors/native/2.0.4/source/tomcat-native-2.0.4-src.tar.gz.sha512 dev/tomcat/tomcat-connectors/native/2.0.4/source/tomcat-native-2.0.4-win32-src.zip (with props) dev/tomcat/tomcat-connectors/native/2.0.4/source/tomcat-native-2.0.4-win32-src.zip.asc dev/tomcat/tomcat-connectors/native/2.0.4/source/tomcat-native-2.0.4-win32-src.zip.sha512 Added: dev/tomcat/tomcat-connectors/native/2.0.4/binaries/tomcat-native-2.0.4-openssl-3.0.9-ocsp-win32-bin.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-connectors/native/2.0.4/binaries/tomcat-native-2.0.4-openssl-3.0.9-ocsp-win32-bin.zip -- svn:executable = * Propchange: dev/tomcat/tomcat-connectors/native/2.0.4/binaries/tomcat-native-2.0.4-openssl-3.0.9-ocsp-win32-bin.zip -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-connectors/native/2.0.4/binaries/tomcat-native-2.0.4-openssl-3.0.9-ocsp-win32-bin.zip.asc == --- dev/tomcat/tomcat-connectors/native/2.0.4/binaries/tomcat-native-2.0.4-openssl-3.0.9-ocsp-win32-bin.zip.asc (added) +++ dev/tomcat/tomcat-connectors/native/2.0.4/binaries/tomcat-native-2.0.4-openssl-3.0.9-ocsp-win32-bin.zip.asc Tue May 30 20:57:46 2023 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - http://gpgtools.org + +iQIzBAABCgAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAmR2YxEACgkQEMAcWi9g +Wed02w//WC25vzH9/KMIlsgIE7BDyvQhdkz8M+csqriRHKoBZ1OJLMk4acve/3Ut +MOCP1Gze2rt581h3ugLTLA42SS47c2WLJDnPAtnVi/U9rTwasMPMKUhfwSpRzxUv +pdMCrw4EBPcu3/bNr0hQu4MZscILZecQd0uUQdBnMbdaXv/nj1ZhMOyQpZRjdquG +thmuq+6N0R8xFucDmtg+KYikvBTxEBtRNDTx7HtYUCt9kSGsSZytzwBNDBbVNjZF +Vq7qdEtvYxnsQfP4ZqMGoqIEop71zzzS3Z4JzeOX0/qHeZD5fPXZMdhXXylCYGlw +F3/yBD2EiWUFHp1ccl275gcjPhKrGNzuj/nUxfQtgrWuOLQl2hO7VuFHU1SkyZBV +GffMZGb7+eInpVHYAr9sB+5u+t8KBfto0ikgtVNTJ1m/XzcbrAkqTYR4Mi6RQh/q +MwclaNOmPkqkB0FOGyW0p9ZqPFSPEDTH7NUeSUZ0sOjHrKb1UbbxurUrDn1JdDCz +W5lhcINVwHnIxtQ8G/wyZ8l8zh6ROQYWvHRwzcyxznKM5DrJF7b8R1h/0qeZ+r1G +53vQTvyTTH/S1HW4eKAObA4g+2OB9gdoaBxP5zXEVDo88B66rrgD6dxvI3r7U/yy +SG8QQGSkbE70UfCd10TihQTmtSNZoKizHUu737a/DfnbodcaYsc= +=E1eg +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-connectors/native/2.0.4/binaries/tomcat-native-2.0.4-openssl-3.0.9-ocsp-win32-bin.zip.sha512 == --- dev/tomcat/tomcat-connectors/native/2.0.4/binaries/tomcat-native-2.0.4-openssl-3.0.9-ocsp-win32-bin.zip.sha512 (added) +++ dev/tomcat/tomcat-connectors/native/2.0.4/binaries/tomcat-native-2.0.4-openssl-3.0.9-ocsp-win32-bin.zip.sha512 Tue May 30 20:57:46 2023 @@ -0,0 +1 @@ +abdae2780648fc8ccfe5da7ff33c0d8a3d25f6b1ff94ea0da9275b43bdcb32541580f6fc25c64f02b7619168a9d94bf424c91b3cf50b4df08229fbc90218fc50 *tomcat-native-2.0.4-openssl-3.0.9-ocsp-win32-bin.zip \ No newline at end of file Added: dev/tomcat/tomcat-connectors/native/2.0.4/binaries/tomcat-native-2.0.4-openssl-3.0.9-win32-bin.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-connectors/native/2.0.4/binaries/tomcat-native-2.0.4-openssl-3.0.9-win32-bin.zip -- svn:executable = * Propchange: dev/tomcat/tomcat-connectors/native/2.0.4/binaries/tomcat-native-2.0.4-openssl-3.0.9-win32-bin.zip -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-connectors/nativ
[VOTE] Release Apache Tomcat Native 2.0.4
The key differences of version 2.0.4 compared to 2.0.3 are: - The windows binaries in this release have been built with OpenSSL 3.0.9 and APR 1.7.4 The 2.0.x branch is primarily intended for use with Tomcat 10.1.x but can be used with earlier versions as long as the APR/native connector is not used. The proposed release artifacts can be found at [1], and the build was done using tag [2]. The Apache Tomcat Native 2.0.4 release is [ ] Stable, go ahead and release [ ] Broken because of ... Thanks, Mark [1] https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/2.0.4 [2] https://gitbox.apache.org/repos/asf?p=tomcat-native.git;a=commit;h=2f080011a624527420c202331c0eb4880c7cc035 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] branch 1.2.x updated: Increment version for next development cycle
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 1.2.x
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
The following commit(s) were added to refs/heads/1.2.x by this push:
new 386398554 Increment version for next development cycle
386398554 is described below
commit 3863985546ba28c8111a1b04e14ce663d44a6afa
Author: Mark Thomas
AuthorDate: Tue May 30 22:05:14 2023 +0100
Increment version for next development cycle
---
build.properties.default | 2 +-
native/include/tcn_version.h | 2 +-
native/os/win32/libtcnative.rc| 6 +++---
xdocs/miscellaneous/changelog.xml | 4
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 39463d665..7ae6524e8 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -18,7 +18,7 @@
# - Version Control Flags -
version.major=1
version.minor=2
-version.build=36
+version.build=37
version.patch=0
version.suffix=-dev
diff --git a/native/include/tcn_version.h b/native/include/tcn_version.h
index 3b0dd02c1..ee3f797a2 100644
--- a/native/include/tcn_version.h
+++ b/native/include/tcn_version.h
@@ -63,7 +63,7 @@ extern "C" {
#define TCN_MINOR_VERSION 2
/** patch level */
-#define TCN_PATCH_VERSION 36
+#define TCN_PATCH_VERSION 37
/**
* This symbol is defined for internal, "development" copies of TCN. This
diff --git a/native/os/win32/libtcnative.rc b/native/os/win32/libtcnative.rc
index 633c0ef72..f8a014282 100644
--- a/native/os/win32/libtcnative.rc
+++ b/native/os/win32/libtcnative.rc
@@ -20,7 +20,7 @@ LANGUAGE 0x9,0x1
"See the License for the specific language governing " \
"permissions and limitations under the License."
-#define TCN_VERSION "1.2.36"
+#define TCN_VERSION "1.2.37"
1000 ICON "apache.ico"
1001 DIALOGEX 0, 0, 252, 51
@@ -36,8 +36,8 @@ BEGIN
END
1 VERSIONINFO
- FILEVERSION 1,2,36,0
- PRODUCTVERSION 1,2,36,0
+ FILEVERSION 1,2,37,0
+ PRODUCTVERSION 1,2,37,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
diff --git a/xdocs/miscellaneous/changelog.xml
b/xdocs/miscellaneous/changelog.xml
index 9f2b85eb0..4cd493c4e 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -30,6 +30,10 @@
This is the Changelog for Tomcat Native 1.2.
+
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] branch 1.2.x updated: Bump the recommended version of APR to 1.7.4
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 1.2.x in repository https://gitbox.apache.org/repos/asf/tomcat-native.git The following commit(s) were added to refs/heads/1.2.x by this push: new c2af7c8ef Bump the recommended version of APR to 1.7.4 c2af7c8ef is described below commit c2af7c8ef8b532f0f47f8a7915763e5334afef28 Author: Mark Thomas AuthorDate: Tue May 30 22:06:21 2023 +0100 Bump the recommended version of APR to 1.7.4 --- native/srclib/VERSIONS| 2 +- xdocs/miscellaneous/changelog.xml | 5 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/native/srclib/VERSIONS b/native/srclib/VERSIONS index 75333036c..a3da0abcb 100644 --- a/native/srclib/VERSIONS +++ b/native/srclib/VERSIONS @@ -4,7 +4,7 @@ The current minimum versions are: The following version of the libraries are recommended: -- APR 1.7.2 or later, http://apr.apache.org +- APR 1.7.4 or later, http://apr.apache.org - OpenSSL 1.1.1t or later, http://www.openssl.org Older versions should also work but are not as thoroughly tested by the Tomcat diff --git a/xdocs/miscellaneous/changelog.xml b/xdocs/miscellaneous/changelog.xml index 4cd493c4e..37cbf302c 100644 --- a/xdocs/miscellaneous/changelog.xml +++ b/xdocs/miscellaneous/changelog.xml @@ -32,8 +32,11 @@ + + Update the recommended minimum version of APR to 1.7.4. (markt) + - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] branch 1.2.x updated: Bump the recommended version of OpenSSL to 1.1.1t
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 1.2.x in repository https://gitbox.apache.org/repos/asf/tomcat-native.git The following commit(s) were added to refs/heads/1.2.x by this push: new 39fce901f Bump the recommended version of OpenSSL to 1.1.1t 39fce901f is described below commit 39fce901f404fd465c89575ba9ae2b52f9b4 Author: Mark Thomas AuthorDate: Tue May 30 22:07:17 2023 +0100 Bump the recommended version of OpenSSL to 1.1.1t --- native/srclib/VERSIONS| 2 +- xdocs/miscellaneous/changelog.xml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/native/srclib/VERSIONS b/native/srclib/VERSIONS index a3da0abcb..1e8ae5333 100644 --- a/native/srclib/VERSIONS +++ b/native/srclib/VERSIONS @@ -5,7 +5,7 @@ The current minimum versions are: The following version of the libraries are recommended: - APR 1.7.4 or later, http://apr.apache.org -- OpenSSL 1.1.1t or later, http://www.openssl.org +- OpenSSL 1.1.1u or later, http://www.openssl.org Older versions should also work but are not as thoroughly tested by the Tomcat Native team diff --git a/xdocs/miscellaneous/changelog.xml b/xdocs/miscellaneous/changelog.xml index 37cbf302c..fc79404ab 100644 --- a/xdocs/miscellaneous/changelog.xml +++ b/xdocs/miscellaneous/changelog.xml @@ -35,6 +35,9 @@ Update the recommended minimum version of APR to 1.7.4. (markt) + + Update the recommended minimum version of OpenSSL to 1.1.1u. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] branch 1.2.x updated: Move script to a better location - it is native specific
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 1.2.x in repository https://gitbox.apache.org/repos/asf/tomcat-native.git The following commit(s) were added to refs/heads/1.2.x by this push: new 362d73dec Move script to a better location - it is native specific 362d73dec is described below commit 362d73deca4cda08a200839d0fb4de00533af750 Author: Mark Thomas AuthorDate: Tue May 30 22:08:25 2023 +0100 Move script to a better location - it is native specific --- download_deps.sh => native/download_deps.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/download_deps.sh b/native/download_deps.sh similarity index 100% rename from download_deps.sh rename to native/download_deps.sh - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] branch 1.2.x updated: Align versions with latest recommendation
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 1.2.x in repository https://gitbox.apache.org/repos/asf/tomcat-native.git The following commit(s) were added to refs/heads/1.2.x by this push: new a2f0192c4 Align versions with latest recommendation a2f0192c4 is described below commit a2f0192c41f54c1eb19283ed0fce1dac963e1f8b Author: Mark Thomas AuthorDate: Tue May 30 22:09:06 2023 +0100 Align versions with latest recommendation --- native/download_deps.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/native/download_deps.sh b/native/download_deps.sh index ca6c46096..941904d85 100755 --- a/native/download_deps.sh +++ b/native/download_deps.sh @@ -5,8 +5,8 @@ cd $(dirname $0) -SSL=openssl-1.1.1o.tar.gz -APR=apr-1.7.0.tar.gz +SSL=openssl-1.1.1u.tar.gz +APR=apr-1.7.4.tar.gz mkdir -p deps if [ ! -f deps/$SSL ] ; then - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] branch 1.2.x updated: Correct minimum APR version
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 1.2.x in repository https://gitbox.apache.org/repos/asf/tomcat-native.git The following commit(s) were added to refs/heads/1.2.x by this push: new 0cd11fcdb Correct minimum APR version 0cd11fcdb is described below commit 0cd11fcdb35114c50e7af2e21527b3f9c5fc993f Author: Mark Thomas AuthorDate: Tue May 30 22:09:56 2023 +0100 Correct minimum APR version --- native/BUILDING | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/native/BUILDING b/native/BUILDING index 7059e8de7..d5a5da0fa 100644 --- a/native/BUILDING +++ b/native/BUILDING @@ -57,7 +57,7 @@ Linux / Unix / OSX (static linking) Note: For the Solaris platform you should use -KPIC instead -fPIC so that the library is compiled with position independent code. -2. Build static version of APR 1.4.0 or later +2. Build static version of APR 1.4.3 or later > ./configure --prefix=~/natives/apr > make - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] branch 1.2.x updated: Update Java code to align with Tomcat 9.0.x
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 1.2.x
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
The following commit(s) were added to refs/heads/1.2.x by this push:
new d058d92af Update Java code to align with Tomcat 9.0.x
d058d92af is described below
commit d058d92afe47629a0ee722a20da882de01d34a29
Author: Mark Thomas
AuthorDate: Tue May 30 22:25:54 2023 +0100
Update Java code to align with Tomcat 9.0.x
---
java/org/apache/tomcat/jni/BIOCallback.java | 8
java/org/apache/tomcat/jni/Library.java | 4 +++-
java/org/apache/tomcat/jni/PasswordCallback.java | 2 +-
java/org/apache/tomcat/jni/PoolCallback.java | 2 +-
java/org/apache/tomcat/jni/ProcErrorCallback.java | 2 +-
java/org/apache/tomcat/jni/SSLContext.java| 4 ++--
6 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/java/org/apache/tomcat/jni/BIOCallback.java
b/java/org/apache/tomcat/jni/BIOCallback.java
index 24736da84..b98dd949b 100644
--- a/java/org/apache/tomcat/jni/BIOCallback.java
+++ b/java/org/apache/tomcat/jni/BIOCallback.java
@@ -31,27 +31,27 @@ public interface BIOCallback {
* @param buf containing the bytes to write.
* @return Number of characters written.
*/
-public int write(byte [] buf);
+int write(byte [] buf);
/**
* Read data
* @param buf buffer to store the read bytes.
* @return number of bytes read.
*/
-public int read(byte [] buf);
+int read(byte [] buf);
/**
* Puts string
* @param data String to write
* @return Number of characters written
*/
-public int puts(String data);
+int puts(String data);
/**
* Read string up to the len or CLRLF
* @param len Maximum number of characters to read
* @return String with up to len bytes read
*/
-public String gets(int len);
+String gets(int len);
}
diff --git a/java/org/apache/tomcat/jni/Library.java
b/java/org/apache/tomcat/jni/Library.java
index cbff50e60..aa350b17d 100644
--- a/java/org/apache/tomcat/jni/Library.java
+++ b/java/org/apache/tomcat/jni/Library.java
@@ -22,6 +22,8 @@ public final class Library {
/* Default library names */
private static final String [] NAMES = {"tcnative-2", "libtcnative-2",
"tcnative-1", "libtcnative-1"};
+/* System property used to define CATALINA_HOME */
+private static final String CATALINA_HOME_PROP = "catalina.home";
/*
* A handle to the unique Library singleton instance.
*/
@@ -30,7 +32,7 @@ public final class Library {
private Library() throws Exception {
boolean loaded = false;
StringBuilder err = new StringBuilder();
-File binLib = new File(System.getProperty("catalina.home"), "bin");
+File binLib = new File(System.getProperty(CATALINA_HOME_PROP), "bin");
for (int i = 0; i < NAMES.length; i++) {
File library = new File(binLib, System.mapLibraryName(NAMES[i]));
try {
diff --git a/java/org/apache/tomcat/jni/PasswordCallback.java
b/java/org/apache/tomcat/jni/PasswordCallback.java
index 77e08073f..fb06867b3 100644
--- a/java/org/apache/tomcat/jni/PasswordCallback.java
+++ b/java/org/apache/tomcat/jni/PasswordCallback.java
@@ -31,5 +31,5 @@ public interface PasswordCallback {
* @param prompt Password prompt
* @return Valid password or null
*/
-public String callback(String prompt);
+String callback(String prompt);
}
diff --git a/java/org/apache/tomcat/jni/PoolCallback.java
b/java/org/apache/tomcat/jni/PoolCallback.java
index 1e75c9200..95b426146 100644
--- a/java/org/apache/tomcat/jni/PoolCallback.java
+++ b/java/org/apache/tomcat/jni/PoolCallback.java
@@ -33,5 +33,5 @@ public interface PoolCallback {
* Called when the pool is destroyed or cleared
* @return Function must return APR_SUCCESS
*/
-public int callback();
+int callback();
}
diff --git a/java/org/apache/tomcat/jni/ProcErrorCallback.java
b/java/org/apache/tomcat/jni/ProcErrorCallback.java
index 692e7c7c2..0ecc84254 100644
--- a/java/org/apache/tomcat/jni/ProcErrorCallback.java
+++ b/java/org/apache/tomcat/jni/ProcErrorCallback.java
@@ -38,5 +38,5 @@ public interface ProcErrorCallback {
* @param err APR error code describing the error
* @param description Text description of type of processing which failed
*/
-public void callback(long pool, int err, String description);
+void callback(long pool, int err, String description);
}
diff --git a/java/org/apache/tomcat/jni/SSLContext.java
b/java/org/apache/tomcat/jni/SSLContext.java
index cba81b74d..61a819bf7 100644
--- a/java/org/apache/tomcat/jni/SSLContext.java
+++ b/java/org/apache/tomcat/jni/SSLContext.java
@@ -485,7 +485,7 @@ public final class SSLContext {
* select an OpenSSL SSLContext based on the host name requested by the
* client.
*/
-publ
[tomcat-native] tag 1.2.37 created (now 48ece4be7)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to tag 1.2.37 in repository https://gitbox.apache.org/repos/asf/tomcat-native.git at 48ece4be7 (commit) This tag includes the following new commits: new 48ece4be7 Tag 1.2.37 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-native] 01/01: Tag 1.2.37
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to tag 1.2.37
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
commit 48ece4be765f5ff5f553b27bd278079ddb124bb7
Author: Mark Thomas
AuthorDate: Tue May 30 22:28:32 2023 +0100
Tag 1.2.37
---
build.properties.default | 2 +-
native/include/tcn_version.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 7ae6524e8..a312ce240 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -20,7 +20,7 @@ version.major=1
version.minor=2
version.build=37
version.patch=0
-version.suffix=-dev
+version.suffix=
# - Default Base Path for Dependent Packages -
# Please note this path must be absolute, not relative,
diff --git a/native/include/tcn_version.h b/native/include/tcn_version.h
index ee3f797a2..a4d1e06dc 100644
--- a/native/include/tcn_version.h
+++ b/native/include/tcn_version.h
@@ -69,7 +69,7 @@ extern "C" {
* This symbol is defined for internal, "development" copies of TCN. This
* symbol will be #undef'd for releases.
*/
-#define TCN_IS_DEV_VERSION 1
+#define TCN_IS_DEV_VERSION 0
/** The formatted string of APU's version */
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: PersistentValve removal ?
On Tue, May 30, 2023 at 6:46 PM Mark Thomas wrote: > > On 30/05/2023 15:10, Rémy Maucherat wrote: > > > Ok. I proposed the removal based on "It is intended to be used with > > non-sticky load-balancers" from the javadoc. I think the clustering > > and stickness have to be used instead of this valve, to comply with > > all reasonable concurrency requirements from the container and > > application in that use case. Basically the BZ can be fixed only if > > there's one Tomcat. I understand this valve is in use since we got the > > BZ, but given everything I don't understand how it is useful, I > > considered users should either stop using it or move to session > > clustering. > > Ah. Now I see why you were suggesting deprecation. > > Non-sticky LB implies more than one Tomcat instance. > > The requirement for no more than one concurrent request per session is > something we can enforce on a single Tomcat node (with something like PR > #623) but we can't enforce it across multiple nodes. > > Given we can't enforce it across multiple nodes, there is no point > trying to enforce it on a single node. > > Similarly, PersistentManager isn't going to work well with non-sticky > load balancers. We should document that. > > The question becomes, is there a use case for the following: > > - multiple nodes > - non-sticky LB > - PersistentManager > - client(s) guarantee of no more than one concurrent request per session > > The last point can't be enforced by Tomcat and stuff will break if a > client breaks the guarantee. > > If there is a use case, we should keep PersistentValve, document the > requirements even more clearly that they are already. > > If there is no use case, we should remove PersistentValve from Tomcat 11 > and deprecate it in earlier versions as per your suggestion. > > Either way, BZ 66513 gets resolved as WONTFIX (more like can't fix). Your fix is better than what I thought was possible, since I only considered a map of lock objects (and good cleanup was a problem). I think your patch should be merged. > I can't think of a use case that justifies keeping PersistentValve. BZ > 66513 talks about non-sticky LB with containers. I'll ask some follow-up > questions to see if there is something we are missing but my sense is > that this was always broken but the users using it either never observed > breakage or it happened rarely enough it wasn't followed up. +1 It sounds reasonable to redocument stating the limitations better, deprecate, then remove in 11. Rémy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r62241 - in /dev/tomcat/tomcat-connectors/native/1.2.37: ./ binaries/ source/
Author: markt Date: Tue May 30 22:20:18 2023 New Revision: 62241 Log: Upload 1.2.37 for voting Added: dev/tomcat/tomcat-connectors/native/1.2.37/ dev/tomcat/tomcat-connectors/native/1.2.37/binaries/ dev/tomcat/tomcat-connectors/native/1.2.37/binaries/tomcat-native-1.2.37-openssl-1.1.1u-ocsp-win32-bin.zip (with props) dev/tomcat/tomcat-connectors/native/1.2.37/binaries/tomcat-native-1.2.37-openssl-1.1.1u-ocsp-win32-bin.zip.asc dev/tomcat/tomcat-connectors/native/1.2.37/binaries/tomcat-native-1.2.37-openssl-1.1.1u-ocsp-win32-bin.zip.sha512 dev/tomcat/tomcat-connectors/native/1.2.37/binaries/tomcat-native-1.2.37-openssl-1.1.1u-win32-bin.zip (with props) dev/tomcat/tomcat-connectors/native/1.2.37/binaries/tomcat-native-1.2.37-openssl-1.1.1u-win32-bin.zip.asc dev/tomcat/tomcat-connectors/native/1.2.37/binaries/tomcat-native-1.2.37-openssl-1.1.1u-win32-bin.zip.sha512 dev/tomcat/tomcat-connectors/native/1.2.37/source/ dev/tomcat/tomcat-connectors/native/1.2.37/source/tomcat-native-1.2.37-src.tar.gz (with props) dev/tomcat/tomcat-connectors/native/1.2.37/source/tomcat-native-1.2.37-src.tar.gz.asc dev/tomcat/tomcat-connectors/native/1.2.37/source/tomcat-native-1.2.37-src.tar.gz.sha512 dev/tomcat/tomcat-connectors/native/1.2.37/source/tomcat-native-1.2.37-win32-src.zip (with props) dev/tomcat/tomcat-connectors/native/1.2.37/source/tomcat-native-1.2.37-win32-src.zip.asc dev/tomcat/tomcat-connectors/native/1.2.37/source/tomcat-native-1.2.37-win32-src.zip.sha512 Added: dev/tomcat/tomcat-connectors/native/1.2.37/binaries/tomcat-native-1.2.37-openssl-1.1.1u-ocsp-win32-bin.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-connectors/native/1.2.37/binaries/tomcat-native-1.2.37-openssl-1.1.1u-ocsp-win32-bin.zip -- svn:executable = * Propchange: dev/tomcat/tomcat-connectors/native/1.2.37/binaries/tomcat-native-1.2.37-openssl-1.1.1u-ocsp-win32-bin.zip -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-connectors/native/1.2.37/binaries/tomcat-native-1.2.37-openssl-1.1.1u-ocsp-win32-bin.zip.asc == --- dev/tomcat/tomcat-connectors/native/1.2.37/binaries/tomcat-native-1.2.37-openssl-1.1.1u-ocsp-win32-bin.zip.asc (added) +++ dev/tomcat/tomcat-connectors/native/1.2.37/binaries/tomcat-native-1.2.37-openssl-1.1.1u-ocsp-win32-bin.zip.asc Tue May 30 22:20:18 2023 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - http://gpgtools.org + +iQIzBAABCgAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAmR2dnEACgkQEMAcWi9g +WecLAA/+OJWYjxQIMdOQ1tnKNY4FTbCYPmZV6vpYFZacktI0G3gfA6ryN09O1gCt +aA+qPLkFsA0DQDJ56kacc9N47JoYBhBhGGYOZWJ1D7zuOekqNMvHG0QIzYSAXGbi +orB9KnrKruJbLOgUT9zZpT97p3pdVi4iGwiTghQ+B2DffE+R015BVIadGuqWVkmw +GJnd42LDYCT/4Tn2KGc7xMVvpD+cTiD3SYtwduFhjKF9Ta6Iy0d3BOeFZgyIIwJ8 +0dU7O6G79qZER1n4W2dBK9iIdOkGTfoPiBMc9dkgscQprzMzNBdWdGcLajxEHvlD +LXfU9LFonnCgJ/XtscgEEx1+7C5UyeoeBa4eExYxHxqIdf13Sy0A9FOa63D1VvKt +ZgYRDhw9Vnt3NCwsaV4cYFgQDS4hCVwbS4bJJErIIkx09jL8h0AJsDhcxzgXabL5 +jM8U0omRUrDnJ4xgIb2cxAsPxMrx1Gnp1hWRSrq2b+qpVckNglJj9xYr1mesfuvL +OSI6rsNfbQaoIXsVP6FgAaNcYGpYKdf3Rms9kw8AF0ilipKj5HRkANdeuah0+fIE +V9mDDKGIF7xoz1gggQ09SpULqA+LSLyBlAMuvjb6mF7xG9Ue4RwG/zY3R3DVPT5X +J4Ly39OiyvS3ieXQoXVIBRCB3sVNGC8NwAHYVf+j7fPxSWChClk= +=h0aB +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-connectors/native/1.2.37/binaries/tomcat-native-1.2.37-openssl-1.1.1u-ocsp-win32-bin.zip.sha512 == --- dev/tomcat/tomcat-connectors/native/1.2.37/binaries/tomcat-native-1.2.37-openssl-1.1.1u-ocsp-win32-bin.zip.sha512 (added) +++ dev/tomcat/tomcat-connectors/native/1.2.37/binaries/tomcat-native-1.2.37-openssl-1.1.1u-ocsp-win32-bin.zip.sha512 Tue May 30 22:20:18 2023 @@ -0,0 +1 @@ +d9b8d83a29f8e4e4833354de9adc23d9ebefa178e4a650caf829530edf5b797be161f0f56bf22b35062dfecd73529848262c428595463ae71d3f5cd332b7770b *tomcat-native-1.2.37-openssl-1.1.1u-ocsp-win32-bin.zip \ No newline at end of file Added: dev/tomcat/tomcat-connectors/native/1.2.37/binaries/tomcat-native-1.2.37-openssl-1.1.1u-win32-bin.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-connectors/native/1.2.37/binaries/tomcat-native-1.2.37-openssl-1.1.1u-win32-bin.zip -- svn:executable = * Propchange: dev/tomcat/tomcat-connectors/native/1.2.37/binaries/tomcat-native-1.2.37-openssl-1.1.1u-win32-bin.zip -- svn:mime-type = applicatio
[VOTE] Release Apache Tomcat Native 1.2.37
Version 1.2.36 includes the following changes compared to 1.2.36 - The windows binaries in this release have been built with OpenSSL 1.1.1u and APR 1.7.4 The proposed release artifacts can be found at [1], and the build was done using tag [2]. The Apache Tomcat Native 1.2.37 release is [ ] Stable, go ahead and release [ ] Broken because of ... Thanks, Mark [1] https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/1.2.37 [2] https://gitbox.apache.org/repos/asf?p=tomcat-native.git;a=commit;h=48ece4be765f5ff5f553b27bd278079ddb124bb7 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66616] French: Misleading HTTP 401 error description ("La requête nécessite une authentification HTTP.")
https://bz.apache.org/bugzilla/show_bug.cgi?id=66616 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|REOPENED|RESOLVED --- Comment #3 from Mark Thomas --- As per the errata discussion, requests are applied to resources (that terminology is used throughout RFC 9110) so the current English text will not be changed. The French and Spanish translations have been removed in POEditor for "http.401.desc" since they do not convey the correct meaning. The English will be used until such time updated translations are provided. Given we have committers who are fluent in French and Spanish that will probably be quite soon. The updated translations will be merged from POEditor shortly before the next set of release tags. -- 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: [VOTE] Release Apache Tomcat Native 1.2.37
On Tue, May 30, 2023 at 3:22 PM Mark Thomas wrote: > Version 1.2.36 includes the following changes compared to 1.2.36 > > - The windows binaries in this release have been built with OpenSSL >1.1.1u and APR 1.7.4 > > The proposed release artifacts can be found at [1], > and the build was done using tag [2]. > > The Apache Tomcat Native 1.2.37 release is > [X] Stable, go ahead and release > [ ] Broken because of ... > +1 APR unit tests passed. Posting here my steps to ensure I've done it correctly: 1. Build Tomcat Native 1.2.37 from source 2. Point `test.apr.loc` to the output directory 3. Make sure that `execute.test.apr` is set to true 4. Run `ant clean test` on the 9.0.x branch (APR tests were removed from the 10.1.x and the main branches?) Igal > > Thanks, > > Mark > > > [1] > > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/1.2.37 > [2] > > https://gitbox.apache.org/repos/asf?p=tomcat-native.git;a=commit;h=48ece4be765f5ff5f553b27bd278079ddb124bb7 > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
Re: [VOTE] Release Apache Tomcat Native 1.2.37
On 31/05/2023 07:23, Igal Sapir wrote: On Tue, May 30, 2023 at 3:22 PM Mark Thomas wrote: Version 1.2.36 includes the following changes compared to 1.2.36 - The windows binaries in this release have been built with OpenSSL 1.1.1u and APR 1.7.4 The proposed release artifacts can be found at [1], and the build was done using tag [2]. The Apache Tomcat Native 1.2.37 release is [X] Stable, go ahead and release [ ] Broken because of ... +1 APR unit tests passed. Posting here my steps to ensure I've done it correctly: 1. Build Tomcat Native 1.2.37 from source 2. Point `test.apr.loc` to the output directory 3. Make sure that `execute.test.apr` is set to true 4. Run `ant clean test` on the 9.0.x branch (APR tests were removed from the 10.1.x and the main branches?) Yes, that is the correct way to test Tomcat Native with the APR connector and it can only be done with 9.0.x and earlier. You can also run the 10.1.x and 11.0.x tests with Tomcat Native 1.2.x but that only tests the OpenSSL replacement for JSSE with NIO and NIO2. 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 Native 2.0.4
Mark, On Tue, May 30, 2023 at 1:58 PM Mark Thomas wrote: > The key differences of version 2.0.4 compared to 2.0.3 are: > > - The windows binaries in this release have been built with OpenSSL >3.0.9 and APR 1.7.4 > > The 2.0.x branch is primarily intended for use with Tomcat 10.1.x but > can be used with earlier versions as long as the APR/native connector is > not used. > > The proposed release artifacts can be found at [1], > and the build was done using tag [2]. > > The Apache Tomcat Native 2.0.4 release is > [ ] Stable, go ahead and release > [ ] Broken because of ... > I get compilation errors, but possibly because I don't have the most recent libs? Running on Ubuntu, the package manager shows the following versions as the most recent: ❯ sudo apt install libapr1-dev libssl-dev Reading package lists... Done Building dependency tree... Done Reading state information... Done libapr1-dev is already the newest version (1.7.0-8ubuntu0.22.04.1). libssl-dev is already the newest version (3.0.2-0ubuntu1.10). 0 upgraded, 0 newly installed, 0 to remove and 8 not upgraded. The compilation output ends with the following: /bin/bash /workspace/build/tomcat/apr-1.7.0/build-1/libtool --silent --mode=link --tag=CC gcc -g -O2 -pthread -DHAVE_CONFIG_ H -DLINUX -D_REENTRANT -D_GNU_SOURCE -g -O2 -DTCNATIVE_LINUX -I./include -I/opt/java/zulu11.54.23-ca-jdk11.0.14-linux_x64/ include -I/opt/java/zulu11.54.23-ca-jdk11.0.14-linux_x64/include/linux -I/workspace/src/openssl/include -I/workspace/build/tom cat/apr-1.7.0/include/apr-1 -version-info 0:4:0-o libtcnative-2.la -rpath /workspace/build/tomcat/tomcat-native/tomcat-na tive-2.0.4/lib src/bb.lo src/error.lo src/jnilib.lo src/pool.lo src/ssl.lo src/sslconf.lo src/sslcontext.lo src/sslutils.lo -L/ workspace/src/openssl/lib -Wl,-rpath,/workspace/src/openssl/lib -lssl -lcrypto /workspace/build/tomcat/apr-1.7.0/lib/libapr-1.l a -luuid -lrt -lcrypt -lpthread -ldl libtool: warning: library '/workspace/build/tomcat/apr-1.7.0/lib/libapr-1.la' was moved. /usr/bin/ld: /workspace/build/tomcat/apr-1.7.0/lib/libapr-1.a(procsup.o): warning: relocation against `stdout@@GLIBC_2.2.5' in read-only section `.text' /usr/bin/ld: /workspace/build/tomcat/apr-1.7.0/lib/libapr-1.a(proc_mutex.o): relocation R_X86_64_PC32 against symbol `apr_proc_ mutex_cleanup' can not be used when making a shared object; recompile with -fPIC /usr/bin/ld: final link failed: bad value collect2: error: ld returned 1 exit status make[1]: *** [Makefile:71: libtcnative-2.la] Error 1 make[1]: Leaving directory '/workspace/src/tomcat/tomcat-native/tomcat-native-2.0.4-src/native' make: *** [/workspace/src/tomcat/tomcat-native/tomcat-native-2.0.4-src/native/build/ rules.mk:118: all-recursive] Error 1 Any thoughts? Igal > > Thanks, > > Mark > > > [1] > > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/2.0.4 > [2] > > https://gitbox.apache.org/repos/asf?p=tomcat-native.git;a=commit;h=2f080011a624527420c202331c0eb4880c7cc035 > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
[tomcat] branch main updated: Add new classes, previewing in Java 21 EA24
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 a789df00fb Add new classes, previewing in Java 21 EA24
a789df00fb is described below
commit a789df00fb82ff8b79db541fe4380b14dfde72a1
Author: Mark Thomas
AuthorDate: Wed May 31 07:45:02 2023 +0100
Add new classes, previewing in Java 21 EA24
---
java/jakarta/el/ImportHandler.java | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/java/jakarta/el/ImportHandler.java
b/java/jakarta/el/ImportHandler.java
index 82c26a867a..c8beaf8ee3 100644
--- a/java/jakarta/el/ImportHandler.java
+++ b/java/jakarta/el/ImportHandler.java
@@ -136,7 +136,7 @@ public class ImportHandler {
standardPackages.put("jakarta.servlet.jsp", servletJspClassNames);
Set javaLangClassNames = new HashSet<>();
-// Based on Java 19 EA26
+// Based on Java 21 EA24
// Interfaces
javaLangClassNames.add("Appendable");
javaLangClassNames.add("AutoCloseable");
@@ -193,6 +193,9 @@ public class ImportHandler {
javaLangClassNames.add("String");
javaLangClassNames.add("StringBuffer");
javaLangClassNames.add("StringBuilder");
+javaLangClassNames.add("StringTemplate");
+javaLangClassNames.add("StringTemplate.Processor");
+javaLangClassNames.add("StringTemplate.Processor.Linkage");
javaLangClassNames.add("System");
javaLangClassNames.add("System.LoggerFinder");
javaLangClassNames.add("Thread");
-
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 new classes, previewing in Java 21 EA24
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 4e746aaefb Add new classes, previewing in Java 21 EA24
4e746aaefb is described below
commit 4e746aaefb9b1402fb7a92008d16ccf88c7f0274
Author: Mark Thomas
AuthorDate: Wed May 31 07:45:02 2023 +0100
Add new classes, previewing in Java 21 EA24
---
java/jakarta/el/ImportHandler.java | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/java/jakarta/el/ImportHandler.java
b/java/jakarta/el/ImportHandler.java
index 537705ee83..d1fca9cf2e 100644
--- a/java/jakarta/el/ImportHandler.java
+++ b/java/jakarta/el/ImportHandler.java
@@ -136,7 +136,7 @@ public class ImportHandler {
standardPackages.put("jakarta.servlet.jsp", servletJspClassNames);
Set javaLangClassNames = new HashSet<>();
-// Based on Java 19 EA26
+// Based on Java 21 EA24
// Interfaces
javaLangClassNames.add("Appendable");
javaLangClassNames.add("AutoCloseable");
@@ -193,6 +193,9 @@ public class ImportHandler {
javaLangClassNames.add("String");
javaLangClassNames.add("StringBuffer");
javaLangClassNames.add("StringBuilder");
+javaLangClassNames.add("StringTemplate");
+javaLangClassNames.add("StringTemplate.Processor");
+javaLangClassNames.add("StringTemplate.Processor.Linkage");
javaLangClassNames.add("System");
javaLangClassNames.add("System.LoggerFinder");
javaLangClassNames.add("Thread");
-
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: Add new classes, previewing in Java 21 EA24
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 e31de8fb90 Add new classes, previewing in Java 21 EA24
e31de8fb90 is described below
commit e31de8fb90cfb0f162c8527c6f69577dcd2c0862
Author: Mark Thomas
AuthorDate: Wed May 31 07:45:02 2023 +0100
Add new classes, previewing in Java 21 EA24
---
java/javax/el/ImportHandler.java | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/java/javax/el/ImportHandler.java b/java/javax/el/ImportHandler.java
index f200c6df32..46ff3c0c18 100644
--- a/java/javax/el/ImportHandler.java
+++ b/java/javax/el/ImportHandler.java
@@ -137,7 +137,7 @@ public class ImportHandler {
standardPackages.put("javax.servlet.jsp", servletJspClassNames);
Set javaLangClassNames = new HashSet<>();
-// Based on Java 19 EA26
+// Based on Java 21 EA24
// Interfaces
javaLangClassNames.add("Appendable");
javaLangClassNames.add("AutoCloseable");
@@ -194,6 +194,9 @@ public class ImportHandler {
javaLangClassNames.add("String");
javaLangClassNames.add("StringBuffer");
javaLangClassNames.add("StringBuilder");
+javaLangClassNames.add("StringTemplate");
+javaLangClassNames.add("StringTemplate.Processor");
+javaLangClassNames.add("StringTemplate.Processor.Linkage");
javaLangClassNames.add("System");
javaLangClassNames.add("System.LoggerFinder");
javaLangClassNames.add("Thread");
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Add new classes, previewing in Java 21 EA24
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 326b48437d Add new classes, previewing in Java 21 EA24
326b48437d is described below
commit 326b48437d15dfdd0b85eb25e4ae415c8f02b80d
Author: Mark Thomas
AuthorDate: Wed May 31 07:45:02 2023 +0100
Add new classes, previewing in Java 21 EA24
---
java/javax/el/ImportHandler.java | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/java/javax/el/ImportHandler.java b/java/javax/el/ImportHandler.java
index dfd8ed5018..497246a27b 100644
--- a/java/javax/el/ImportHandler.java
+++ b/java/javax/el/ImportHandler.java
@@ -136,7 +136,7 @@ public class ImportHandler {
standardPackages.put("javax.servlet.jsp", servletJspClassNames);
Set javaLangClassNames = new HashSet<>();
-// Based on Java 19 EA26
+// Based on Java 21 EA24
// Interfaces
javaLangClassNames.add("Appendable");
javaLangClassNames.add("AutoCloseable");
@@ -193,6 +193,9 @@ public class ImportHandler {
javaLangClassNames.add("String");
javaLangClassNames.add("StringBuffer");
javaLangClassNames.add("StringBuilder");
+javaLangClassNames.add("StringTemplate");
+javaLangClassNames.add("StringTemplate.Processor");
+javaLangClassNames.add("StringTemplate.Processor.Linkage");
javaLangClassNames.add("System");
javaLangClassNames.add("System.LoggerFinder");
javaLangClassNames.add("Thread");
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
