[GitHub] [tomcat] F4ded removed a comment on pull request #484: Change the logic for judging whether a jsp file is outdated
F4ded removed a comment on pull request #484: URL: https://github.com/apache/tomcat/pull/484#issuecomment-1071971332 > I think that the feature that this PR tries to remove may protect Tomcat from a DOS attack. > > Consider, that an instance of Apache Tomcat is running in production and has a JSP that fails to compile. Does every request trigger a recompilation, or only one in 4 seconds? How much load does it cause? > > The docs suggest to turn off recompilation of JSPs when running in production, but many people do not bother to change their configuration. So a DOS is a concern. > > If this PR is closed in anticipation of a different fix, I think it may be good to file this as an issue (enhancement request) into Bugzilla. > > Regarding the patch itself, line 451 in Compiler.java: I think that the "jsw.getCompileException() == null" check is cheaper than a "System.currentTimeMillis()" call and thus should come first. I seem to realize the problem with this commit, if a jsp file is modified to have a syntax error, after adding `jsw.getCompileException() == null`, the func `isOutdated` will always return true, so every request will trigger a recompilation, which will take up some resources. There might be a better solution, I will try it later. -- 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] F4ded commented on pull request #484: Change the logic for judging whether a jsp file is outdated
F4ded commented on pull request #484: URL: https://github.com/apache/tomcat/pull/484#issuecomment-1071971332 > I think that the feature that this PR tries to remove may protect Tomcat from a DOS attack. > > Consider, that an instance of Apache Tomcat is running in production and has a JSP that fails to compile. Does every request trigger a recompilation, or only one in 4 seconds? How much load does it cause? > > The docs suggest to turn off recompilation of JSPs when running in production, but many people do not bother to change their configuration. So a DOS is a concern. > > If this PR is closed in anticipation of a different fix, I think it may be good to file this as an issue (enhancement request) into Bugzilla. > > Regarding the patch itself, line 451 in Compiler.java: I think that the "jsw.getCompileException() == null" check is cheaper than a "System.currentTimeMillis()" call and thus should come first. I seem to realize the problem with this commit, if a jsp file is modified to have a syntax error, after adding `jsw.getCompileException() == null`, the func `isOutdated` will always return true, so every request will trigger a recompilation, which will take up some resources. There might be a better solution, I will try it later. -- 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] kkolinko commented on pull request #484: Change the logic for judging whether a jsp file is outdated
kkolinko commented on pull request #484: URL: https://github.com/apache/tomcat/pull/484#issuecomment-1071955873 I think that it is much better to discuss bugs in Bugzilla. So that an issue is discussed in one place. Regardless of how may PRs are there. -- 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] kkolinko commented on pull request #483: Change the logic for judging whether a jsp file is outdated
kkolinko commented on pull request #483: URL: https://github.com/apache/tomcat/pull/483#issuecomment-1071952012 Duplicate of #484 -- 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] kkolinko commented on pull request #484: Change the logic for judging whether a jsp file is outdated
kkolinko commented on pull request #484: URL: https://github.com/apache/tomcat/pull/484#issuecomment-1071948912 I think that the feature that this PR tries to remove may protect Tomcat from a DOS attack. Consider, that an instance of Apache Tomcat is running in production and has a JSP that fails to compile. Does every request trigger a recompilation, or only one in 4 seconds? How much load does it cause? The docs suggest to turn off recompilation of JSPs when running in production, but many people do not bother to change their configuration. So a DOS is a concern. If this PR is closed in anticipation of a different fix, I think it may be good to file this as an issue (enhancement request) into Bugzilla. Regarding the patch itself, line 451 in Compiler.java: I think that the "jsw.getCompileException() == null" check is cheaper than a "System.currentTimeMillis()" call and thus should come first. -- 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] F4ded commented on pull request #484: Change the logic for judging whether a jsp file is outdated
F4ded commented on pull request #484: URL: https://github.com/apache/tomcat/pull/484#issuecomment-1071923602 > I've noticed this behavior in the past and never bothered to track it down to the source. > > I'm having trouble loading the images, though I suspect they don't have much important information in them. I have updated the links to these images, they are available now. -- 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] F4ded removed a comment on pull request #484: Change the logic for judging whether a jsp file is outdated
F4ded removed a comment on pull request #484:
URL: https://github.com/apache/tomcat/pull/484#issuecomment-1071100064
> I would appreciate it if someone who understands the Jasper components of
Tomcat better than I do could please evaluate this patch for correctness. It
looks good to me, but I haven't reproduced the problem and tested the solution.
It seems simple enough that a code-inspection would suffice as a review and
inclusion... if the code is well-understood.
Here are the details.
org.apache.jasper.compiler.Compiler#isOutDated(boolean):
```java
public boolean isOutDated(boolean checkClass) {
if (jsw != null
&& (ctxt.getOptions().getModificationTestInterval() > 0)) {
if (jsw.getLastModificationTest()
+ (ctxt.getOptions().getModificationTestInterval() *
1000) > System
.currentTimeMillis()) {
return false;
}
jsw.setLastModificationTest(System.currentTimeMillis());
}
//...
}
```
- `jsw.getLastModificationTest()` default value is 0
- `ctxt.getOptions().getModificationTestInterval()` default value is 4
After modifying the jsp file, condition `if(jsw.getLast .. >
System.currentTimeMillis())` is false when the jsp file is accessed for the
first time, then `jsw.setLastModificationTest(System.currentTimeMillis())` will
be executed.
So within 4 seconds we access this jsp page again, the condition
`if(jsw.getLast .. > System.currentTimeMillis())` will be true and the
function `isOutdated` will return false:
https://user-images.githubusercontent.com/66620626/158852595-7a68480a-9b17-4a51-bcdd-221c44e15a45.png";>
The statement `try{..}` will not be executed, when the function `compile()`
returns to `JspServletWrapper#service`, the `
compileException` will not be thrown, then function `getServlet()` will
return a servlet which corresponds to the old jsp file, request will be handled
by it, so the we get the response of old jsp file:
https://user-images.githubusercontent.com/66620626/158854495-3ac488c4-6807-4271-9b5c-a9bb1b5bcf7f.png";>
--
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 8.5.x updated: Fix Javadoc warnings that broke the build
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 a790eb4 Fix Javadoc warnings that broke the build
a790eb4 is described below
commit a790eb405192aed0c079bf5da12697d282da3144
Author: Mark Thomas
AuthorDate: Thu Mar 17 19:42:16 2022 +
Fix Javadoc warnings that broke the build
---
java/org/apache/catalina/realm/DigestCredentialHandlerBase.java | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
b/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
index 122adef..0291df0 100644
--- a/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
+++ b/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
@@ -297,8 +297,8 @@ public abstract class DigestCredentialHandlerBase
implements CredentialHandler {
/**
* Implements String equality which always compares all characters in the
* string, without stopping early if any characters do not match.
- *
- * @implNote
+ *
+ * Note:
* This implementation was adapted from {@link MessageDigest#isEqual}
* which we assume is as optimizer-defeating as possible.
*
@@ -347,8 +347,8 @@ public abstract class DigestCredentialHandlerBase
implements CredentialHandler {
/**
* Implements byte-array equality which always compares all bytes in the
* array, without stopping early if any bytes do not match.
- *
- * @implNote
+ *
+ * Note:
* Implementation note: this method delegates to {@link
MessageDigest#isEqual}
* under the assumption that it provides a constant-time comparison of the
* bytes in the arrays. Java 7+ has such an implementation, but neither the
-
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 Javadoc warnings that broke the build
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 c6768c2 Fix Javadoc warnings that broke the build
c6768c2 is described below
commit c6768c2393d2a9d71585816c1ebb14073618c90d
Author: Mark Thomas
AuthorDate: Thu Mar 17 19:42:16 2022 +
Fix Javadoc warnings that broke the build
---
java/org/apache/catalina/realm/DigestCredentialHandlerBase.java | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
b/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
index 122adef..0291df0 100644
--- a/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
+++ b/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
@@ -297,8 +297,8 @@ public abstract class DigestCredentialHandlerBase
implements CredentialHandler {
/**
* Implements String equality which always compares all characters in the
* string, without stopping early if any characters do not match.
- *
- * @implNote
+ *
+ * Note:
* This implementation was adapted from {@link MessageDigest#isEqual}
* which we assume is as optimizer-defeating as possible.
*
@@ -347,8 +347,8 @@ public abstract class DigestCredentialHandlerBase
implements CredentialHandler {
/**
* Implements byte-array equality which always compares all bytes in the
* array, without stopping early if any bytes do not match.
- *
- * @implNote
+ *
+ * Note:
* Implementation note: this method delegates to {@link
MessageDigest#isEqual}
* under the assumption that it provides a constant-time comparison of the
* bytes in the arrays. Java 7+ has such an implementation, but neither the
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Fix Javadoc warnings that broke the build
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new d976d0f Fix Javadoc warnings that broke the build
d976d0f is described below
commit d976d0f4557cb48066b405e342fe17bb137c003f
Author: Mark Thomas
AuthorDate: Thu Mar 17 19:42:16 2022 +
Fix Javadoc warnings that broke the build
---
java/org/apache/catalina/realm/DigestCredentialHandlerBase.java | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
b/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
index 122adef..0291df0 100644
--- a/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
+++ b/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
@@ -297,8 +297,8 @@ public abstract class DigestCredentialHandlerBase
implements CredentialHandler {
/**
* Implements String equality which always compares all characters in the
* string, without stopping early if any characters do not match.
- *
- * @implNote
+ *
+ * Note:
* This implementation was adapted from {@link MessageDigest#isEqual}
* which we assume is as optimizer-defeating as possible.
*
@@ -347,8 +347,8 @@ public abstract class DigestCredentialHandlerBase
implements CredentialHandler {
/**
* Implements byte-array equality which always compares all bytes in the
* array, without stopping early if any bytes do not match.
- *
- * @implNote
+ *
+ * Note:
* Implementation note: this method delegates to {@link
MessageDigest#isEqual}
* under the assumption that it provides a constant-time comparison of the
* bytes in the arrays. Java 7+ has such an implementation, but neither the
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix Javadoc warnings that broke the build
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 d92a812 Fix Javadoc warnings that broke the build
d92a812 is described below
commit d92a812492baa0e510cedf25ca10203303e7bf79
Author: Mark Thomas
AuthorDate: Thu Mar 17 19:42:16 2022 +
Fix Javadoc warnings that broke the build
---
java/org/apache/catalina/realm/DigestCredentialHandlerBase.java | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
b/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
index 122adef..0291df0 100644
--- a/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
+++ b/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
@@ -297,8 +297,8 @@ public abstract class DigestCredentialHandlerBase
implements CredentialHandler {
/**
* Implements String equality which always compares all characters in the
* string, without stopping early if any characters do not match.
- *
- * @implNote
+ *
+ * Note:
* This implementation was adapted from {@link MessageDigest#isEqual}
* which we assume is as optimizer-defeating as possible.
*
@@ -347,8 +347,8 @@ public abstract class DigestCredentialHandlerBase
implements CredentialHandler {
/**
* Implements byte-array equality which always compares all bytes in the
* array, without stopping early if any bytes do not match.
- *
- * @implNote
+ *
+ * Note:
* Implementation note: this method delegates to {@link
MessageDigest#isEqual}
* under the assumption that it provides a constant-time comparison of the
* bytes in the arrays. Java 7+ has such an implementation, but neither the
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] F4ded edited a comment on pull request #484: Change the logic for judging whether a jsp file is outdated
F4ded edited a comment on pull request #484:
URL: https://github.com/apache/tomcat/pull/484#issuecomment-1071100064
> I would appreciate it if someone who understands the Jasper components of
Tomcat better than I do could please evaluate this patch for correctness. It
looks good to me, but I haven't reproduced the problem and tested the solution.
It seems simple enough that a code-inspection would suffice as a review and
inclusion... if the code is well-understood.
Here are the details.
org.apache.jasper.compiler.Compiler#isOutDated(boolean):
```java
public boolean isOutDated(boolean checkClass) {
if (jsw != null
&& (ctxt.getOptions().getModificationTestInterval() > 0)) {
if (jsw.getLastModificationTest()
+ (ctxt.getOptions().getModificationTestInterval() *
1000) > System
.currentTimeMillis()) {
return false;
}
jsw.setLastModificationTest(System.currentTimeMillis());
}
//...
}
```
- `jsw.getLastModificationTest()` default value is 0
- `ctxt.getOptions().getModificationTestInterval()` default value is 4
After modifying the jsp file, condition `if(jsw.getLast .. >
System.currentTimeMillis())` is false when the jsp file is accessed for the
first time, then `jsw.setLastModificationTest(System.currentTimeMillis())` will
be executed.
So within 4 seconds we access this jsp page again, the condition
`if(jsw.getLast .. > System.currentTimeMillis())` will be true and the
function `isOutdated` will return false:
https://user-images.githubusercontent.com/66620626/158852595-7a68480a-9b17-4a51-bcdd-221c44e15a45.png";>
The statement `try{..}` will not be executed, when the function `compile()`
returns to `JspServletWrapper#service`, the `
compileException` will not be thrown, then function `getServlet()` will
return a servlet which corresponds to the old jsp file, request will be handled
by it, so the we get the response of old jsp file:
https://user-images.githubusercontent.com/66620626/158854495-3ac488c4-6807-4271-9b5c-a9bb1b5bcf7f.png";>
--
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] F4ded edited a comment on pull request #484: Change the logic for judging whether a jsp file is outdated
F4ded edited a comment on pull request #484:
URL: https://github.com/apache/tomcat/pull/484#issuecomment-1071100064
> I would appreciate it if someone who understands the Jasper components of
Tomcat better than I do could please evaluate this patch for correctness. It
looks good to me, but I haven't reproduced the problem and tested the solution.
It seems simple enough that a code-inspection would suffice as a review and
inclusion... if the code is well-understood.
Here is the details.
org.apache.jasper.compiler.Compiler#isOutDated(boolean):
```java
public boolean isOutDated(boolean checkClass) {
if (jsw != null
&& (ctxt.getOptions().getModificationTestInterval() > 0)) {
if (jsw.getLastModificationTest()
+ (ctxt.getOptions().getModificationTestInterval() *
1000) > System
.currentTimeMillis()) {
return false;
}
jsw.setLastModificationTest(System.currentTimeMillis());
}
//...
}
```
- `jsw.getLastModificationTest()` default value is 0
- `ctxt.getOptions().getModificationTestInterval()` default value is 4
After modifying the jsp file, condition `if(jsw.getLast .. >
System.currentTimeMillis())` is false when the jsp file is accessed for the
first time, then `jsw.setLastModificationTest(System.currentTimeMillis())` will
be executed.
So within 4 seconds we access this jsp page again, the condition
`if(jsw.getLast .. > System.currentTimeMillis())` will be true and the
function `isOutdated` will return false:
https://user-images.githubusercontent.com/66620626/158852595-7a68480a-9b17-4a51-bcdd-221c44e15a45.png";>
The statement `try{..}` will not be executed, when the function `compile()`
returns to `JspServletWrapper#service`, the `
compileException` will not be thrown, then function `getServlet()` will
return a servlet which corresponds to the old jsp file, request will be handled
by it, so the we get the response of old jsp file:
https://user-images.githubusercontent.com/66620626/158854495-3ac488c4-6807-4271-9b5c-a9bb1b5bcf7f.png";>
--
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] F4ded commented on pull request #484: Change the logic for judging whether a jsp file is outdated
F4ded commented on pull request #484:
URL: https://github.com/apache/tomcat/pull/484#issuecomment-1071100064
>
Here is the details.
org.apache.jasper.compiler.Compiler#isOutDated(boolean):
```java
public boolean isOutDated(boolean checkClass) {
if (jsw != null
&& (ctxt.getOptions().getModificationTestInterval() > 0)) {
if (jsw.getLastModificationTest()
+ (ctxt.getOptions().getModificationTestInterval() *
1000) > System
.currentTimeMillis()) {
return false;
}
jsw.setLastModificationTest(System.currentTimeMillis());
}
//...
}
```
- `jsw.getLastModificationTest()` default value is 0
- `ctxt.getOptions().getModificationTestInterval()` default value is 4
After modifying the jsp file, condition `if(jsw.getLast .. >
System.currentTimeMillis())` is false when the jsp file is accessed for the
first time, then `jsw.setLastModificationTest(System.currentTimeMillis())` will
be executed.
So within 4 seconds we access this jsp page again, the condition
`if(jsw.getLast .. > System.currentTimeMillis())` will be true and the
function `isOutdated` will return false:
https://user-images.githubusercontent.com/66620626/158852595-7a68480a-9b17-4a51-bcdd-221c44e15a45.png";>
The statement `try{..}` will not be executed, when the function `compile()`
returns to `JspServletWrapper#service`, the `
compileException` will not be thrown, then function `getServlet()` will
return a servlet which corresponds to the old jsp file, request will be handled
by it, so the we get the response of old jsp file:
https://user-images.githubusercontent.com/66620626/158854495-3ac488c4-6807-4271-9b5c-a9bb1b5bcf7f.png";>
--
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 Native 1.2.32
On Thu, Mar 17, 2022 at 1:48 AM Mark Thomas wrote: > Version 1.2.32 includes the following changes compared to 1.2.31 > > - Updated recommended minimum OpenSSL to 1.1.1n and build windows >binaries using that version > > - Fix release script so it works with the current git layout > > The proposed release artefacts can be found at [1], > and the build was done using tag [2]. > > The Apache Tomcat Native 1.2.32 release is > [X] Stable, go ahead and release > [ ] Broken because of ... > Built from source and passed APR unit tests on Ubuntu 20.04 with Java 11 Igal > > Thanks, > > Mark > > > [1] > > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/1.2.32 > [2] > > https://gitbox.apache.org/repos/asf?p=tomcat-native.git;a=commit;h=ee11afcb5bc3426b85525985461484222f609406 > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
[GitHub] [tomcat] ChristopherSchultz commented on pull request #484: Change the logic for judging whether a jsp file is outdated
ChristopherSchultz commented on pull request #484: URL: https://github.com/apache/tomcat/pull/484#issuecomment-1071039140 I would appreciate it if someone who understands the Jasper components of Tomcat better than I do could please evaluate this patch for correctness. It looks good to me, but I haven't reproduced the problem and tested the solution. It seems simple enough that a code-inspection would suffice as a review and inclusion... if the code is well-understood. -- 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] ChristopherSchultz commented on pull request #484: Change the logic for judging whether a jsp file is outdated
ChristopherSchultz commented on pull request #484: URL: https://github.com/apache/tomcat/pull/484#issuecomment-1071037596 I've noticed this behavior in the past and never bothered to track it down to the source. I'm having trouble loading the images, though I suspect they don't have much important information in them. -- 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 9.0.x updated: Use a constant for the cipher suite
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 31c034f Use a constant for the cipher suite
31c034f is described below
commit 31c034f9d914f70063b8245981ec8086757af4e6
Author: remm
AuthorDate: Thu Mar 17 14:56:44 2022 +0100
Use a constant for the cipher suite
This will allow skipping setting it when it is known to be useless
(example: OpenSSL TLS 1.3, where it is best to leave the impl defaults).
---
java/org/apache/tomcat/util/net/SSLHostConfig.java | 3 ++-
webapps/docs/changelog.xml | 9 +
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/SSLHostConfig.java
b/java/org/apache/tomcat/util/net/SSLHostConfig.java
index 2fed68e..61917d6 100644
--- a/java/org/apache/tomcat/util/net/SSLHostConfig.java
+++ b/java/org/apache/tomcat/util/net/SSLHostConfig.java
@@ -54,6 +54,7 @@ public class SSLHostConfig implements Serializable {
// keys in Maps.
protected static final String DEFAULT_SSL_HOST_NAME = "_default_";
protected static final Set SSL_PROTO_ALL_SET = new HashSet<>();
+public static final String DEFAULT_TLS_CIPHERS =
"HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!kRSA";
static {
/* Default used if protocols are not configured, also used if
@@ -95,7 +96,7 @@ public class SSLHostConfig implements Serializable {
private int certificateVerificationDepth = 10;
// Used to track if certificateVerificationDepth has been explicitly set
private boolean certificateVerificationDepthConfigured = false;
-private String ciphers = "HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!kRSA";
+private String ciphers = DEFAULT_TLS_CIPHERS;
private LinkedHashSet cipherList = null;
private List jsseCipherNames = null;
private boolean honorCipherOrder = false;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f02ee09..ed7f857 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -126,6 +126,15 @@
+
+
+
+Use a constant for the default TLS cipher suite. This will allow
+skipping setting it in some cases (for example, it does not make
+sense for OpenSSL TLS 1.3). (remm)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] F4ded opened a new pull request #484: Change the logic for judging whether a jsp file is outdated
F4ded opened a new pull request #484: URL: https://github.com/apache/tomcat/pull/484 Bug fix: after a jsp file is accessed, modify the jsp file to make it have a syntax error, when you accessing the jsp file again, the response will report a synatx error for the first time, but if it is accessed again within 4s(tomcat default config modificationTestInterval), you will get the reponse of the jsp file before modification. if a jsp file have a syntax error, its JspServletWrapper will carry a compileException which will be throw in jspCompiler.compile(), making theServlet can not reload. if you access the jsp file modified, tomcat will reset the lastModificationTest to the current system time. within 4s, tomcat will judge the jsp file with syntax errors as not outdated, then the request will be handled by the old jsp file's theServlet. -- 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] F4ded closed pull request #483: Change the logic for judging whether a jsp file is outdated
F4ded closed pull request #483: URL: https://github.com/apache/tomcat/pull/483 -- 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] F4ded opened a new pull request #483: Change the logic for judging whether a jsp file is outdated
F4ded opened a new pull request #483: URL: https://github.com/apache/tomcat/pull/483 Bug fix: after a jsp file is accessed, modify the jsp file to make it have a syntax error, when you accessing the jsp file again, the response will report a synatx error for the first time, but if it is accessed again within 4s(tomcat default config `modificationTestInterval`), you will get the reponse of the jsp file before modification. if a jsp file have a syntax error, its `JspServletWrapper` will carry a `compileException` which will be throw in `jspCompiler.compile()`, making `theServlet` can not reload. if you access the jsp file modified, tomcat will reset the `lastModificationTest` to the current system time. within 4s, tomcat will judge the jsp file with syntax errors as not outdated, then the request will be handled by the old jsp file's `theServlet`. before fixing:  after fixing:  -- 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: [tomcat] branch 10.0.x updated: Use a constant for the cipher suite
On 17/03/2022 14:07, Rémy Maucherat wrote:
On Thu, Mar 17, 2022 at 3:01 PM wrote:
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 73bf00c Use a constant for the cipher suite
73bf00c is described below
commit 73bf00ca008b53dae8e95f75a8cdc0dd36c1fe2e
Author: remm
AuthorDate: Thu Mar 17 14:56:44 2022 +0100
Use a constant for the cipher suite
This will allow skipping setting it when it is known to be useless
(example: OpenSSL TLS 1.3, where it is best to leave the impl defaults).
Oops, cherry picking this and pushing gives:
remote: Internal Server Error
To github.com:apache/tomcat.git
! [remote rejected] 9.0.x -> 9.0.x (Internal Server Error)
error: failed to push some refs to 'github.com:apache/tomcat.git'
Strange. Want me to try?
Mark
Sounds scary ...
Rémy
---
java/org/apache/tomcat/util/net/SSLHostConfig.java | 3 ++-
webapps/docs/changelog.xml | 9 +
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/SSLHostConfig.java
b/java/org/apache/tomcat/util/net/SSLHostConfig.java
index 2c1c0c3..af60ecc 100644
--- a/java/org/apache/tomcat/util/net/SSLHostConfig.java
+++ b/java/org/apache/tomcat/util/net/SSLHostConfig.java
@@ -54,6 +54,7 @@ public class SSLHostConfig implements Serializable {
// keys in Maps.
protected static final String DEFAULT_SSL_HOST_NAME = "_default_";
protected static final Set SSL_PROTO_ALL_SET = new HashSet<>();
+public static final String DEFAULT_TLS_CIPHERS =
"HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!kRSA";
static {
/* Default used if protocols are not configured, also used if
@@ -95,7 +96,7 @@ public class SSLHostConfig implements Serializable {
private int certificateVerificationDepth = 10;
// Used to track if certificateVerificationDepth has been explicitly set
private boolean certificateVerificationDepthConfigured = false;
-private String ciphers = "HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!kRSA";
+private String ciphers = DEFAULT_TLS_CIPHERS;
private LinkedHashSet cipherList = null;
private List jsseCipherNames = null;
private boolean honorCipherOrder = false;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 34f2c8f..67f8bcb 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -131,6 +131,15 @@
+
+
+
+Use a constant for the default TLS cipher suite. This will allow
+skipping setting it in some cases (for example, it does not make
+sense for OpenSSL TLS 1.3). (remm)
+
+
+
-
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
Re: [tomcat] branch 10.0.x updated: Use a constant for the cipher suite
On Thu, Mar 17, 2022 at 3:01 PM wrote:
>
> This is an automated email from the ASF dual-hosted git repository.
>
> remm pushed a commit to branch 10.0.x
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>
>
> The following commit(s) were added to refs/heads/10.0.x by this push:
> new 73bf00c Use a constant for the cipher suite
> 73bf00c is described below
>
> commit 73bf00ca008b53dae8e95f75a8cdc0dd36c1fe2e
> Author: remm
> AuthorDate: Thu Mar 17 14:56:44 2022 +0100
>
> Use a constant for the cipher suite
>
> This will allow skipping setting it when it is known to be useless
> (example: OpenSSL TLS 1.3, where it is best to leave the impl defaults).
Oops, cherry picking this and pushing gives:
remote: Internal Server Error
To github.com:apache/tomcat.git
! [remote rejected] 9.0.x -> 9.0.x (Internal Server Error)
error: failed to push some refs to 'github.com:apache/tomcat.git'
Sounds scary ...
Rémy
> ---
> java/org/apache/tomcat/util/net/SSLHostConfig.java | 3 ++-
> webapps/docs/changelog.xml | 9 +
> 2 files changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/java/org/apache/tomcat/util/net/SSLHostConfig.java
> b/java/org/apache/tomcat/util/net/SSLHostConfig.java
> index 2c1c0c3..af60ecc 100644
> --- a/java/org/apache/tomcat/util/net/SSLHostConfig.java
> +++ b/java/org/apache/tomcat/util/net/SSLHostConfig.java
> @@ -54,6 +54,7 @@ public class SSLHostConfig implements Serializable {
> // keys in Maps.
> protected static final String DEFAULT_SSL_HOST_NAME = "_default_";
> protected static final Set SSL_PROTO_ALL_SET = new HashSet<>();
> +public static final String DEFAULT_TLS_CIPHERS =
> "HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!kRSA";
>
> static {
> /* Default used if protocols are not configured, also used if
> @@ -95,7 +96,7 @@ public class SSLHostConfig implements Serializable {
> private int certificateVerificationDepth = 10;
> // Used to track if certificateVerificationDepth has been explicitly set
> private boolean certificateVerificationDepthConfigured = false;
> -private String ciphers =
> "HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!kRSA";
> +private String ciphers = DEFAULT_TLS_CIPHERS;
> private LinkedHashSet cipherList = null;
> private List jsseCipherNames = null;
> private boolean honorCipherOrder = false;
> diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
> index 34f2c8f..67f8bcb 100644
> --- a/webapps/docs/changelog.xml
> +++ b/webapps/docs/changelog.xml
> @@ -131,6 +131,15 @@
>
>
>
> +
> +
> +
> +Use a constant for the default TLS cipher suite. This will allow
> +skipping setting it in some cases (for example, it does not make
> +sense for OpenSSL TLS 1.3). (remm)
> +
> +
> +
>
>
>
>
> -
> 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 10.0.x updated: Use a constant for the cipher suite
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 73bf00c Use a constant for the cipher suite
73bf00c is described below
commit 73bf00ca008b53dae8e95f75a8cdc0dd36c1fe2e
Author: remm
AuthorDate: Thu Mar 17 14:56:44 2022 +0100
Use a constant for the cipher suite
This will allow skipping setting it when it is known to be useless
(example: OpenSSL TLS 1.3, where it is best to leave the impl defaults).
---
java/org/apache/tomcat/util/net/SSLHostConfig.java | 3 ++-
webapps/docs/changelog.xml | 9 +
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/SSLHostConfig.java
b/java/org/apache/tomcat/util/net/SSLHostConfig.java
index 2c1c0c3..af60ecc 100644
--- a/java/org/apache/tomcat/util/net/SSLHostConfig.java
+++ b/java/org/apache/tomcat/util/net/SSLHostConfig.java
@@ -54,6 +54,7 @@ public class SSLHostConfig implements Serializable {
// keys in Maps.
protected static final String DEFAULT_SSL_HOST_NAME = "_default_";
protected static final Set SSL_PROTO_ALL_SET = new HashSet<>();
+public static final String DEFAULT_TLS_CIPHERS =
"HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!kRSA";
static {
/* Default used if protocols are not configured, also used if
@@ -95,7 +96,7 @@ public class SSLHostConfig implements Serializable {
private int certificateVerificationDepth = 10;
// Used to track if certificateVerificationDepth has been explicitly set
private boolean certificateVerificationDepthConfigured = false;
-private String ciphers = "HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!kRSA";
+private String ciphers = DEFAULT_TLS_CIPHERS;
private LinkedHashSet cipherList = null;
private List jsseCipherNames = null;
private boolean honorCipherOrder = false;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 34f2c8f..67f8bcb 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -131,6 +131,15 @@
+
+
+
+Use a constant for the default TLS cipher suite. This will allow
+skipping setting it in some cases (for example, it does not make
+sense for OpenSSL TLS 1.3). (remm)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Use a constant for the cipher suite
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 49b5aac Use a constant for the cipher suite
49b5aac is described below
commit 49b5aac59a5db551383868ccd66f3e5513fe109a
Author: remm
AuthorDate: Thu Mar 17 14:56:44 2022 +0100
Use a constant for the cipher suite
This will allow skipping setting it when it is known to be useless
(example: OpenSSL TLS 1.3, where it is best to leave the impl defaults).
---
java/org/apache/tomcat/util/net/SSLHostConfig.java | 3 ++-
webapps/docs/changelog.xml | 9 +
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/SSLHostConfig.java
b/java/org/apache/tomcat/util/net/SSLHostConfig.java
index 2c1c0c3..af60ecc 100644
--- a/java/org/apache/tomcat/util/net/SSLHostConfig.java
+++ b/java/org/apache/tomcat/util/net/SSLHostConfig.java
@@ -54,6 +54,7 @@ public class SSLHostConfig implements Serializable {
// keys in Maps.
protected static final String DEFAULT_SSL_HOST_NAME = "_default_";
protected static final Set SSL_PROTO_ALL_SET = new HashSet<>();
+public static final String DEFAULT_TLS_CIPHERS =
"HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!kRSA";
static {
/* Default used if protocols are not configured, also used if
@@ -95,7 +96,7 @@ public class SSLHostConfig implements Serializable {
private int certificateVerificationDepth = 10;
// Used to track if certificateVerificationDepth has been explicitly set
private boolean certificateVerificationDepthConfigured = false;
-private String ciphers = "HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!kRSA";
+private String ciphers = DEFAULT_TLS_CIPHERS;
private LinkedHashSet cipherList = null;
private List jsseCipherNames = null;
private boolean honorCipherOrder = false;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 64ff59b..47da205 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -136,6 +136,15 @@
+
+
+
+Use a constant for the default TLS cipher suite. This will allow
+skipping setting it in some cases (for example, it does not make
+sense for OpenSSL TLS 1.3). (remm)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1898990 - in /tomcat/site/trunk/docs: doap_Tomcat.rdf download-80.html whichversion.html
Author: markt Date: Thu Mar 17 13:44:43 2022 New Revision: 1898990 URL: http://svn.apache.org/viewvc?rev=1898990&view=rev Log: Regenerate site docs and update missed files Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf tomcat/site/trunk/docs/download-80.html tomcat/site/trunk/docs/whichversion.html Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1898990&r1=1898989&r2=1898990&view=diff == --- tomcat/site/trunk/docs/doap_Tomcat.rdf (original) +++ tomcat/site/trunk/docs/doap_Tomcat.rdf Thu Mar 17 13:44:43 2022 @@ -74,8 +74,8 @@ Latest Stable 8.5.x Release -2022-02-28 -8.5.76 +2022-03-17 +8.5.77 Modified: tomcat/site/trunk/docs/download-80.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-80.html?rev=1898990&r1=1898989&r2=1898990&view=diff == --- tomcat/site/trunk/docs/download-80.html (original) +++ tomcat/site/trunk/docs/download-80.html Thu Mar 17 13:44:43 2022 @@ -10,7 +10,7 @@ Quick Navigation -[define v]8.5.76[end] +[define v]8.5.77[end] https://downloads.apache.org/tomcat/tomcat-8/KEYS";>KEYS | [v] | Browse | Modified: tomcat/site/trunk/docs/whichversion.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1898990&r1=1898989&r2=1898990&view=diff == --- tomcat/site/trunk/docs/whichversion.html (original) +++ tomcat/site/trunk/docs/whichversion.html Thu Mar 17 13:44:43 2022 @@ -61,7 +61,7 @@ specifications and the respective Ap 1.1 1.1 8.5.x - 8.5.76 + 8.5.77 7 and later - 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: Harden CredentialHandler implementations - constant-time comparisons
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 46827ad Harden CredentialHandler implementations - constant-time
comparisons
46827ad is described below
commit 46827ad4d2ffdb11605e6afd815f325146882851
Author: Mark Thomas
AuthorDate: Thu Mar 17 13:36:20 2022 +
Harden CredentialHandler implementations - constant-time comparisons
Based on a patch proposed by schultz
---
.../realm/DigestCredentialHandlerBase.java | 75 +-
.../realm/MessageDigestCredentialHandler.java | 5 +-
webapps/docs/changelog.xml | 4 ++
3 files changed, 81 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
b/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
index b6a33d5..122adef 100644
--- a/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
+++ b/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
@@ -16,6 +16,7 @@
*/
package org.apache.catalina.realm;
+import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import java.util.Random;
@@ -200,7 +201,7 @@ public abstract class DigestCredentialHandlerBase
implements CredentialHandler {
return false;
}
-return storedHexEncoded.equalsIgnoreCase(inputHexEncoded);
+return DigestCredentialHandlerBase.equals(storedHexEncoded,
inputHexEncoded, true);
}
@@ -292,4 +293,76 @@ public abstract class DigestCredentialHandlerBase
implements CredentialHandler {
* @return the logger for the CredentialHandler instance.
*/
protected abstract Log getLog();
+
+/**
+ * Implements String equality which always compares all characters in the
+ * string, without stopping early if any characters do not match.
+ *
+ * @implNote
+ * This implementation was adapted from {@link MessageDigest#isEqual}
+ * which we assume is as optimizer-defeating as possible.
+ *
+ * @param s1 The first string to compare.
+ * @param s2 The second string to compare.
+ * @param ignoreCase true if the strings should be compared
+ *without regard to case. Note that "true" here is only guaranteed
+ *to work with plain ASCII characters.
+ *
+ * @return true if the strings are equal to each other,
+ * false otherwise.
+ */
+public static boolean equals(final String s1, final String s2, final
boolean ignoreCase) {
+if (s1 == s2) {
+return true;
+}
+if (s1 == null || s2 == null) {
+return false;
+}
+
+final int len1 = s1.length();
+final int len2 = s2.length();
+
+if (len2 == 0) {
+return len1 == 0;
+}
+
+int result = 0;
+result |= len1 - len2;
+
+// time-constant comparison
+for (int i = 0; i < len1; i++) {
+// If i >= len2, index2 is 0; otherwise, i.
+final int index2 = ((i - len2) >>> 31) * i;
+char c1 = s1.charAt(i);
+char c2 = s2.charAt(index2);
+if(ignoreCase) {
+c1 = Character.toLowerCase(c1);
+c2 = Character.toLowerCase(c2);
+}
+result |= c1 ^ c2;
+}
+return result == 0;
+}
+
+/**
+ * Implements byte-array equality which always compares all bytes in the
+ * array, without stopping early if any bytes do not match.
+ *
+ * @implNote
+ * Implementation note: this method delegates to {@link
MessageDigest#isEqual}
+ * under the assumption that it provides a constant-time comparison of the
+ * bytes in the arrays. Java 7+ has such an implementation, but neither the
+ * Javadoc nor any specification requires it. Therefore, Tomcat should
+ * continue to use this method internally in case the JDK
+ * implementation changes so this method can be re-implemented properly.
+ *
+ * @param b1 The first array to compare.
+ * @param b2 The second array to compare.
+ *
+ * @return true if the arrays are equal to each other,
+ * false otherwise.
+ */
+public static boolean equals(final byte[] b1, final byte[] b2) {
+return MessageDigest.isEqual(b1, b2);
+}
}
diff --git a/java/org/apache/catalina/realm/MessageDigestCredentialHandler.java
b/java/org/apache/catalina/realm/MessageDigestCredentialHandler.java
index 616e0e5..d43465c 100644
--- a/java/org/apache/catalina/realm/MessageDigestCredentialHandler.java
+++ b/java/org/apache/catalina/realm/MessageDigestCredentialHandler.java
@@ -100,7 +100,7 @@ public class MessageDigestCredentialHandler extends
DigestCredentialHandlerBase
if (getA
[tomcat] branch 9.0.x updated: Harden CredentialHandler implementations - constant-time comparisons
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 8d47a64 Harden CredentialHandler implementations - constant-time
comparisons
8d47a64 is described below
commit 8d47a6496c3b66819eb75e5a5e95f9360927c653
Author: Mark Thomas
AuthorDate: Thu Mar 17 13:36:20 2022 +
Harden CredentialHandler implementations - constant-time comparisons
Based on a patch proposed by schultz
---
.../realm/DigestCredentialHandlerBase.java | 75 +-
.../realm/MessageDigestCredentialHandler.java | 5 +-
webapps/docs/changelog.xml | 8 +++
3 files changed, 85 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
b/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
index b6a33d5..122adef 100644
--- a/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
+++ b/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
@@ -16,6 +16,7 @@
*/
package org.apache.catalina.realm;
+import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import java.util.Random;
@@ -200,7 +201,7 @@ public abstract class DigestCredentialHandlerBase
implements CredentialHandler {
return false;
}
-return storedHexEncoded.equalsIgnoreCase(inputHexEncoded);
+return DigestCredentialHandlerBase.equals(storedHexEncoded,
inputHexEncoded, true);
}
@@ -292,4 +293,76 @@ public abstract class DigestCredentialHandlerBase
implements CredentialHandler {
* @return the logger for the CredentialHandler instance.
*/
protected abstract Log getLog();
+
+/**
+ * Implements String equality which always compares all characters in the
+ * string, without stopping early if any characters do not match.
+ *
+ * @implNote
+ * This implementation was adapted from {@link MessageDigest#isEqual}
+ * which we assume is as optimizer-defeating as possible.
+ *
+ * @param s1 The first string to compare.
+ * @param s2 The second string to compare.
+ * @param ignoreCase true if the strings should be compared
+ *without regard to case. Note that "true" here is only guaranteed
+ *to work with plain ASCII characters.
+ *
+ * @return true if the strings are equal to each other,
+ * false otherwise.
+ */
+public static boolean equals(final String s1, final String s2, final
boolean ignoreCase) {
+if (s1 == s2) {
+return true;
+}
+if (s1 == null || s2 == null) {
+return false;
+}
+
+final int len1 = s1.length();
+final int len2 = s2.length();
+
+if (len2 == 0) {
+return len1 == 0;
+}
+
+int result = 0;
+result |= len1 - len2;
+
+// time-constant comparison
+for (int i = 0; i < len1; i++) {
+// If i >= len2, index2 is 0; otherwise, i.
+final int index2 = ((i - len2) >>> 31) * i;
+char c1 = s1.charAt(i);
+char c2 = s2.charAt(index2);
+if(ignoreCase) {
+c1 = Character.toLowerCase(c1);
+c2 = Character.toLowerCase(c2);
+}
+result |= c1 ^ c2;
+}
+return result == 0;
+}
+
+/**
+ * Implements byte-array equality which always compares all bytes in the
+ * array, without stopping early if any bytes do not match.
+ *
+ * @implNote
+ * Implementation note: this method delegates to {@link
MessageDigest#isEqual}
+ * under the assumption that it provides a constant-time comparison of the
+ * bytes in the arrays. Java 7+ has such an implementation, but neither the
+ * Javadoc nor any specification requires it. Therefore, Tomcat should
+ * continue to use this method internally in case the JDK
+ * implementation changes so this method can be re-implemented properly.
+ *
+ * @param b1 The first array to compare.
+ * @param b2 The second array to compare.
+ *
+ * @return true if the arrays are equal to each other,
+ * false otherwise.
+ */
+public static boolean equals(final byte[] b1, final byte[] b2) {
+return MessageDigest.isEqual(b1, b2);
+}
}
diff --git a/java/org/apache/catalina/realm/MessageDigestCredentialHandler.java
b/java/org/apache/catalina/realm/MessageDigestCredentialHandler.java
index 616e0e5..d43465c 100644
--- a/java/org/apache/catalina/realm/MessageDigestCredentialHandler.java
+++ b/java/org/apache/catalina/realm/MessageDigestCredentialHandler.java
@@ -100,7 +100,7 @@ public class MessageDigestCredentialHandler extends
DigestCredentialHandlerBase
if (get
[tomcat] branch 10.0.x updated: Harden CredentialHandler implementations - constant-time comparisons
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new f3e0c26 Harden CredentialHandler implementations - constant-time
comparisons
f3e0c26 is described below
commit f3e0c26e23712362c6c9ad0bf39bbc9f33f95e41
Author: Mark Thomas
AuthorDate: Thu Mar 17 13:36:20 2022 +
Harden CredentialHandler implementations - constant-time comparisons
Based on a patch proposed by schultz
---
.../realm/DigestCredentialHandlerBase.java | 75 +-
.../realm/MessageDigestCredentialHandler.java | 5 +-
webapps/docs/changelog.xml | 8 +++
3 files changed, 85 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
b/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
index b6a33d5..122adef 100644
--- a/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
+++ b/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
@@ -16,6 +16,7 @@
*/
package org.apache.catalina.realm;
+import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import java.util.Random;
@@ -200,7 +201,7 @@ public abstract class DigestCredentialHandlerBase
implements CredentialHandler {
return false;
}
-return storedHexEncoded.equalsIgnoreCase(inputHexEncoded);
+return DigestCredentialHandlerBase.equals(storedHexEncoded,
inputHexEncoded, true);
}
@@ -292,4 +293,76 @@ public abstract class DigestCredentialHandlerBase
implements CredentialHandler {
* @return the logger for the CredentialHandler instance.
*/
protected abstract Log getLog();
+
+/**
+ * Implements String equality which always compares all characters in the
+ * string, without stopping early if any characters do not match.
+ *
+ * @implNote
+ * This implementation was adapted from {@link MessageDigest#isEqual}
+ * which we assume is as optimizer-defeating as possible.
+ *
+ * @param s1 The first string to compare.
+ * @param s2 The second string to compare.
+ * @param ignoreCase true if the strings should be compared
+ *without regard to case. Note that "true" here is only guaranteed
+ *to work with plain ASCII characters.
+ *
+ * @return true if the strings are equal to each other,
+ * false otherwise.
+ */
+public static boolean equals(final String s1, final String s2, final
boolean ignoreCase) {
+if (s1 == s2) {
+return true;
+}
+if (s1 == null || s2 == null) {
+return false;
+}
+
+final int len1 = s1.length();
+final int len2 = s2.length();
+
+if (len2 == 0) {
+return len1 == 0;
+}
+
+int result = 0;
+result |= len1 - len2;
+
+// time-constant comparison
+for (int i = 0; i < len1; i++) {
+// If i >= len2, index2 is 0; otherwise, i.
+final int index2 = ((i - len2) >>> 31) * i;
+char c1 = s1.charAt(i);
+char c2 = s2.charAt(index2);
+if(ignoreCase) {
+c1 = Character.toLowerCase(c1);
+c2 = Character.toLowerCase(c2);
+}
+result |= c1 ^ c2;
+}
+return result == 0;
+}
+
+/**
+ * Implements byte-array equality which always compares all bytes in the
+ * array, without stopping early if any bytes do not match.
+ *
+ * @implNote
+ * Implementation note: this method delegates to {@link
MessageDigest#isEqual}
+ * under the assumption that it provides a constant-time comparison of the
+ * bytes in the arrays. Java 7+ has such an implementation, but neither the
+ * Javadoc nor any specification requires it. Therefore, Tomcat should
+ * continue to use this method internally in case the JDK
+ * implementation changes so this method can be re-implemented properly.
+ *
+ * @param b1 The first array to compare.
+ * @param b2 The second array to compare.
+ *
+ * @return true if the arrays are equal to each other,
+ * false otherwise.
+ */
+public static boolean equals(final byte[] b1, final byte[] b2) {
+return MessageDigest.isEqual(b1, b2);
+}
}
diff --git a/java/org/apache/catalina/realm/MessageDigestCredentialHandler.java
b/java/org/apache/catalina/realm/MessageDigestCredentialHandler.java
index 616e0e5..d43465c 100644
--- a/java/org/apache/catalina/realm/MessageDigestCredentialHandler.java
+++ b/java/org/apache/catalina/realm/MessageDigestCredentialHandler.java
@@ -100,7 +100,7 @@ public class MessageDigestCredentialHandler extends
DigestCredentialHandlerBase
if (g
[tomcat] branch main updated: Harden CredentialHandler implementations - constant-time comparisons
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 594ae43 Harden CredentialHandler implementations - constant-time
comparisons
594ae43 is described below
commit 594ae43b1ec6d9caf7dbafe64e665711c6be8673
Author: Mark Thomas
AuthorDate: Thu Mar 17 13:36:20 2022 +
Harden CredentialHandler implementations - constant-time comparisons
Based on a patch proposed by schultz
---
.../realm/DigestCredentialHandlerBase.java | 75 +-
.../realm/MessageDigestCredentialHandler.java | 5 +-
webapps/docs/changelog.xml | 4 ++
3 files changed, 81 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
b/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
index b6a33d5..122adef 100644
--- a/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
+++ b/java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
@@ -16,6 +16,7 @@
*/
package org.apache.catalina.realm;
+import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import java.util.Random;
@@ -200,7 +201,7 @@ public abstract class DigestCredentialHandlerBase
implements CredentialHandler {
return false;
}
-return storedHexEncoded.equalsIgnoreCase(inputHexEncoded);
+return DigestCredentialHandlerBase.equals(storedHexEncoded,
inputHexEncoded, true);
}
@@ -292,4 +293,76 @@ public abstract class DigestCredentialHandlerBase
implements CredentialHandler {
* @return the logger for the CredentialHandler instance.
*/
protected abstract Log getLog();
+
+/**
+ * Implements String equality which always compares all characters in the
+ * string, without stopping early if any characters do not match.
+ *
+ * @implNote
+ * This implementation was adapted from {@link MessageDigest#isEqual}
+ * which we assume is as optimizer-defeating as possible.
+ *
+ * @param s1 The first string to compare.
+ * @param s2 The second string to compare.
+ * @param ignoreCase true if the strings should be compared
+ *without regard to case. Note that "true" here is only guaranteed
+ *to work with plain ASCII characters.
+ *
+ * @return true if the strings are equal to each other,
+ * false otherwise.
+ */
+public static boolean equals(final String s1, final String s2, final
boolean ignoreCase) {
+if (s1 == s2) {
+return true;
+}
+if (s1 == null || s2 == null) {
+return false;
+}
+
+final int len1 = s1.length();
+final int len2 = s2.length();
+
+if (len2 == 0) {
+return len1 == 0;
+}
+
+int result = 0;
+result |= len1 - len2;
+
+// time-constant comparison
+for (int i = 0; i < len1; i++) {
+// If i >= len2, index2 is 0; otherwise, i.
+final int index2 = ((i - len2) >>> 31) * i;
+char c1 = s1.charAt(i);
+char c2 = s2.charAt(index2);
+if(ignoreCase) {
+c1 = Character.toLowerCase(c1);
+c2 = Character.toLowerCase(c2);
+}
+result |= c1 ^ c2;
+}
+return result == 0;
+}
+
+/**
+ * Implements byte-array equality which always compares all bytes in the
+ * array, without stopping early if any bytes do not match.
+ *
+ * @implNote
+ * Implementation note: this method delegates to {@link
MessageDigest#isEqual}
+ * under the assumption that it provides a constant-time comparison of the
+ * bytes in the arrays. Java 7+ has such an implementation, but neither the
+ * Javadoc nor any specification requires it. Therefore, Tomcat should
+ * continue to use this method internally in case the JDK
+ * implementation changes so this method can be re-implemented properly.
+ *
+ * @param b1 The first array to compare.
+ * @param b2 The second array to compare.
+ *
+ * @return true if the arrays are equal to each other,
+ * false otherwise.
+ */
+public static boolean equals(final byte[] b1, final byte[] b2) {
+return MessageDigest.isEqual(b1, b2);
+}
}
diff --git a/java/org/apache/catalina/realm/MessageDigestCredentialHandler.java
b/java/org/apache/catalina/realm/MessageDigestCredentialHandler.java
index 616e0e5..d43465c 100644
--- a/java/org/apache/catalina/realm/MessageDigestCredentialHandler.java
+++ b/java/org/apache/catalina/realm/MessageDigestCredentialHandler.java
@@ -100,7 +100,7 @@ public class MessageDigestCredentialHandler extends
DigestCredentialHandlerBase
if (getAlg
Re: svn commit: r1898989 - in /tomcat/site/trunk: ./ docs/ docs/tomcat-8.5-doc/ docs/tomcat-8.5-doc/annotationapi/ docs/tomcat-8.5-doc/annotationapi/javax/annotation/ docs/tomcat-8.5-doc/annotationapi
чт, 17 мар. 2022 г. в 16:16, : > > Author: schultz > Date: Thu Mar 17 13:15:41 2022 > New Revision: 1898989 > > URL: http://svn.apache.org/viewvc?rev=1898989&view=rev > Log: > Update website to announce 8.5.77 and include documentation. > > > [This commit notification would consist of 67 parts, > which exceeds the limit of 50 ones, so it was shortened to the summary.] Looking at https://svn.apache.org/viewvc?rev=1898989&view=rev tomcat/site/trunk/docs/index.html modified , text changed tomcat/site/trunk/docs/migration-85.html modified , text changed tomcat/site/trunk/docs/oldnews.html besides tomcat-8.5-doc/* files, only the above 3 ones in docs/* were updated. E.g. update to the downloads page has not been committed. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Update release date for 8.5.77.
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 2b120cd Update release date for 8.5.77. 2b120cd is described below commit 2b120cd7b9ae6db68f707808b90504c60370b87b Author: Christopher Schultz AuthorDate: Thu Mar 17 09:22:43 2022 -0400 Update release date for 8.5.77. --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 7b0bbc2..8af1ae0 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -145,7 +145,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1898989 - in /tomcat/site/trunk: ./ docs/ docs/tomcat-8.5-doc/ docs/tomcat-8.5-doc/annotationapi/ docs/tomcat-8.5-doc/annotationapi/javax/annotation/ docs/tomcat-8.5-doc/annotationapi/jav
Author: schultz Date: Thu Mar 17 13:15:41 2022 New Revision: 1898989 URL: http://svn.apache.org/viewvc?rev=1898989&view=rev Log: Update website to announce 8.5.77 and include documentation. [This commit notification would consist of 67 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r53162 - /release/tomcat/tomcat-8/v8.5.76/
Author: schultz Date: Thu Mar 17 13:15:58 2022 New Revision: 53162 Log: Drop old release artifacts. Removed: release/tomcat/tomcat-8/v8.5.76/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[ANN] Apache Tomcat 8.5.77 available
The Apache Tomcat team announces the immediate availability of Apache Tomcat 8.5.77. Apache Tomcat 8 is an open source software implementation of the Java Servlet, JavaServer Pages, Java Unified Expression Language, Java WebSocket and Java Authentication Service Provider Interface for Containers technologies. Apache Tomcat 8.5.77 is a bugfix and feature release. The notable changes compared to 8.5.76 include: - Fix a potential thread-safety issue that could cause HTTP/1.1 request processing to pause, and potentially timeout, waiting for additional data when the full request has been received. - Fix a regression introduced with 65757 bugfix which better identified non request threads but which introduced a similar problem when user code was doing sequential operations in a single thread. - When resolving methods in EL expressions that use beans and/or static fields, ensure that any custom type conversion is considered when identifying the method to call. Along with lots of other bug fixes and improvements. Please refer to the change log for the complete list of changes: http://tomcat.apache.org/tomcat-8.5-doc/changelog.html Downloads: http://tomcat.apache.org/download-80.cgi Migration guides from Apache Tomcat 7.x and 8.0.x: http://tomcat.apache.org/migration.html Enjoy! - The Apache Tomcat team - 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: r53158 - /dev/tomcat/tomcat-8/v8.5.77/ /release/tomcat/tomcat-8/v8.5.77/
Author: schultz Date: Thu Mar 17 12:04:12 2022 New Revision: 53158 Log: Promote release 8.5.77. Added: release/tomcat/tomcat-8/v8.5.77/ - copied from r53157, dev/tomcat/tomcat-8/v8.5.77/ Removed: dev/tomcat/tomcat-8/v8.5.77/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r53155 - in /dev/tomcat/tomcat-connectors/native/1.2.32: ./ binaries/ source/
On 17/03/2022 10:44, Konstantin Kolinko wrote: чт, 17 мар. 2022 г. в 11:45, : Author: markt Date: Thu Mar 17 08:44:59 2022 New Revision: 53155 Log: Upload Tomcat Native 1.2.32 for voting Added: dev/tomcat/tomcat-connectors/native/1.2.32/ dev/tomcat/tomcat-connectors/native/1.2.32/binaries/ dev/tomcat/tomcat-connectors/native/1.2.32/binaries/tomcat-native-1.2.32-openssl-1.1.1n-ocsp-win32-bin.zip (with props) dev/tomcat/tomcat-connectors/native/1.2.32/binaries/tomcat-native-1.2.32-openssl-1.1.1n-ocsp-win32-bin.zip.asc dev/tomcat/tomcat-connectors/native/1.2.32/binaries/tomcat-native-1.2.32-openssl-1.1.1n-ocsp-win32-bin.zip.sha512 dev/tomcat/tomcat-connectors/native/1.2.32/binaries/tomcat-native-1.2.32-openssl-1.1.1n-win32-bin.zip (with props) dev/tomcat/tomcat-connectors/native/1.2.32/binaries/tomcat-native-1.2.32-openssl-1.1.1n-win32-bin.zip.asc dev/tomcat/tomcat-connectors/native/1.2.32/binaries/tomcat-native-1.2.32-openssl-1.1.1n-win32-bin.zip.sha512 dev/tomcat/tomcat-connectors/native/1.2.32/source/ dev/tomcat/tomcat-connectors/native/1.2.32/source/tomcat-native-1.2.32-src.tar.gz (with props) dev/tomcat/tomcat-connectors/native/1.2.32/source/tomcat-native-1.2.32-src.tar.gz.asc dev/tomcat/tomcat-connectors/native/1.2.32/source/tomcat-native-1.2.32-src.tar.gz.sha512 dev/tomcat/tomcat-connectors/native/1.2.32/source/tomcat-native-1.2.32-win32-src.zip (with props) dev/tomcat/tomcat-connectors/native/1.2.32/source/tomcat-native-1.2.32-win32-src.zip.asc dev/tomcat/tomcat-connectors/native/1.2.32/source/tomcat-native-1.2.32-win32-src.zip.sha512 Added: dev/tomcat/tomcat-connectors/native/1.2.32/binaries/tomcat-native-1.2.32-openssl-1.1.1n-ocsp-win32-bin.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-connectors/native/1.2.32/binaries/tomcat-native-1.2.32-openssl-1.1.1n-ocsp-win32-bin.zip -- svn:executable = * [OT] I wonder why *-bin.zip* files in this commit have the "svn:executable" flag set. It does not make sense to me, neither from Unix nor from Windows point of view. They are not *.exe files, nor are they executable shell scripts with a shebang line. A "-src.zip" file does not have this flag, so it is not a *.zip mask (auto-properties setting?) that triggered it. It is a result of how I generated the Windows binaries. They were built on a Windows VM and then copied to a folder shared with the host OS (Linux). When view on the host OS the files had the executable bit set so svn set the executable property. Mark - 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 missing entries
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 9d7757e Add missing entries
9d7757e is described below
commit 9d7757ef3ee7f625a9b7bd4054260e6448ae7d5c
Author: Mark Thomas
AuthorDate: Thu Mar 17 11:06:50 2022 +
Add missing entries
---
java/org/apache/coyote/http2/LocalStrings_de.properties | 3 ++-
java/org/apache/coyote/http2/LocalStrings_fr.properties | 2 ++
java/org/apache/coyote/http2/LocalStrings_ja.properties | 2 ++
java/org/apache/coyote/http2/LocalStrings_ko.properties | 2 ++
4 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/http2/LocalStrings_de.properties
b/java/org/apache/coyote/http2/LocalStrings_de.properties
index d4d6c97..7491438 100644
--- a/java/org/apache/coyote/http2/LocalStrings_de.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_de.properties
@@ -19,6 +19,7 @@ connectionPrefaceParser.mismatch=Es wurde eine unerwartete
Byte Sequenz beim Sta
connectionSettings.debug=Verbindung [{0}], Parameter typ [{1}] gesetzt auf
[{2}]
connectionSettings.headerTableSizeLimit=Verbindung [{0}], versuchte die
Kopfzeilentabellengröße auf [{1}] zu setzen aber die Grenze liegt bei 16k
+connectionSettings.maxFrameSizeInvalid=Verbindung [{0}], die angeforderte
maximale Framegröße von [{1}] ist außerhalb des erlaubten Bereichs von [{2}]
bis [{3}]
hpack.invalidCharacter=Das Unicode Zeichen [{0}] an Code Punkt [{1}] kann
nicht kodiert werden, da es außerhalb des erlaubten Bereiches von 0 bis 255 ist.
@@ -39,4 +40,4 @@ upgradeHandler.socketCloseFailed=Fehler beim Schließen des
Sockets.
upgradeHandler.upgrade=Verbindung [{0}], HTTP/1.1 Upgrade auf Stream [1]
upgradeHandler.upgrade.fail=Verbindung [{0}], HTTP/1.1 upgrade fehlgeschlagen
upgradeHandler.windowSizeTooBig=Verbindung [{0}], Stream [{1}], Fenster-Größe
zu groß
-upgradeHandler.writeHeaders=Verbindung [{0}], Stream [{1}]
+upgradeHandler.writeHeaders=Verbindung [{0}], Stream [{1}], schreibe Header,
EndOfStream [{2}]
diff --git a/java/org/apache/coyote/http2/LocalStrings_fr.properties
b/java/org/apache/coyote/http2/LocalStrings_fr.properties
index 8fc023c..5d2ac5e 100644
--- a/java/org/apache/coyote/http2/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_fr.properties
@@ -13,6 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+abstractStream.setConnectionAllocationMade=Connection [{0}], Stream [{1}],
l''allocation pour la connection effectuée a changé de [{2}] vers [{3}]
+abstractStream.setConnectionAllocationRequested=Connection [{0}], Stream
[{1}], l''allocation pour la connection demandée a changé de [{2}] vers [{3}]
abstractStream.windowSizeDec=Connection [{0}], Flux [{1}], réduction de la
fenêtre de contrôle de flux de [{2}] à [{3}]
abstractStream.windowSizeInc=Connection [{0}], Stream [{1}], augmentez la
taille de la fenêtre de contrôle de flux de [{2}] à [{3}]
abstractStream.windowSizeTooBig=Connection [{0}], Flux [{1}], L''augmentation
de la taille de la fenêtre de [{2}] à [{3}] a excédé le maximum autorisé
diff --git a/java/org/apache/coyote/http2/LocalStrings_ja.properties
b/java/org/apache/coyote/http2/LocalStrings_ja.properties
index d130a62..c688409 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ja.properties
@@ -13,6 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+abstractStream.setConnectionAllocationMade=接続 [{0}] 、ストリーム [{1}] 、作成された接続割り当てが
[{2}] から [{3}] に変更されました
+abstractStream.setConnectionAllocationRequested=接続 [{0}] 、ストリーム [{1}]
、要求された接続割り当てが [{2}] から [{3}] に変更されました
abstractStream.windowSizeDec=コネクション [{0}]、ストリーム [{1}]、フロー制御ウィンドウを [{2}] ずつ
[{3}] に縮小
abstractStream.windowSizeInc=コネクション [{0}]、ストリーム [{1}]、フロー制御ウインドウを [{2}] 増やして
[{3}] にします
abstractStream.windowSizeTooBig=コネクション [{0}]、ストリーム [{1}]、ウィンドウサイズが [{2}] 増加して
[{3}] になったため許容最大値を超えました
diff --git a/java/org/apache/coyote/http2/LocalStrings_ko.properties
b/java/org/apache/coyote/http2/LocalStrings_ko.properties
index bd6d88d..180c595 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ko.properties
@@ -13,6 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+abstractStream.setConnectionAllocationMade=연결 [{0}], 스트림 [{1}], 연결 할당이 [{2}]에서
[{3}](으)로 변경되었습니다.
+abstractStream.setConnectionAllocationRequested=연결 [{0}], 스트림 [{1}], 요청된 연결
할당이 [{2}]에서 [{3}](으)로 변경되었습니다.
abstractStream.windowSizeDec=연결 [{0}], 스트림 [{1}], flow control 윈도우를 [{2}] 만큼
줄여 [{3}]에 이르게 합니다.
abstractStream.windowSizeInc=연결 [{0}], 스트림 [{1}]: Flow control 윈도우를 [{2}] 만큼
증가시켜 윈도
[tomcat] branch 10.0.x updated: Alphabetical order. Add missing entries.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new e3103ff Alphabetical order. Add missing entries.
e3103ff is described below
commit e3103ffbb99a6d1ebb6ca4798f5400791867846a
Author: Mark Thomas
AuthorDate: Thu Mar 17 11:06:34 2022 +
Alphabetical order. Add missing entries.
---
java/org/apache/coyote/http2/LocalStrings.properties| 4 ++--
java/org/apache/coyote/http2/LocalStrings_de.properties | 3 ++-
java/org/apache/coyote/http2/LocalStrings_fr.properties | 2 ++
java/org/apache/coyote/http2/LocalStrings_ja.properties | 2 ++
java/org/apache/coyote/http2/LocalStrings_ko.properties | 2 ++
5 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties
b/java/org/apache/coyote/http2/LocalStrings.properties
index 02f7abe..6151d96 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -13,8 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-abstractStream.setConnectionAllocationRequested=Connection [{0}], Stream
[{1}], connection allocation requested changed from [{2}] to [{3}]
abstractStream.setConnectionAllocationMade=Connection [{0}], Stream [{1}],
connection allocation made changed from [{2}] to [{3}]
+abstractStream.setConnectionAllocationRequested=Connection [{0}], Stream
[{1}], connection allocation requested changed from [{2}] to [{3}]
abstractStream.windowSizeDec=Connection [{0}], Stream [{1}], reduce flow
control window by [{2}] to [{3}]
abstractStream.windowSizeInc=Connection [{0}], Stream [{1}], increase flow
control window by [{2}] to [{3}]
abstractStream.windowSizeTooBig=Connection [{0}], Stream [{1}], increased
window size by [{2}] to [{3}] which exceeded permitted maximum
@@ -145,8 +145,8 @@ upgradeHandler.prunedPriority=Connection [{0}] Pruned
unused stream [{1}] that m
upgradeHandler.releaseBacklog=Connection [{0}], Stream [{1}] released from
backlog
upgradeHandler.reset.receive=Connection [{0}], Stream [{1}], Reset received
due to [{2}]
upgradeHandler.rst.debug=Connection [{0}], Stream [{1}], Error [{2}], Message
[{3}], RST (closing stream)
-upgradeHandler.sendfile.reservation=Connection [{0}], Stream [{1}], Connection
reservation [{2}], Stream reservation [{3}] prior to sendfile write
upgradeHandler.sendPrefaceFail=Connection [{0}], Failed to send preface to
client
+upgradeHandler.sendfile.reservation=Connection [{0}], Stream [{1}], Connection
reservation [{2}], Stream reservation [{3}] prior to sendfile write
upgradeHandler.socketCloseFailed=Error closing socket
upgradeHandler.startRequestBodyFrame.result=Connection [{0}], Stream [{1}]
startRequestBodyFrame returned [{2}]
upgradeHandler.stream.closed=Stream [{0}] has been closed for some time
diff --git a/java/org/apache/coyote/http2/LocalStrings_de.properties
b/java/org/apache/coyote/http2/LocalStrings_de.properties
index d4d6c97..7491438 100644
--- a/java/org/apache/coyote/http2/LocalStrings_de.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_de.properties
@@ -19,6 +19,7 @@ connectionPrefaceParser.mismatch=Es wurde eine unerwartete
Byte Sequenz beim Sta
connectionSettings.debug=Verbindung [{0}], Parameter typ [{1}] gesetzt auf
[{2}]
connectionSettings.headerTableSizeLimit=Verbindung [{0}], versuchte die
Kopfzeilentabellengröße auf [{1}] zu setzen aber die Grenze liegt bei 16k
+connectionSettings.maxFrameSizeInvalid=Verbindung [{0}], die angeforderte
maximale Framegröße von [{1}] ist außerhalb des erlaubten Bereichs von [{2}]
bis [{3}]
hpack.invalidCharacter=Das Unicode Zeichen [{0}] an Code Punkt [{1}] kann
nicht kodiert werden, da es außerhalb des erlaubten Bereiches von 0 bis 255 ist.
@@ -39,4 +40,4 @@ upgradeHandler.socketCloseFailed=Fehler beim Schließen des
Sockets.
upgradeHandler.upgrade=Verbindung [{0}], HTTP/1.1 Upgrade auf Stream [1]
upgradeHandler.upgrade.fail=Verbindung [{0}], HTTP/1.1 upgrade fehlgeschlagen
upgradeHandler.windowSizeTooBig=Verbindung [{0}], Stream [{1}], Fenster-Größe
zu groß
-upgradeHandler.writeHeaders=Verbindung [{0}], Stream [{1}]
+upgradeHandler.writeHeaders=Verbindung [{0}], Stream [{1}], schreibe Header,
EndOfStream [{2}]
diff --git a/java/org/apache/coyote/http2/LocalStrings_fr.properties
b/java/org/apache/coyote/http2/LocalStrings_fr.properties
index 8fc023c..5d2ac5e 100644
--- a/java/org/apache/coyote/http2/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_fr.properties
@@ -13,6 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+abstractStream.setConnectionAllocationMade=Connection [{0}], Stream [{1}],
l''allocation pour la connection effectuée a c
[tomcat] branch main updated: Alphabetical order
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new f5c05ca Alphabetical order
f5c05ca is described below
commit f5c05cad8832c0a0cf8295e22e823177a3794351
Author: Mark Thomas
AuthorDate: Thu Mar 17 11:06:13 2022 +
Alphabetical order
---
java/org/apache/coyote/http2/LocalStrings.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties
b/java/org/apache/coyote/http2/LocalStrings.properties
index 02f7abe..6151d96 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -13,8 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-abstractStream.setConnectionAllocationRequested=Connection [{0}], Stream
[{1}], connection allocation requested changed from [{2}] to [{3}]
abstractStream.setConnectionAllocationMade=Connection [{0}], Stream [{1}],
connection allocation made changed from [{2}] to [{3}]
+abstractStream.setConnectionAllocationRequested=Connection [{0}], Stream
[{1}], connection allocation requested changed from [{2}] to [{3}]
abstractStream.windowSizeDec=Connection [{0}], Stream [{1}], reduce flow
control window by [{2}] to [{3}]
abstractStream.windowSizeInc=Connection [{0}], Stream [{1}], increase flow
control window by [{2}] to [{3}]
abstractStream.windowSizeTooBig=Connection [{0}], Stream [{1}], increased
window size by [{2}] to [{3}] which exceeded permitted maximum
@@ -145,8 +145,8 @@ upgradeHandler.prunedPriority=Connection [{0}] Pruned
unused stream [{1}] that m
upgradeHandler.releaseBacklog=Connection [{0}], Stream [{1}] released from
backlog
upgradeHandler.reset.receive=Connection [{0}], Stream [{1}], Reset received
due to [{2}]
upgradeHandler.rst.debug=Connection [{0}], Stream [{1}], Error [{2}], Message
[{3}], RST (closing stream)
-upgradeHandler.sendfile.reservation=Connection [{0}], Stream [{1}], Connection
reservation [{2}], Stream reservation [{3}] prior to sendfile write
upgradeHandler.sendPrefaceFail=Connection [{0}], Failed to send preface to
client
+upgradeHandler.sendfile.reservation=Connection [{0}], Stream [{1}], Connection
reservation [{2}], Stream reservation [{3}] prior to sendfile write
upgradeHandler.socketCloseFailed=Error closing socket
upgradeHandler.startRequestBodyFrame.result=Connection [{0}], Stream [{1}]
startRequestBodyFrame returned [{2}]
upgradeHandler.stream.closed=Stream [{0}] has been closed for some time
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Update IDE config files after bnd update
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 5236b97 Update IDE config files after bnd update
5236b97 is described below
commit 5236b9784d0cfb986b01837f39b4b308c0fbf1bc
Author: Mark Thomas
AuthorDate: Thu Mar 17 10:43:39 2022 +
Update IDE config files after bnd update
---
res/ide-support/eclipse/eclipse.classpath | 2 +-
res/ide-support/idea/tomcat.iml | 2 +-
res/ide-support/netbeans/project.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/res/ide-support/eclipse/eclipse.classpath
b/res/ide-support/eclipse/eclipse.classpath
index e690a8e..b7ed9dd 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -29,7 +29,7 @@
-
+
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index ba591c0..a42d790 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -113,7 +113,7 @@
-
+
diff --git a/res/ide-support/netbeans/project.xml
b/res/ide-support/netbeans/project.xml
index 43d1d49..d85ca8a 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -178,7 +178,7 @@
-->
java
-${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.20/ecj-4.20.jar:${base.path}/bnd-6.1.0/biz.aQute.bnd-6.1.0.jar:${ant.includes}/
+${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.20/ecj-4.20.jar:${base.path}/bnd-6.2.0/biz.aQute.bnd-6.2.0.jar:${ant.includes}/
1.7
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Update IDE config files after bnd update
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new f5d2959 Update IDE config files after bnd update
f5d2959 is described below
commit f5d29593885e704bd2df8f6611981e826ad53e21
Author: Mark Thomas
AuthorDate: Thu Mar 17 10:43:39 2022 +
Update IDE config files after bnd update
---
res/ide-support/eclipse/eclipse.classpath | 2 +-
res/ide-support/idea/tomcat.iml | 2 +-
res/ide-support/netbeans/project.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/res/ide-support/eclipse/eclipse.classpath
b/res/ide-support/eclipse/eclipse.classpath
index 7c33850..11c8839 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -29,7 +29,7 @@
-
+
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index 8659608..72e7f4c 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -113,7 +113,7 @@
-
+
diff --git a/res/ide-support/netbeans/project.xml
b/res/ide-support/netbeans/project.xml
index ac77518..e553cd3 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -178,7 +178,7 @@
-->
java
-${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.20/ecj-4.20.jar:${base.path}/bnd-6.1.0/biz.aQute.bnd-6.1.0.jar:${base.path}/migration-1.0.0/jakartaee-migration-1.0.0-shaded.jar:${ant.includes}/
+${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.20/ecj-4.20.jar:${base.path}/bnd-6.2.0/biz.aQute.bnd-6.2.0.jar:${base.path}/migration-1.0.0/jakartaee-migration-1.0.0-shaded.jar:${ant.includes}/
1.7
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Update ECJ to 4.23 (a.k.a 3.29.0)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 21858d9b95aa75673efe3b285a70097f29f2ad1c
Author: Mark Thomas
AuthorDate: Thu Mar 17 10:41:08 2022 +
Update ECJ to 4.23 (a.k.a 3.29.0)
---
build.properties.default| 12 ++--
res/ide-support/eclipse/eclipse.classpath | 2 +-
res/ide-support/idea/tomcat.iml | 2 +-
res/ide-support/netbeans/nb-tomcat-build.properties | 2 +-
res/ide-support/netbeans/project.xml| 2 +-
res/maven/tomcat-jasper.pom | 2 +-
webapps/docs/changelog.xml | 3 +++
7 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 38c3955..f70c26f 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -135,15 +135,15 @@
wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${ws
# - Eclipse JDT, version 4.7 or later -#
# See
https://cwiki.apache.org/confluence/display/TOMCAT/Managing+Tomcat%27s+Dependency+on+the+Eclipse+JDT+Core+Batch+Compiler
#
-# Checksum is from "SHA512 Checksums for 4.22" link at
-# https://download.eclipse.org/eclipse/downloads/drops4/R-4.22-202111241800/
-#
https://download.eclipse.org/eclipse/downloads/drops4/R-4.22-202111241800/checksum/eclipse-4.22-SUMSSHA512
+# Checksum is from "SHA512 Checksums for 4.23" link at
+# https://download.eclipse.org/eclipse/downloads/drops4/R-4.23-202203080310/
+#
https://download.eclipse.org/eclipse/downloads/drops4/R-4.23-202203080310/checksum/eclipse-4.23-SUMSSHA512
#
-jdt.version=4.22
-jdt.release=R-4.22-202111241800
+jdt.version=4.23
+jdt.release=R-4.23-202203080310
jdt.checksum.enabled=true
jdt.checksum.algorithm=SHA-512
-jdt.checksum.value=a014bbedd96b31576bb2b28ad16ac23edc15b59833ac810409fd42834ac6081b695167903bec0fa98d614031aeb863b3de28697d4636f23b2c47ffd93f443aae
+jdt.checksum.value=2f8c6c7bc2e2c738c853f3c977ffb7a258b9f92e260e3affdf9c8fd54ac7b70e404944d0e434eb83a14b8bf01b201effaaf9930ea4b5fdfb1a752b6abf1ae1ec
jdt.home=${base.path}/ecj-${jdt.version}
jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
# The download will be moved to the archive area eventually. We are taking
care of that in advance.
diff --git a/res/ide-support/eclipse/eclipse.classpath
b/res/ide-support/eclipse/eclipse.classpath
index 074a01d..d1c32e0 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -24,7 +24,7 @@
-
+
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index b755fb9..2c38e31 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -68,7 +68,7 @@
-
+
diff --git a/res/ide-support/netbeans/nb-tomcat-build.properties
b/res/ide-support/netbeans/nb-tomcat-build.properties
index 0aa6d06..0ef68ae 100644
--- a/res/ide-support/netbeans/nb-tomcat-build.properties
+++ b/res/ide-support/netbeans/nb-tomcat-build.properties
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http11.Http11NioProtocol
# it is not possible to retrieve the classpaths from the build to
# use in the NetBeans targets, so they must be explicitly declared
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13.2/junit-4.13.2.jar:${base.path}/easymock-4.3/easymock-4.3.jar:${base.path}/objenesis-3.2/objenesis-3.2.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.22/ecj-4.22.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13.2/junit-4.13.2.jar:${base.path}/easymock-4.3/easymock-4.3.jar:${base.path}/objenesis-3.2/objenesis-3.2.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.23/ecj-4.23.jar:${tomcat.classes}
# Extra properties used by the Tomcat project additional NetBeans targets.
diff --git a/res/ide-support/netbeans/project.xml
b/res/ide-support/netbeans/project.xml
index 5b45bab..4a6c884 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -178,7 +178,7 @@
-->
java
-${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.22/ecj-4.22.jar:${base.path}/bnd-6.1.0/biz.aQute.bnd-6.1.0.jar:${base.path}/migration-1.0.0/jakartaee-migration-1.0.0-shaded.jar:${ant.includes}/
+${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.23/ecj-4.23.jar:${base.path}/bnd-6.1.0/biz.aQu
[tomcat] 02/02: Update IDE config files after bnd update
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 08d13806d920f4588058d9a9cda2c97e7dbbc5e8
Author: Mark Thomas
AuthorDate: Thu Mar 17 10:43:39 2022 +
Update IDE config files after bnd update
---
res/ide-support/eclipse/eclipse.classpath | 2 +-
res/ide-support/idea/tomcat.iml | 2 +-
res/ide-support/netbeans/project.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/res/ide-support/eclipse/eclipse.classpath
b/res/ide-support/eclipse/eclipse.classpath
index d1c32e0..ff7ca50 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -29,7 +29,7 @@
-
+
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index 2c38e31..196838a 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -113,7 +113,7 @@
-
+
diff --git a/res/ide-support/netbeans/project.xml
b/res/ide-support/netbeans/project.xml
index 4a6c884..3a4fb31 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -178,7 +178,7 @@
-->
java
-${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.23/ecj-4.23.jar:${base.path}/bnd-6.1.0/biz.aQute.bnd-6.1.0.jar:${base.path}/migration-1.0.0/jakartaee-migration-1.0.0-shaded.jar:${ant.includes}/
+${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.23/ecj-4.23.jar:${base.path}/bnd-6.2.0/biz.aQute.bnd-6.2.0.jar:${base.path}/migration-1.0.0/jakartaee-migration-1.0.0-shaded.jar:${ant.includes}/
1.7
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated (3dec6f4 -> 08d1380)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git. from 3dec6f4 Remove OSGi annotations dependency as it is no longer required new 21858d9 Update ECJ to 4.23 (a.k.a 3.29.0) new 08d1380 Update IDE config files after bnd update The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: build.properties.default| 12 ++-- res/ide-support/eclipse/eclipse.classpath | 4 ++-- res/ide-support/idea/tomcat.iml | 4 ++-- res/ide-support/netbeans/nb-tomcat-build.properties | 2 +- res/ide-support/netbeans/project.xml| 2 +- res/maven/tomcat-jasper.pom | 2 +- webapps/docs/changelog.xml | 3 +++ 7 files changed, 16 insertions(+), 13 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r53155 - in /dev/tomcat/tomcat-connectors/native/1.2.32: ./ binaries/ source/
чт, 17 мар. 2022 г. в 11:45, : > > Author: markt > Date: Thu Mar 17 08:44:59 2022 > New Revision: 53155 > > Log: > Upload Tomcat Native 1.2.32 for voting > > Added: > dev/tomcat/tomcat-connectors/native/1.2.32/ > dev/tomcat/tomcat-connectors/native/1.2.32/binaries/ > > dev/tomcat/tomcat-connectors/native/1.2.32/binaries/tomcat-native-1.2.32-openssl-1.1.1n-ocsp-win32-bin.zip >(with props) > > dev/tomcat/tomcat-connectors/native/1.2.32/binaries/tomcat-native-1.2.32-openssl-1.1.1n-ocsp-win32-bin.zip.asc > > dev/tomcat/tomcat-connectors/native/1.2.32/binaries/tomcat-native-1.2.32-openssl-1.1.1n-ocsp-win32-bin.zip.sha512 > > dev/tomcat/tomcat-connectors/native/1.2.32/binaries/tomcat-native-1.2.32-openssl-1.1.1n-win32-bin.zip >(with props) > > dev/tomcat/tomcat-connectors/native/1.2.32/binaries/tomcat-native-1.2.32-openssl-1.1.1n-win32-bin.zip.asc > > dev/tomcat/tomcat-connectors/native/1.2.32/binaries/tomcat-native-1.2.32-openssl-1.1.1n-win32-bin.zip.sha512 > dev/tomcat/tomcat-connectors/native/1.2.32/source/ > > dev/tomcat/tomcat-connectors/native/1.2.32/source/tomcat-native-1.2.32-src.tar.gz >(with props) > > dev/tomcat/tomcat-connectors/native/1.2.32/source/tomcat-native-1.2.32-src.tar.gz.asc > > dev/tomcat/tomcat-connectors/native/1.2.32/source/tomcat-native-1.2.32-src.tar.gz.sha512 > > dev/tomcat/tomcat-connectors/native/1.2.32/source/tomcat-native-1.2.32-win32-src.zip >(with props) > > dev/tomcat/tomcat-connectors/native/1.2.32/source/tomcat-native-1.2.32-win32-src.zip.asc > > dev/tomcat/tomcat-connectors/native/1.2.32/source/tomcat-native-1.2.32-win32-src.zip.sha512 > > Added: > dev/tomcat/tomcat-connectors/native/1.2.32/binaries/tomcat-native-1.2.32-openssl-1.1.1n-ocsp-win32-bin.zip > == > Binary file - no diff available. > > Propchange: > dev/tomcat/tomcat-connectors/native/1.2.32/binaries/tomcat-native-1.2.32-openssl-1.1.1n-ocsp-win32-bin.zip > -- > svn:executable = * [OT] I wonder why *-bin.zip* files in this commit have the "svn:executable" flag set. It does not make sense to me, neither from Unix nor from Windows point of view. They are not *.exe files, nor are they executable shell scripts with a shebang line. A "-src.zip" file does not have this flag, so it is not a *.zip mask (auto-properties setting?) that triggered it. Best regards, Konstantin Kolinko > Propchange: > dev/tomcat/tomcat-connectors/native/1.2.32/binaries/tomcat-native-1.2.32-openssl-1.1.1n-ocsp-win32-bin.zip > -- > svn:mime-type = application/octet-stream > [] > > Added: > dev/tomcat/tomcat-connectors/native/1.2.32/binaries/tomcat-native-1.2.32-openssl-1.1.1n-win32-bin.zip > == > Binary file - no diff available. > > Propchange: > dev/tomcat/tomcat-connectors/native/1.2.32/binaries/tomcat-native-1.2.32-openssl-1.1.1n-win32-bin.zip > -- > svn:executable = * > > Propchange: > dev/tomcat/tomcat-connectors/native/1.2.32/binaries/tomcat-native-1.2.32-openssl-1.1.1n-win32-bin.zip > -- > svn:mime-type = application/octet-stream > [...] No newline at end of file > > Added: > dev/tomcat/tomcat-connectors/native/1.2.32/source/tomcat-native-1.2.32-src.tar.gz > == > Binary file - no diff available. > > Propchange: > dev/tomcat/tomcat-connectors/native/1.2.32/source/tomcat-native-1.2.32-src.tar.gz > -- > svn:mime-type = application/octet-stream > [...] > > Added: > dev/tomcat/tomcat-connectors/native/1.2.32/source/tomcat-native-1.2.32-win32-src.zip > == > Binary file - no diff available. > > Propchange: > dev/tomcat/tomcat-connectors/native/1.2.32/source/tomcat-native-1.2.32-win32-src.zip > -- > svn:mime-type = application/octet-stream > - 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: Remove OSGi annotations dependency as it is no longer required
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 2f00383 Remove OSGi annotations dependency as it is no longer required
2f00383 is described below
commit 2f003838bd45b48a8c98afed037587b573fdf64a
Author: Mark Thomas
AuthorDate: Thu Mar 17 10:06:04 2022 +
Remove OSGi annotations dependency as it is no longer required
This used to be required because the bnd annotations used some enums
from OSGi annotations. These have now been replaced with strings to
avoid bnd users - like Tomcat - requiring a dependency on OSGi
annotations to create Javadoc.
# Conflicts:
# build.properties.default
---
build.properties.default | 10 --
build.xml | 11 ---
webapps/docs/changelog.xml | 4
3 files changed, 4 insertions(+), 21 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 35ddd11..c443b83 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -308,16 +308,6 @@ bnd.home=${base.path}/bnd-${bnd.version}
bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar
bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.bnd-${bnd.version}.jar
-# - OSGi annotations bundle, version 1.0.0 or later-
-# - required to avoid Javadoc error when using bnd annotations -
-osgi-annotations.version=1.1.1
-osgi-annotations.checksum.enabled=true
-osgi-annotations.checksum.algorithm=MD5|SHA-1
-osgi-annotations.checksum.value=04e5db48a469cb53dd0e4e954deab2e0|a1644f3dbbb614f2a44671d27dd13c4d9142007d
-osgi-annotations.home=${base.path}/osgi-annotations-${osgi-annotations.version}
-osgi-annotations.jar=${osgi-annotations.home}/org.osgi.annotation.bundle-${osgi-annotations.version}.jar
-osgi-annotations.loc=${base-maven.loc}/org/osgi/org.osgi.annotation.bundle/${osgi-annotations.version}/org.osgi.annotation.bundle-${osgi-annotations.version}.jar
-
# - JSign, version 4.0 or later -
jsign.version=4.0
diff --git a/build.xml b/build.xml
index 8ed475b..8eaffa3 100644
--- a/build.xml
+++ b/build.xml
@@ -213,7 +213,6 @@
-
@@ -2272,7 +2271,6 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
-
@@ -3651,15 +3649,6 @@ Read the Building page on the Apache Tomcat
documentation site for details on ho
-
-
-
-
-
-
-
-
-
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 511e378..f7cfbf4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -144,6 +144,10 @@
Update to bnd 6.2.0. (markt)
+
+Remove OSGi annotations dependency as it is no longer required with bnd
+6.2.0. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Remove OSGi annotations dependency as it is no longer required
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new e8f990b Remove OSGi annotations dependency as it is no longer required
e8f990b is described below
commit e8f990b21d6ed7083cc8f02607fab169851082bc
Author: Mark Thomas
AuthorDate: Thu Mar 17 10:06:04 2022 +
Remove OSGi annotations dependency as it is no longer required
This used to be required because the bnd annotations used some enums
from OSGi annotations. These have now been replaced with strings to
avoid bnd users - like Tomcat - requiring a dependency on OSGi
annotations to create Javadoc.
---
build.properties.default | 10 --
build.xml | 11 ---
webapps/docs/changelog.xml | 4
3 files changed, 4 insertions(+), 21 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 626fb6f..1b573e6 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -308,16 +308,6 @@ bnd.home=${base.path}/bnd-${bnd.version}
bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar
bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.bnd-${bnd.version}.jar
-# - OSGi annotations bundle, version 1.0.0 or later-
-# - required to avoid Javadoc error when using bnd annotations -
-osgi-annotations.version=1.1.1
-osgi-annotations.checksum.enabled=true
-osgi-annotations.checksum.algorithm=MD5|SHA-1
-osgi-annotations.checksum.value=04e5db48a469cb53dd0e4e954deab2e0|a1644f3dbbb614f2a44671d27dd13c4d9142007d
-osgi-annotations.home=${base.path}/osgi-annotations-${osgi-annotations.version}
-osgi-annotations.jar=${osgi-annotations.home}/org.osgi.annotation.bundle-${osgi-annotations.version}.jar
-osgi-annotations.loc=${base-maven.loc}/org/osgi/org.osgi.annotation.bundle/${osgi-annotations.version}/org.osgi.annotation.bundle-${osgi-annotations.version}.jar
-
# - Tomcat Migration Tool for Jakarta EE -
migration-lib.version=1.0.0
diff --git a/build.xml b/build.xml
index a108130..6debdff 100644
--- a/build.xml
+++ b/build.xml
@@ -213,7 +213,6 @@
-
@@ -2290,7 +2289,6 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
-
@@ -3679,15 +3677,6 @@ Read the Building page on the Apache Tomcat
documentation site for details on ho
-
-
-
-
-
-
-
-
-
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 259010e..bc73a4a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -149,6 +149,10 @@
Update to bnd 6.2.0. (markt)
+
+Remove OSGi annotations dependency as it is no longer required with bnd
+6.2.0. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Remove OSGi annotations dependency as it is no longer required
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 3dec6f4 Remove OSGi annotations dependency as it is no longer required
3dec6f4 is described below
commit 3dec6f45ff7ad8309f7c11b82299968fb29206df
Author: Mark Thomas
AuthorDate: Thu Mar 17 10:06:04 2022 +
Remove OSGi annotations dependency as it is no longer required
This used to be required because the bnd annotations used some enums
from OSGi annotations. These have now been replaced with strings to
avoid bnd users - like Tomcat - requiring a dependency on OSGi
annotations to create Javadoc.
---
build.properties.default | 10 --
build.xml | 11 ---
webapps/docs/changelog.xml | 4
3 files changed, 4 insertions(+), 21 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index fa0eff2..38c3955 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -303,16 +303,6 @@ bnd.home=${base.path}/bnd-${bnd.version}
bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar
bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.bnd-${bnd.version}.jar
-# - OSGi annotations bundle, version 1.0.0 or later-
-# - required to avoid Javadoc error when using bnd annotations -
-osgi-annotations.version=1.1.1
-osgi-annotations.checksum.enabled=true
-osgi-annotations.checksum.algorithm=MD5|SHA-1
-osgi-annotations.checksum.value=04e5db48a469cb53dd0e4e954deab2e0|a1644f3dbbb614f2a44671d27dd13c4d9142007d
-osgi-annotations.home=${base.path}/osgi-annotations-${osgi-annotations.version}
-osgi-annotations.jar=${osgi-annotations.home}/org.osgi.annotation.bundle-${osgi-annotations.version}.jar
-osgi-annotations.loc=${base-maven.loc}/org/osgi/org.osgi.annotation.bundle/${osgi-annotations.version}/org.osgi.annotation.bundle-${osgi-annotations.version}.jar
-
# - Tomcat Migration Tool for Jakarta EE -
migration-lib.version=1.0.0
diff --git a/build.xml b/build.xml
index 91282fb..98470c7 100644
--- a/build.xml
+++ b/build.xml
@@ -215,7 +215,6 @@
-
@@ -2328,7 +2327,6 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
-
@@ -3724,15 +3722,6 @@ Read the Building page on the Apache Tomcat
documentation site for details on ho
-
-
-
-
-
-
-
-
-
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3160cd0..1f756d3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -158,6 +158,10 @@
Update to bnd 6.2.0. (markt)
+
+Remove OSGi annotations dependency as it is no longer required with bnd
+6.2.0. (markt)
+
-
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.32
On 17/03/2022 08:48, Mark Thomas wrote: Version 1.2.32 includes the following changes compared to 1.2.31 - Updated recommended minimum OpenSSL to 1.1.1n and build windows binaries using that version - Fix release script so it works with the current git layout The proposed release artefacts can be found at [1], and the build was done using tag [2]. The Apache Tomcat Native 1.2.32 release is [X] Stable, go ahead and release [ ] Broken because of ... Tomcat 10.0.x unit tests passed for APR using Tomcat Native 1.2.32 on Windows. 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 1.2.32
On Thu, Mar 17, 2022 at 9:48 AM Mark Thomas wrote: > > Version 1.2.32 includes the following changes compared to 1.2.31 > > - Updated recommended minimum OpenSSL to 1.1.1n and build windows >binaries using that version > > - Fix release script so it works with the current git layout > > The proposed release artefacts can be found at [1], > and the build was done using tag [2]. > > The Apache Tomcat Native 1.2.32 release is > [X] Stable, go ahead and release > [ ] Broken because of ... Rémy > Thanks, > > Mark > > > [1] > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/1.2.32 > [2] > https://gitbox.apache.org/repos/asf?p=tomcat-native.git;a=commit;h=ee11afcb5bc3426b85525985461484222f609406 > > - > 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
[VOTE] Release Apache Tomcat Native 1.2.32
Version 1.2.32 includes the following changes compared to 1.2.31 - Updated recommended minimum OpenSSL to 1.1.1n and build windows binaries using that version - Fix release script so it works with the current git layout The proposed release artefacts can be found at [1], and the build was done using tag [2]. The Apache Tomcat Native 1.2.32 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.32 [2] https://gitbox.apache.org/repos/asf?p=tomcat-native.git;a=commit;h=ee11afcb5bc3426b85525985461484222f609406 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r53155 - in /dev/tomcat/tomcat-connectors/native/1.2.32: ./ binaries/ source/
Author: markt Date: Thu Mar 17 08:44:59 2022 New Revision: 53155 Log: Upload Tomcat Native 1.2.32 for voting Added: dev/tomcat/tomcat-connectors/native/1.2.32/ dev/tomcat/tomcat-connectors/native/1.2.32/binaries/ dev/tomcat/tomcat-connectors/native/1.2.32/binaries/tomcat-native-1.2.32-openssl-1.1.1n-ocsp-win32-bin.zip (with props) dev/tomcat/tomcat-connectors/native/1.2.32/binaries/tomcat-native-1.2.32-openssl-1.1.1n-ocsp-win32-bin.zip.asc dev/tomcat/tomcat-connectors/native/1.2.32/binaries/tomcat-native-1.2.32-openssl-1.1.1n-ocsp-win32-bin.zip.sha512 dev/tomcat/tomcat-connectors/native/1.2.32/binaries/tomcat-native-1.2.32-openssl-1.1.1n-win32-bin.zip (with props) dev/tomcat/tomcat-connectors/native/1.2.32/binaries/tomcat-native-1.2.32-openssl-1.1.1n-win32-bin.zip.asc dev/tomcat/tomcat-connectors/native/1.2.32/binaries/tomcat-native-1.2.32-openssl-1.1.1n-win32-bin.zip.sha512 dev/tomcat/tomcat-connectors/native/1.2.32/source/ dev/tomcat/tomcat-connectors/native/1.2.32/source/tomcat-native-1.2.32-src.tar.gz (with props) dev/tomcat/tomcat-connectors/native/1.2.32/source/tomcat-native-1.2.32-src.tar.gz.asc dev/tomcat/tomcat-connectors/native/1.2.32/source/tomcat-native-1.2.32-src.tar.gz.sha512 dev/tomcat/tomcat-connectors/native/1.2.32/source/tomcat-native-1.2.32-win32-src.zip (with props) dev/tomcat/tomcat-connectors/native/1.2.32/source/tomcat-native-1.2.32-win32-src.zip.asc dev/tomcat/tomcat-connectors/native/1.2.32/source/tomcat-native-1.2.32-win32-src.zip.sha512 Added: dev/tomcat/tomcat-connectors/native/1.2.32/binaries/tomcat-native-1.2.32-openssl-1.1.1n-ocsp-win32-bin.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-connectors/native/1.2.32/binaries/tomcat-native-1.2.32-openssl-1.1.1n-ocsp-win32-bin.zip -- svn:executable = * Propchange: dev/tomcat/tomcat-connectors/native/1.2.32/binaries/tomcat-native-1.2.32-openssl-1.1.1n-ocsp-win32-bin.zip -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-connectors/native/1.2.32/binaries/tomcat-native-1.2.32-openssl-1.1.1n-ocsp-win32-bin.zip.asc == --- dev/tomcat/tomcat-connectors/native/1.2.32/binaries/tomcat-native-1.2.32-openssl-1.1.1n-ocsp-win32-bin.zip.asc (added) +++ dev/tomcat/tomcat-connectors/native/1.2.32/binaries/tomcat-native-1.2.32-openssl-1.1.1n-ocsp-win32-bin.zip.asc Thu Mar 17 08:44:59 2022 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - http://gpgtools.org + +iQIzBAABCgAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAmIy9NYACgkQEMAcWi9g +WedcDxAA3FAc9VZXA/DPhu/eGY5GjZJ8c3j3pXeX/bww5VsRhXhXzUGALuq3ELy9 +rqNnGy5PWOJgey90AUBNikUUCvyr0uzBtRhmkUzPMv2QGQH7yncCD2ytdQYcV1PZ +4ctMxX9qTauSfLC9u7pchlAyu4PalsYzUb3BEk5tnoje/+ngAYQAcoxm9vnwuGEo +XS+eXMODPzd9Cw6hnNMmKIYYfCddMeIuxC8Kn+H34Z4Y0sVE5fw6tuRA5m/0jHpS +Lxr2fXY5Vbz/qpPIt1oKF5JHMWrfNs62nmNKFCztdOdVGWBAve9zAXNZW9tTeU0z +sd7vMRmxXyJW1Y4SAngIYVNIrbvUwES6FMyuExQlUCgtcCnXFZDjjTsIN6ikeVwI +lHZEJ66YiWPQIRF32ANxQnNEDYzIqXBZE3h09UCqdCtn9fi58zbI4YgIhnRHr/P+ +eERF6unQmEZDN3yYTfuMRX/ZZnsVJ246LIZLdyDqQ2Z9FKExbGWWJr7OMnKgRkEy +Ml2ihgwcXkJMySHiKEP6Kars4/H1VTHgvXpYYqbtEqT4XY4TTPzNQ1UtsAbStytt +y/CJgcJRHMOnd/4CIdun1mEr7aXFR3FDNEWjoTWrmdr+goTcnvsfLGGNXuKH/TYv +d6yu1dp82q9Mfd5OxcmSg8jH2S7MUzlzXD5EvJFnk0ncn5q1TTk= +=sE8C +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-connectors/native/1.2.32/binaries/tomcat-native-1.2.32-openssl-1.1.1n-ocsp-win32-bin.zip.sha512 == --- dev/tomcat/tomcat-connectors/native/1.2.32/binaries/tomcat-native-1.2.32-openssl-1.1.1n-ocsp-win32-bin.zip.sha512 (added) +++ dev/tomcat/tomcat-connectors/native/1.2.32/binaries/tomcat-native-1.2.32-openssl-1.1.1n-ocsp-win32-bin.zip.sha512 Thu Mar 17 08:44:59 2022 @@ -0,0 +1 @@ +3fe28ad1fe8eeced63e993eefe7543901e82285f9a8f59db35d7b22586a8cfa235336c7016a049df61882a2b9611959aed9972fbe6662874d3a14c962e6d7802 *tomcat-native-1.2.32-openssl-1.1.1n-ocsp-win32-bin.zip \ No newline at end of file Added: dev/tomcat/tomcat-connectors/native/1.2.32/binaries/tomcat-native-1.2.32-openssl-1.1.1n-win32-bin.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-connectors/native/1.2.32/binaries/tomcat-native-1.2.32-openssl-1.1.1n-win32-bin.zip -- svn:executable = * Propchange: dev/tomcat/tomcat-connectors/native/1.2.32/binaries/tomcat-native-1.2.32-openssl-1.1.1n-win32-bin.zip -- svn:mime-typ
