Re: [VOTE] Release Apache Tomcat 11.0.0-M9
> On Jul 4, 2023, at 19:00, Mark Thomas wrote: > > The proposed Apache Tomcat 11.0.0-M9 release is now available for > voting. > > Apache Tomcat 11.0.0-M9 is a milestone release of the 11.0.x branch and has > been made to provide users with early access to the new features in Apache > Tomcat 11.0.x so that they may provide feedback. The notable changes compared > to the previous milestone include: > > - Add ContextNamingInfoListener, a listener which creates context naming > information environment entries > > - Add PropertiesRoleMappingListener, a listener which populates the > context's role mapping from a properties file. > > - Update the Jakarta EL and Jakarta WebSocket implementations to align > with the latest changes planned for Jakarta EE 11 > > For full details, see the change log: > https://nightlies.apache.org/tomcat/tomcat-11.0.x/docs/changelog.html > > Applications that run on Tomcat 9 and earlier will not run on Tomcat 11 > without changes. Java EE applications designed for Tomcat 9 and earlier may > be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will > automatically convert them to Jakarta EE and copy them to the webapps > directory. Applications using deprecated APIs may require further changes. > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-11/v11.0.0-M9/ > > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1443 > > The tag is: > https://github.com/apache/tomcat/tree/11.0.0-M9 > de714a23642a4d0baef342db6762a7f7a550d82c > > > The proposed 11.0.0-M9 release is: > [ ] -1 Broken - do not release > [X ] +1 Alpha - go ahead and release as 11.0.0-M9 Tests pass on macOS(intel) Han > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] rainerjung commented on pull request #632: Add support for CIDR notation in `RemoteIpFilter`
rainerjung commented on PR #632: URL: https://github.com/apache/tomcat/pull/632#issuecomment-1620837870 Ah, sorry I just realized what you plan. Please ignore my reference to RemoteCIDRFilter. -- 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] rainerjung commented on pull request #632: Add support for CIDR notation in `RemoteIpFilter`
rainerjung commented on PR #632: URL: https://github.com/apache/tomcat/pull/632#issuecomment-1620836585 I have not looked at your implementation suggestion, but did you notice there is: https://tomcat.apache.org/tomcat-9.0-doc/config/filter.html#Remote_CIDR_Filter -- 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: Remove unnecessary code. pos is always updated again before next use
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 d58990bfc0 Remove unnecessary code. pos is always updated again before
next use
d58990bfc0 is described below
commit d58990bfc02692f32bc97de03df1ae92a1fe9946
Author: Mark Thomas
AuthorDate: Tue Jul 4 22:02:40 2023 +0100
Remove unnecessary code. pos is always updated again before next use
---
java/org/apache/catalina/valves/rewrite/Substitution.java | 2 --
1 file changed, 2 deletions(-)
diff --git a/java/org/apache/catalina/valves/rewrite/Substitution.java
b/java/org/apache/catalina/valves/rewrite/Substitution.java
index 2fa3e8d8a7..1e70de2fcd 100644
--- a/java/org/apache/catalina/valves/rewrite/Substitution.java
+++ b/java/org/apache/catalina/valves/rewrite/Substitution.java
@@ -163,7 +163,6 @@ public class Substitution {
// Static text
StaticElement newElement = new StaticElement();
newElement.value = sub.substring(pos, dollarPos);
-pos = dollarPos;
elements.add(newElement);
}
if (Character.isDigit(sub.charAt(dollarPos + 1))) {
@@ -215,7 +214,6 @@ public class Substitution {
// Static text
StaticElement newElement = new StaticElement();
newElement.value = sub.substring(pos, percentPos);
-pos = percentPos;
elements.add(newElement);
}
if (Character.isDigit(sub.charAt(percentPos + 1))) {
-
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 unnecessary code. pos is always updated again before next use
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 6fa8fd9b96 Remove unnecessary code. pos is always updated again before
next use
6fa8fd9b96 is described below
commit 6fa8fd9b963b14afe473fd664a3ef60e98b4190c
Author: Mark Thomas
AuthorDate: Tue Jul 4 22:02:40 2023 +0100
Remove unnecessary code. pos is always updated again before next use
---
java/org/apache/catalina/valves/rewrite/Substitution.java | 2 --
1 file changed, 2 deletions(-)
diff --git a/java/org/apache/catalina/valves/rewrite/Substitution.java
b/java/org/apache/catalina/valves/rewrite/Substitution.java
index 2fa3e8d8a7..1e70de2fcd 100644
--- a/java/org/apache/catalina/valves/rewrite/Substitution.java
+++ b/java/org/apache/catalina/valves/rewrite/Substitution.java
@@ -163,7 +163,6 @@ public class Substitution {
// Static text
StaticElement newElement = new StaticElement();
newElement.value = sub.substring(pos, dollarPos);
-pos = dollarPos;
elements.add(newElement);
}
if (Character.isDigit(sub.charAt(dollarPos + 1))) {
@@ -215,7 +214,6 @@ public class Substitution {
// Static text
StaticElement newElement = new StaticElement();
newElement.value = sub.substring(pos, percentPos);
-pos = percentPos;
elements.add(newElement);
}
if (Character.isDigit(sub.charAt(percentPos + 1))) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Remove unnecessary code. pos is always updated again before next use
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 6e0fc8d8f7 Remove unnecessary code. pos is always updated again before
next use
6e0fc8d8f7 is described below
commit 6e0fc8d8f7ca4653d3e187530c28283a20e003e9
Author: Mark Thomas
AuthorDate: Tue Jul 4 22:02:40 2023 +0100
Remove unnecessary code. pos is always updated again before next use
---
java/org/apache/catalina/valves/rewrite/Substitution.java | 2 --
1 file changed, 2 deletions(-)
diff --git a/java/org/apache/catalina/valves/rewrite/Substitution.java
b/java/org/apache/catalina/valves/rewrite/Substitution.java
index 2fa3e8d8a7..1e70de2fcd 100644
--- a/java/org/apache/catalina/valves/rewrite/Substitution.java
+++ b/java/org/apache/catalina/valves/rewrite/Substitution.java
@@ -163,7 +163,6 @@ public class Substitution {
// Static text
StaticElement newElement = new StaticElement();
newElement.value = sub.substring(pos, dollarPos);
-pos = dollarPos;
elements.add(newElement);
}
if (Character.isDigit(sub.charAt(dollarPos + 1))) {
@@ -215,7 +214,6 @@ public class Substitution {
// Static text
StaticElement newElement = new StaticElement();
newElement.value = sub.substring(pos, percentPos);
-pos = percentPos;
elements.add(newElement);
}
if (Character.isDigit(sub.charAt(percentPos + 1))) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Remove unnecessary code. pos is always updated again before next use
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 171cfff4f2 Remove unnecessary code. pos is always updated again before
next use
171cfff4f2 is described below
commit 171cfff4f260ab724c3bdf83219865a80c7efbf9
Author: Mark Thomas
AuthorDate: Tue Jul 4 22:02:40 2023 +0100
Remove unnecessary code. pos is always updated again before next use
---
java/org/apache/catalina/valves/rewrite/Substitution.java | 2 --
1 file changed, 2 deletions(-)
diff --git a/java/org/apache/catalina/valves/rewrite/Substitution.java
b/java/org/apache/catalina/valves/rewrite/Substitution.java
index 2fa3e8d8a7..1e70de2fcd 100644
--- a/java/org/apache/catalina/valves/rewrite/Substitution.java
+++ b/java/org/apache/catalina/valves/rewrite/Substitution.java
@@ -163,7 +163,6 @@ public class Substitution {
// Static text
StaticElement newElement = new StaticElement();
newElement.value = sub.substring(pos, dollarPos);
-pos = dollarPos;
elements.add(newElement);
}
if (Character.isDigit(sub.charAt(dollarPos + 1))) {
@@ -215,7 +214,6 @@ public class Substitution {
// Static text
StaticElement newElement = new StaticElement();
newElement.value = sub.substring(pos, percentPos);
-pos = percentPos;
elements.add(newElement);
}
if (Character.isDigit(sub.charAt(percentPos + 1))) {
-
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 comment
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 77aa0afe45 Fix comment
77aa0afe45 is described below
commit 77aa0afe4578b5375227642b16fab18c031645d0
Author: Mark Thomas
AuthorDate: Tue Jul 4 21:57:49 2023 +0100
Fix comment
---
java/org/apache/tomcat/util/net/AbstractEndpoint.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index bc78d0c90e..61961a39c2 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -427,7 +427,7 @@ public abstract class AbstractEndpoint {
MessageDigest sha512Digest = MessageDigest.getInstance("SHA-256");
sha512Digest.update(certBytes);
sb.append(HexUtils.toHexString(sha512Digest.digest()));
-// SHA-256 fingerprint
+// SHA-1 fingerprint
sb.append("\nSHA-1 fingerprint: ");
MessageDigest sha1Digest = MessageDigest.getInstance("SHA-1");
sha1Digest.update(certBytes);
-
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 comment
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 bf9451d81d Fix comment
bf9451d81d is described below
commit bf9451d81d84b8dca3d975e8d732b0673850cbda
Author: Mark Thomas
AuthorDate: Tue Jul 4 21:57:49 2023 +0100
Fix comment
---
java/org/apache/tomcat/util/net/AbstractEndpoint.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index 44a288ad79..9c203afd44 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -429,7 +429,7 @@ public abstract class AbstractEndpoint {
MessageDigest sha512Digest = MessageDigest.getInstance("SHA-256");
sha512Digest.update(certBytes);
sb.append(HexUtils.toHexString(sha512Digest.digest()));
-// SHA-256 fingerprint
+// SHA-1 fingerprint
sb.append("\nSHA-1 fingerprint: ");
MessageDigest sha1Digest = MessageDigest.getInstance("SHA-1");
sha1Digest.update(certBytes);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Fix comment
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new e2b6a94452 Fix comment
e2b6a94452 is described below
commit e2b6a94452b01aa1138d186dab98b22b075e7536
Author: Mark Thomas
AuthorDate: Tue Jul 4 21:57:49 2023 +0100
Fix comment
---
java/org/apache/tomcat/util/net/AbstractEndpoint.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index 071fa1c954..6a86799b8f 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -419,7 +419,7 @@ public abstract class AbstractEndpoint {
MessageDigest sha512Digest = MessageDigest.getInstance("SHA-256");
sha512Digest.update(certBytes);
sb.append(HexUtils.toHexString(sha512Digest.digest()));
-// SHA-256 fingerprint
+// SHA-1 fingerprint
sb.append("\nSHA-1 fingerprint: ");
MessageDigest sha1Digest = MessageDigest.getInstance("SHA-1");
sha1Digest.update(certBytes);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix comment
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 5c06874ecd Fix comment
5c06874ecd is described below
commit 5c06874ecd8db7211c678d7439f3d76250232e56
Author: Mark Thomas
AuthorDate: Tue Jul 4 21:57:49 2023 +0100
Fix comment
---
java/org/apache/tomcat/util/net/AbstractEndpoint.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index 13114d7552..0ce6c92ddb 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -474,7 +474,7 @@ public abstract class AbstractEndpoint {
MessageDigest sha512Digest = MessageDigest.getInstance("SHA-256");
sha512Digest.update(certBytes);
sb.append(HexUtils.toHexString(sha512Digest.digest()));
-// SHA-256 fingerprint
+// SHA-1 fingerprint
sb.append("\nSHA-1 fingerprint: ");
MessageDigest sha1Digest = MessageDigest.getInstance("SHA-1");
sha1Digest.update(certBytes);
-
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: Tokens should not contain or end at ')'
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 dfbf10d358 Tokens should not contain or end at ')'
dfbf10d358 is described below
commit dfbf10d35847c3db1e842bd6bf9ae09f75bc3e96
Author: Mark Thomas
AuthorDate: Tue Jul 4 21:45:08 2023 +0100
Tokens should not contain or end at ')'
---
.../catalina/valves/ExtendedAccessLogValve.java| 4 +--
.../apache/catalina/valves/LocalStrings.properties | 2 ++
.../catalina/valves/TestPatternTokenizer.java | 32 ++
webapps/docs/changelog.xml | 4 +++
4 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
index 5688e6f939..1da207da4d 100644
--- a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
+++ b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
@@ -420,9 +420,7 @@ public class ExtendedAccessLogValve extends AccessLogValve {
parameter = true;
return result;
case ')':
-result = buf.toString();
-buf.setLength(0);
-break;
+throw new
IOException(sm.getString("patternTokenizer.unexpectedParenthesis"));
default:
buf.append((char) c);
}
diff --git a/java/org/apache/catalina/valves/LocalStrings.properties
b/java/org/apache/catalina/valves/LocalStrings.properties
index 4ceab83a78..091327fe55 100644
--- a/java/org/apache/catalina/valves/LocalStrings.properties
+++ b/java/org/apache/catalina/valves/LocalStrings.properties
@@ -128,6 +128,8 @@ http.511.reason=Network Authentication Required
jdbcAccessLogValve.close=Failed to close database
jdbcAccessLogValve.exception=Exception performing insert access entry
+patternTokenizer.unexpectedParenthesis=Unexpected ')' in pattern
+
persistentValve.acquireFailed=The request for [{0}] did not obtain the per
session Semaphore as no permit was available
persistentValve.acquireInterrupted=The request for [{0}] did not obtain the
per session Semaphore as it was interrupted while waiting for a permit
persistentValve.filter.failure=Unable to compile filter=[{0}]
diff --git a/test/org/apache/catalina/valves/TestPatternTokenizer.java
b/test/org/apache/catalina/valves/TestPatternTokenizer.java
new file mode 100644
index 00..1b19637b46
--- /dev/null
+++ b/test/org/apache/catalina/valves/TestPatternTokenizer.java
@@ -0,0 +1,32 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.valves;
+
+import java.io.IOException;
+
+import org.junit.Test;
+
+import org.apache.catalina.valves.ExtendedAccessLogValve.PatternTokenizer;
+
+public class TestPatternTokenizer {
+
+@Test(expected = IOException.class)
+public void doUnexpectedParenthesis() throws IOException {
+String input = "a)aa)";
+PatternTokenizer tokenizer = new PatternTokenizer(input);
+tokenizer.getToken();
+}
+}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 977d8fe5cd..78a08b6b57 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -124,6 +124,10 @@
if the web applications were deliberately crafted to allow it even when
allowLinking was set to false. (markt)
+
+Make parsing of ExtendedAccessLogValve patterns more
+robust. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Tokens should not contain or end at ')'
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 c71cc1c0d8 Tokens should not contain or end at ')'
c71cc1c0d8 is described below
commit c71cc1c0d8bc55b4750b9aa9770e9223482d53a4
Author: Mark Thomas
AuthorDate: Tue Jul 4 21:45:08 2023 +0100
Tokens should not contain or end at ')'
---
.../catalina/valves/ExtendedAccessLogValve.java| 4 +--
.../apache/catalina/valves/LocalStrings.properties | 2 ++
.../catalina/valves/TestPatternTokenizer.java | 32 ++
webapps/docs/changelog.xml | 4 +++
4 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
index c175ca32ac..8b55b3552d 100644
--- a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
+++ b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
@@ -412,9 +412,7 @@ public class ExtendedAccessLogValve extends AccessLogValve {
parameter = true;
return result;
case ')':
-result = buf.toString();
-buf.setLength(0);
-break;
+throw new
IOException(sm.getString("patternTokenizer.unexpectedParenthesis"));
default:
buf.append((char) c);
}
diff --git a/java/org/apache/catalina/valves/LocalStrings.properties
b/java/org/apache/catalina/valves/LocalStrings.properties
index 4ceab83a78..091327fe55 100644
--- a/java/org/apache/catalina/valves/LocalStrings.properties
+++ b/java/org/apache/catalina/valves/LocalStrings.properties
@@ -128,6 +128,8 @@ http.511.reason=Network Authentication Required
jdbcAccessLogValve.close=Failed to close database
jdbcAccessLogValve.exception=Exception performing insert access entry
+patternTokenizer.unexpectedParenthesis=Unexpected ')' in pattern
+
persistentValve.acquireFailed=The request for [{0}] did not obtain the per
session Semaphore as no permit was available
persistentValve.acquireInterrupted=The request for [{0}] did not obtain the
per session Semaphore as it was interrupted while waiting for a permit
persistentValve.filter.failure=Unable to compile filter=[{0}]
diff --git a/test/org/apache/catalina/valves/TestPatternTokenizer.java
b/test/org/apache/catalina/valves/TestPatternTokenizer.java
new file mode 100644
index 00..1b19637b46
--- /dev/null
+++ b/test/org/apache/catalina/valves/TestPatternTokenizer.java
@@ -0,0 +1,32 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.valves;
+
+import java.io.IOException;
+
+import org.junit.Test;
+
+import org.apache.catalina.valves.ExtendedAccessLogValve.PatternTokenizer;
+
+public class TestPatternTokenizer {
+
+@Test(expected = IOException.class)
+public void doUnexpectedParenthesis() throws IOException {
+String input = "a)aa)";
+PatternTokenizer tokenizer = new PatternTokenizer(input);
+tokenizer.getToken();
+}
+}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9fd25f1703..f897437162 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -111,6 +111,10 @@
Fix potential database connection leaks in
DataSourceUserDatabase identified by Coverity Scan.
(markt)
+
+Make parsing of ExtendedAccessLogValve patterns more
+robust. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Tokens should not contain or end at ')'
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 03e28e8fc2 Tokens should not contain or end at ')'
03e28e8fc2 is described below
commit 03e28e8fc29367edcca4a4f8429e762e263ddd35
Author: Mark Thomas
AuthorDate: Tue Jul 4 21:45:08 2023 +0100
Tokens should not contain or end at ')'
---
.../catalina/valves/ExtendedAccessLogValve.java| 4 +--
.../apache/catalina/valves/LocalStrings.properties | 2 ++
.../catalina/valves/TestPatternTokenizer.java | 32 ++
webapps/docs/changelog.xml | 4 +++
4 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
index 86c87f5bf7..c9cba36f83 100644
--- a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
+++ b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
@@ -412,9 +412,7 @@ public class ExtendedAccessLogValve extends AccessLogValve {
parameter = true;
return result;
case ')':
-result = buf.toString();
-buf.setLength(0);
-break;
+throw new
IOException(sm.getString("patternTokenizer.unexpectedParenthesis"));
default:
buf.append((char) c);
}
diff --git a/java/org/apache/catalina/valves/LocalStrings.properties
b/java/org/apache/catalina/valves/LocalStrings.properties
index 4ceab83a78..091327fe55 100644
--- a/java/org/apache/catalina/valves/LocalStrings.properties
+++ b/java/org/apache/catalina/valves/LocalStrings.properties
@@ -128,6 +128,8 @@ http.511.reason=Network Authentication Required
jdbcAccessLogValve.close=Failed to close database
jdbcAccessLogValve.exception=Exception performing insert access entry
+patternTokenizer.unexpectedParenthesis=Unexpected ')' in pattern
+
persistentValve.acquireFailed=The request for [{0}] did not obtain the per
session Semaphore as no permit was available
persistentValve.acquireInterrupted=The request for [{0}] did not obtain the
per session Semaphore as it was interrupted while waiting for a permit
persistentValve.filter.failure=Unable to compile filter=[{0}]
diff --git a/test/org/apache/catalina/valves/TestPatternTokenizer.java
b/test/org/apache/catalina/valves/TestPatternTokenizer.java
new file mode 100644
index 00..1b19637b46
--- /dev/null
+++ b/test/org/apache/catalina/valves/TestPatternTokenizer.java
@@ -0,0 +1,32 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.valves;
+
+import java.io.IOException;
+
+import org.junit.Test;
+
+import org.apache.catalina.valves.ExtendedAccessLogValve.PatternTokenizer;
+
+public class TestPatternTokenizer {
+
+@Test(expected = IOException.class)
+public void doUnexpectedParenthesis() throws IOException {
+String input = "a)aa)";
+PatternTokenizer tokenizer = new PatternTokenizer(input);
+tokenizer.getToken();
+}
+}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 81c6bc07e6..dd78d44509 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -134,6 +134,10 @@
Fix potential database connection leaks in
DataSourceUserDatabase identified by Coverity Scan.
(markt)
+
+Make parsing of ExtendedAccessLogValve patterns more
+robust. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Tokens should not contain or end at ')'
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 8102eabebf Tokens should not contain or end at ')'
8102eabebf is described below
commit 8102eabebf8ad44d3ee4af1feafcb7138afbe230
Author: Mark Thomas
AuthorDate: Tue Jul 4 21:45:08 2023 +0100
Tokens should not contain or end at ')'
---
.../catalina/valves/ExtendedAccessLogValve.java| 4 +--
.../apache/catalina/valves/LocalStrings.properties | 2 ++
.../catalina/valves/TestPatternTokenizer.java | 32 ++
webapps/docs/changelog.xml | 4 +++
4 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
index 86c87f5bf7..c9cba36f83 100644
--- a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
+++ b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
@@ -412,9 +412,7 @@ public class ExtendedAccessLogValve extends AccessLogValve {
parameter = true;
return result;
case ')':
-result = buf.toString();
-buf.setLength(0);
-break;
+throw new
IOException(sm.getString("patternTokenizer.unexpectedParenthesis"));
default:
buf.append((char) c);
}
diff --git a/java/org/apache/catalina/valves/LocalStrings.properties
b/java/org/apache/catalina/valves/LocalStrings.properties
index 670f120748..7c03cbe25d 100644
--- a/java/org/apache/catalina/valves/LocalStrings.properties
+++ b/java/org/apache/catalina/valves/LocalStrings.properties
@@ -130,6 +130,8 @@ http.511.reason=Network Authentication Required
jdbcAccessLogValve.close=Failed to close database
jdbcAccessLogValve.exception=Exception performing insert access entry
+patternTokenizer.unexpectedParenthesis=Unexpected ')' in pattern
+
persistentValve.acquireFailed=The request for [{0}] did not obtain the per
session Semaphore as no permit was available
persistentValve.acquireInterrupted=The request for [{0}] did not obtain the
per session Semaphore as it was interrupted while waiting for a permit
persistentValve.filter.failure=Unable to compile filter=[{0}]
diff --git a/test/org/apache/catalina/valves/TestPatternTokenizer.java
b/test/org/apache/catalina/valves/TestPatternTokenizer.java
new file mode 100644
index 00..1b19637b46
--- /dev/null
+++ b/test/org/apache/catalina/valves/TestPatternTokenizer.java
@@ -0,0 +1,32 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.valves;
+
+import java.io.IOException;
+
+import org.junit.Test;
+
+import org.apache.catalina.valves.ExtendedAccessLogValve.PatternTokenizer;
+
+public class TestPatternTokenizer {
+
+@Test(expected = IOException.class)
+public void doUnexpectedParenthesis() throws IOException {
+String input = "a)aa)";
+PatternTokenizer tokenizer = new PatternTokenizer(input);
+tokenizer.getToken();
+}
+}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 671cffadfa..0d5cbaa0bb 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -111,6 +111,10 @@
Fix potential database connection leaks in
DataSourceUserDatabase identified by Coverity Scan.
(markt)
+
+Make parsing of ExtendedAccessLogValve patterns more
+robust. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Fix potential resource leaks
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new b0702119b6 Fix potential resource leaks
b0702119b6 is described below
commit b0702119b613b3f705e4e552e84d76ad3bcf236a
Author: Mark Thomas
AuthorDate: Tue Jul 4 20:21:11 2023 +0100
Fix potential resource leaks
---
.../catalina/users/DataSourceUserDatabase.java | 58 +++---
webapps/docs/changelog.xml | 4 ++
2 files changed, 32 insertions(+), 30 deletions(-)
diff --git a/java/org/apache/catalina/users/DataSourceUserDatabase.java
b/java/org/apache/catalina/users/DataSourceUserDatabase.java
index 47a7a4a42e..d79082d758 100644
--- a/java/org/apache/catalina/users/DataSourceUserDatabase.java
+++ b/java/org/apache/catalina/users/DataSourceUserDatabase.java
@@ -465,27 +465,26 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
groups.putAll(createdGroups);
groups.putAll(modifiedGroups);
-Connection dbConnection = openConnection();
-if (dbConnection != null && preparedAllGroups != null) {
-try (PreparedStatement stmt =
dbConnection.prepareStatement(preparedAllGroups)) {
-try (ResultSet rs = stmt.executeQuery()) {
-while (rs.next()) {
-String groupName = rs.getString(1);
-if (groupName != null) {
-if (!groups.containsKey(groupName) &&
!removedGroups.containsKey(groupName)) {
-Group group =
findGroupInternal(dbConnection, groupName);
-if (group != null) {
-groups.put(groupName, group);
+try (Connection dbConnection = openConnection()) {
+if (dbConnection != null && preparedAllGroups != null) {
+try (PreparedStatement stmt =
dbConnection.prepareStatement(preparedAllGroups)) {
+try (ResultSet rs = stmt.executeQuery()) {
+while (rs.next()) {
+String groupName = rs.getString(1);
+if (groupName != null) {
+if (!groups.containsKey(groupName) &&
!removedGroups.containsKey(groupName)) {
+Group group =
findGroupInternal(dbConnection, groupName);
+if (group != null) {
+groups.put(groupName, group);
+}
}
}
}
}
}
-} catch (SQLException e) {
-
log.error(sm.getString("dataSourceUserDatabase.exception"), e);
-} finally {
-closeConnection(dbConnection);
}
+} catch (SQLException e) {
+
log.error(sm.getString("dataSourceUserDatabase.exception"), e);
}
return groups.values().iterator();
} finally {
@@ -506,27 +505,26 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
roles.putAll(createdRoles);
roles.putAll(modifiedRoles);
-Connection dbConnection = openConnection();
-if (dbConnection != null && preparedAllRoles != null) {
-try (PreparedStatement stmt =
dbConnection.prepareStatement(preparedAllRoles)) {
-try (ResultSet rs = stmt.executeQuery()) {
-while (rs.next()) {
-String roleName = rs.getString(1);
-if (roleName != null) {
-if (!roles.containsKey(roleName) &&
!removedRoles.containsKey(roleName)) {
-Role role =
findRoleInternal(dbConnection, roleName);
-if (role != null) {
-roles.put(roleName, role);
+try (Connection dbConnection = openConnection()) {
+if (dbConnection != null && preparedAllRoles != null) {
+try (PreparedStatement stmt =
dbConnection.prepareStatement(preparedAllRoles)) {
+try (ResultSet rs = stmt.executeQuery()) {
+while (rs.next()) {
+String roleName
[tomcat] 01/02: Increment version for next development cycle
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 2eae3f7f5665e3479d9e13ce436b6ee90d648cba Author: Mark Thomas AuthorDate: Tue Jul 4 20:18:34 2023 +0100 Increment version for next development cycle --- build.properties.default | 2 +- res/maven/mvn.properties.default | 2 +- webapps/docs/changelog.xml | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.properties.default b/build.properties.default index d7704a2349..013329919a 100644 --- a/build.properties.default +++ b/build.properties.default @@ -33,7 +33,7 @@ version.major=11 version.minor=0 version.build=0 version.patch=0 -version.suffix=-M9 +version.suffix=-M10 version.dev=-dev # - Build tools - diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default index 40f701f0e2..94795ac67f 100644 --- a/res/maven/mvn.properties.default +++ b/res/maven/mvn.properties.default @@ -39,7 +39,7 @@ maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d maven.asf.release.repo.repositoryId=apache.releases.https # Release version info -maven.asf.release.deploy.version=11.0.0-M9 +maven.asf.release.deploy.version=11.0.0-M10 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index c15078d332..142b486c3b 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -104,7 +104,9 @@ They eventually become mixed with the numbered issues (i.e., numbered issues do not "pop up" wrt. others). --> - + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix potential resource leaks
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 e8820039fe Fix potential resource leaks
e8820039fe is described below
commit e8820039fecb7af5c5762ef19c1c756618bae368
Author: Mark Thomas
AuthorDate: Tue Jul 4 20:21:11 2023 +0100
Fix potential resource leaks
---
.../catalina/users/DataSourceUserDatabase.java | 58 +++---
webapps/docs/changelog.xml | 8 +++
2 files changed, 36 insertions(+), 30 deletions(-)
diff --git a/java/org/apache/catalina/users/DataSourceUserDatabase.java
b/java/org/apache/catalina/users/DataSourceUserDatabase.java
index 47a7a4a42e..d79082d758 100644
--- a/java/org/apache/catalina/users/DataSourceUserDatabase.java
+++ b/java/org/apache/catalina/users/DataSourceUserDatabase.java
@@ -465,27 +465,26 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
groups.putAll(createdGroups);
groups.putAll(modifiedGroups);
-Connection dbConnection = openConnection();
-if (dbConnection != null && preparedAllGroups != null) {
-try (PreparedStatement stmt =
dbConnection.prepareStatement(preparedAllGroups)) {
-try (ResultSet rs = stmt.executeQuery()) {
-while (rs.next()) {
-String groupName = rs.getString(1);
-if (groupName != null) {
-if (!groups.containsKey(groupName) &&
!removedGroups.containsKey(groupName)) {
-Group group =
findGroupInternal(dbConnection, groupName);
-if (group != null) {
-groups.put(groupName, group);
+try (Connection dbConnection = openConnection()) {
+if (dbConnection != null && preparedAllGroups != null) {
+try (PreparedStatement stmt =
dbConnection.prepareStatement(preparedAllGroups)) {
+try (ResultSet rs = stmt.executeQuery()) {
+while (rs.next()) {
+String groupName = rs.getString(1);
+if (groupName != null) {
+if (!groups.containsKey(groupName) &&
!removedGroups.containsKey(groupName)) {
+Group group =
findGroupInternal(dbConnection, groupName);
+if (group != null) {
+groups.put(groupName, group);
+}
}
}
}
}
}
-} catch (SQLException e) {
-
log.error(sm.getString("dataSourceUserDatabase.exception"), e);
-} finally {
-closeConnection(dbConnection);
}
+} catch (SQLException e) {
+
log.error(sm.getString("dataSourceUserDatabase.exception"), e);
}
return groups.values().iterator();
} finally {
@@ -506,27 +505,26 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
roles.putAll(createdRoles);
roles.putAll(modifiedRoles);
-Connection dbConnection = openConnection();
-if (dbConnection != null && preparedAllRoles != null) {
-try (PreparedStatement stmt =
dbConnection.prepareStatement(preparedAllRoles)) {
-try (ResultSet rs = stmt.executeQuery()) {
-while (rs.next()) {
-String roleName = rs.getString(1);
-if (roleName != null) {
-if (!roles.containsKey(roleName) &&
!removedRoles.containsKey(roleName)) {
-Role role =
findRoleInternal(dbConnection, roleName);
-if (role != null) {
-roles.put(roleName, role);
+try (Connection dbConnection = openConnection()) {
+if (dbConnection != null && preparedAllRoles != null) {
+try (PreparedStatement stmt =
dbConnection.prepareStatement(preparedAllRoles)) {
+try (ResultSet rs = stmt.executeQuery()) {
+while (rs.next()) {
+String roleName =
[tomcat] 02/02: Fix potential resource leaks
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 3ca1ca2ad3beecd975860d331ade5869023ccabc
Author: Mark Thomas
AuthorDate: Tue Jul 4 20:21:11 2023 +0100
Fix potential resource leaks
---
.../catalina/users/DataSourceUserDatabase.java | 58 +++---
webapps/docs/changelog.xml | 8 +++
2 files changed, 36 insertions(+), 30 deletions(-)
diff --git a/java/org/apache/catalina/users/DataSourceUserDatabase.java
b/java/org/apache/catalina/users/DataSourceUserDatabase.java
index 47a7a4a42e..d79082d758 100644
--- a/java/org/apache/catalina/users/DataSourceUserDatabase.java
+++ b/java/org/apache/catalina/users/DataSourceUserDatabase.java
@@ -465,27 +465,26 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
groups.putAll(createdGroups);
groups.putAll(modifiedGroups);
-Connection dbConnection = openConnection();
-if (dbConnection != null && preparedAllGroups != null) {
-try (PreparedStatement stmt =
dbConnection.prepareStatement(preparedAllGroups)) {
-try (ResultSet rs = stmt.executeQuery()) {
-while (rs.next()) {
-String groupName = rs.getString(1);
-if (groupName != null) {
-if (!groups.containsKey(groupName) &&
!removedGroups.containsKey(groupName)) {
-Group group =
findGroupInternal(dbConnection, groupName);
-if (group != null) {
-groups.put(groupName, group);
+try (Connection dbConnection = openConnection()) {
+if (dbConnection != null && preparedAllGroups != null) {
+try (PreparedStatement stmt =
dbConnection.prepareStatement(preparedAllGroups)) {
+try (ResultSet rs = stmt.executeQuery()) {
+while (rs.next()) {
+String groupName = rs.getString(1);
+if (groupName != null) {
+if (!groups.containsKey(groupName) &&
!removedGroups.containsKey(groupName)) {
+Group group =
findGroupInternal(dbConnection, groupName);
+if (group != null) {
+groups.put(groupName, group);
+}
}
}
}
}
}
-} catch (SQLException e) {
-
log.error(sm.getString("dataSourceUserDatabase.exception"), e);
-} finally {
-closeConnection(dbConnection);
}
+} catch (SQLException e) {
+
log.error(sm.getString("dataSourceUserDatabase.exception"), e);
}
return groups.values().iterator();
} finally {
@@ -506,27 +505,26 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
roles.putAll(createdRoles);
roles.putAll(modifiedRoles);
-Connection dbConnection = openConnection();
-if (dbConnection != null && preparedAllRoles != null) {
-try (PreparedStatement stmt =
dbConnection.prepareStatement(preparedAllRoles)) {
-try (ResultSet rs = stmt.executeQuery()) {
-while (rs.next()) {
-String roleName = rs.getString(1);
-if (roleName != null) {
-if (!roles.containsKey(roleName) &&
!removedRoles.containsKey(roleName)) {
-Role role =
findRoleInternal(dbConnection, roleName);
-if (role != null) {
-roles.put(roleName, role);
+try (Connection dbConnection = openConnection()) {
+if (dbConnection != null && preparedAllRoles != null) {
+try (PreparedStatement stmt =
dbConnection.prepareStatement(preparedAllRoles)) {
+try (ResultSet rs = stmt.executeQuery()) {
+while (rs.next()) {
+String roleName = rs.getString(1);
+if (roleName != null) {
+if (!roles.containsKey(roleName
[tomcat] branch main updated (06d0c35557 -> 3ca1ca2ad3)
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 06d0c35557 Explicitly close streams new 2eae3f7f56 Increment version for next development cycle new 3ca1ca2ad3 Fix potential resource leaks The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: build.properties.default | 2 +- .../catalina/users/DataSourceUserDatabase.java | 58 +++--- res/maven/mvn.properties.default | 2 +- webapps/docs/changelog.xml | 12 - 4 files changed, 41 insertions(+), 33 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] fabien-chebel opened a new pull request, #632: Add support for CIDR notation in `RemoteIpFilter`
fabien-chebel opened a new pull request, #632: URL: https://github.com/apache/tomcat/pull/632 # Context Tomcat's `RemoteIpFilter` currently allows configuring trusted/internal proxies using regexp. When integrating with reverse proxies with a large number of IP addresses, regexp configuration gets cumbersome. # Suggestion I suggest adding support for IP ranges in CIDR notation to make it easier to setup the filter in these cases. For backward compatibility, matching with masks is only performed when the trusted/internal proxies patterns are null. Depending on the feedback I receive on this PR, I may add the same changes to Tomcat's `RemoteIpValve`. -- 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: Explicitly close streams
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 3470c22e20 Explicitly close streams
3470c22e20 is described below
commit 3470c22e2073287762af28c946a1a665ba541c4a
Author: Mark Thomas
AuthorDate: Tue Jul 4 20:09:51 2023 +0100
Explicitly close streams
---
java/org/apache/catalina/ssi/SSIExec.java | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/catalina/ssi/SSIExec.java
b/java/org/apache/catalina/ssi/SSIExec.java
index 2f7493c207..729281be7b 100644
--- a/java/org/apache/catalina/ssi/SSIExec.java
+++ b/java/org/apache/catalina/ssi/SSIExec.java
@@ -58,13 +58,12 @@ public class SSIExec implements SSICommand {
Runtime rt = Runtime.getRuntime();
Process proc = rt.exec(substitutedValue);
foundProgram = true;
-BufferedReader stdOutReader = new BufferedReader(
-new InputStreamReader(proc.getInputStream()));
-BufferedReader stdErrReader = new BufferedReader(
-new InputStreamReader(proc.getErrorStream()));
char[] buf = new char[BUFFER_SIZE];
-IOTools.flow(stdErrReader, writer, buf);
-IOTools.flow(stdOutReader, writer, buf);
+try (BufferedReader stdOutReader = new BufferedReader(new
InputStreamReader(proc.getInputStream()));
+BufferedReader stdErrReader = new BufferedReader(new
InputStreamReader(proc.getErrorStream()));) {
+IOTools.flow(stdErrReader, writer, buf);
+IOTools.flow(stdOutReader, writer, buf);
+}
proc.waitFor();
lastModified = System.currentTimeMillis();
} catch (InterruptedException e) {
-
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: Explicitly close streams
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 e0cc43f719 Explicitly close streams
e0cc43f719 is described below
commit e0cc43f719881f57585895120aff56d9acd0f220
Author: Mark Thomas
AuthorDate: Tue Jul 4 20:09:51 2023 +0100
Explicitly close streams
---
java/org/apache/catalina/ssi/SSIExec.java | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/catalina/ssi/SSIExec.java
b/java/org/apache/catalina/ssi/SSIExec.java
index 605f7fa6db..d05eb3ee23 100644
--- a/java/org/apache/catalina/ssi/SSIExec.java
+++ b/java/org/apache/catalina/ssi/SSIExec.java
@@ -60,13 +60,12 @@ public class SSIExec implements SSICommand {
Runtime rt = Runtime.getRuntime();
Process proc = rt.exec(substitutedValue);
foundProgram = true;
-BufferedReader stdOutReader = new BufferedReader(
-new InputStreamReader(proc.getInputStream()));
-BufferedReader stdErrReader = new BufferedReader(
-new InputStreamReader(proc.getErrorStream()));
char[] buf = new char[BUFFER_SIZE];
-IOTools.flow(stdErrReader, writer, buf);
-IOTools.flow(stdOutReader, writer, buf);
+try (BufferedReader stdOutReader = new BufferedReader(new
InputStreamReader(proc.getInputStream()));
+BufferedReader stdErrReader = new BufferedReader(new
InputStreamReader(proc.getErrorStream()));) {
+IOTools.flow(stdErrReader, writer, buf);
+IOTools.flow(stdOutReader, writer, buf);
+}
proc.waitFor();
lastModified = System.currentTimeMillis();
} catch (InterruptedException e) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Explicitly close streams
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 90d9ec5823 Explicitly close streams
90d9ec5823 is described below
commit 90d9ec582341ee2f032876cc0c2282a815c9b11f
Author: Mark Thomas
AuthorDate: Tue Jul 4 20:09:51 2023 +0100
Explicitly close streams
---
java/org/apache/catalina/ssi/SSIExec.java | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/catalina/ssi/SSIExec.java
b/java/org/apache/catalina/ssi/SSIExec.java
index 605f7fa6db..d05eb3ee23 100644
--- a/java/org/apache/catalina/ssi/SSIExec.java
+++ b/java/org/apache/catalina/ssi/SSIExec.java
@@ -60,13 +60,12 @@ public class SSIExec implements SSICommand {
Runtime rt = Runtime.getRuntime();
Process proc = rt.exec(substitutedValue);
foundProgram = true;
-BufferedReader stdOutReader = new BufferedReader(
-new InputStreamReader(proc.getInputStream()));
-BufferedReader stdErrReader = new BufferedReader(
-new InputStreamReader(proc.getErrorStream()));
char[] buf = new char[BUFFER_SIZE];
-IOTools.flow(stdErrReader, writer, buf);
-IOTools.flow(stdOutReader, writer, buf);
+try (BufferedReader stdOutReader = new BufferedReader(new
InputStreamReader(proc.getInputStream()));
+BufferedReader stdErrReader = new BufferedReader(new
InputStreamReader(proc.getErrorStream()));) {
+IOTools.flow(stdErrReader, writer, buf);
+IOTools.flow(stdOutReader, writer, buf);
+}
proc.waitFor();
lastModified = System.currentTimeMillis();
} catch (InterruptedException e) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Explicitly close streams
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 06d0c35557 Explicitly close streams
06d0c35557 is described below
commit 06d0c3555728ee2aee6ed7759746353cdd344846
Author: Mark Thomas
AuthorDate: Tue Jul 4 20:09:51 2023 +0100
Explicitly close streams
---
java/org/apache/catalina/ssi/SSIExec.java | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/catalina/ssi/SSIExec.java
b/java/org/apache/catalina/ssi/SSIExec.java
index e85c849106..997ef08703 100644
--- a/java/org/apache/catalina/ssi/SSIExec.java
+++ b/java/org/apache/catalina/ssi/SSIExec.java
@@ -65,13 +65,12 @@ public class SSIExec implements SSICommand {
}
Process proc = rt.exec(cmdArray);
foundProgram = true;
-BufferedReader stdOutReader = new BufferedReader(
-new InputStreamReader(proc.getInputStream()));
-BufferedReader stdErrReader = new BufferedReader(
-new InputStreamReader(proc.getErrorStream()));
char[] buf = new char[BUFFER_SIZE];
-IOTools.flow(stdErrReader, writer, buf);
-IOTools.flow(stdOutReader, writer, buf);
+try (BufferedReader stdOutReader = new BufferedReader(new
InputStreamReader(proc.getInputStream()));
+BufferedReader stdErrReader = new BufferedReader(new
InputStreamReader(proc.getErrorStream()));) {
+IOTools.flow(stdErrReader, writer, buf);
+IOTools.flow(stdOutReader, writer, buf);
+}
proc.waitFor();
lastModified = System.currentTimeMillis();
} catch (InterruptedException e) {
-
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: Use canonical context path.
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 36881daa48 Use canonical context path.
36881daa48 is described below
commit 36881daa4847f24eb5df130dc0564fa82effaddd
Author: Mark Thomas
AuthorDate: Tue Jul 4 19:10:30 2023 +0100
Use canonical context path.
This is more efficient and resolves a handful of Coverity Scan false
positives.
---
.../catalina/manager/HTMLManagerServlet.java | 26 +++---
.../catalina/manager/StatusManagerServlet.java | 14 ++--
.../manager/host/HTMLHostManagerServlet.java | 18 +++
3 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/java/org/apache/catalina/manager/HTMLManagerServlet.java
b/java/org/apache/catalina/manager/HTMLManagerServlet.java
index e154e61089..9c680346b9 100644
--- a/java/org/apache/catalina/manager/HTMLManagerServlet.java
+++ b/java/org/apache/catalina/manager/HTMLManagerServlet.java
@@ -342,7 +342,7 @@ public final class HTMLManagerServlet extends
ManagerServlet {
PrintWriter writer = response.getWriter();
Object[] args = new Object[2];
-args[0] = request.getContextPath();
+args[0] = getServletContext().getContextPath();
args[1] = smClient.getString("htmlManagerServlet.title");
// HTML Header Section
@@ -367,18 +367,18 @@ public final class HTMLManagerServlet extends
ManagerServlet {
// Manager Section
args = new Object[9];
args[0] = smClient.getString("htmlManagerServlet.manager");
-args[1] = response.encodeURL(request.getContextPath() + "/html/list");
+args[1] = response.encodeURL(getServletContext().getContextPath() +
"/html/list");
args[2] = smClient.getString("htmlManagerServlet.list");
args[3] = // External link
-(request.getContextPath() + "/" +
+(getServletContext().getContextPath() + "/" +
smClient.getString("htmlManagerServlet.helpHtmlManagerFile"));
args[4] = smClient.getString("htmlManagerServlet.helpHtmlManager");
args[5] = // External link
-(request.getContextPath() + "/" +
+(getServletContext().getContextPath() + "/" +
smClient.getString("htmlManagerServlet.helpManagerFile"));
args[6] = smClient.getString("htmlManagerServlet.helpManager");
args[7] = response.encodeURL
-(request.getContextPath() + "/status");
+(getServletContext().getContextPath() + "/status");
args[8] = smClient.getString("statusServlet.title");
writer.print(MessageFormat.format(Constants.MANAGER_SECTION, args));
@@ -469,7 +469,7 @@ public final class HTMLManagerServlet extends
ManagerServlet {
args[2] = Escape.htmlElementContent(ctxt.getDisplayName());
}
args[3] = Boolean.valueOf(ctxt.getState().isAvailable());
-args[4] =
Escape.htmlElementContent(response.encodeURL(request.getContextPath() +
+args[4] =
Escape.htmlElementContent(response.encodeURL(getServletContext().getContextPath()
+
"/html/sessions?" + pathVersion));
Manager manager = ctxt.getManager();
if (manager instanceof DistributedManager &&
showProxySessions) {
@@ -535,7 +535,7 @@ public final class HTMLManagerServlet extends
ManagerServlet {
args = new Object[7];
args[0] = smClient.getString("htmlManagerServlet.deployTitle");
args[1] = smClient.getString("htmlManagerServlet.deployServer");
-args[2] = response.encodeURL(request.getContextPath() +
"/html/deploy");
+args[2] = response.encodeURL(getServletContext().getContextPath() +
"/html/deploy");
args[3] = smClient.getString("htmlManagerServlet.deployPath");
args[4] = smClient.getString("htmlManagerServlet.deployConfig");
args[5] = smClient.getString("htmlManagerServlet.deployWar");
@@ -544,7 +544,7 @@ public final class HTMLManagerServlet extends
ManagerServlet {
args = new Object[4];
args[0] = smClient.getString("htmlManagerServlet.deployUpload");
-args[1] = response.encodeURL(request.getContextPath() +
"/html/upload");
+args[1] = response.encodeURL(getServletContext().getContextPath() +
"/html/upload");
args[2] = smClient.getString("htmlManagerServlet.deployUploadFile");
args[3] = smClient.getString("htmlManagerServlet.deployButton");
writer.print(MessageFormat.format(UPLOAD_SECTION, args));
@@ -553,7 +553,7 @@ public final class HTMLManagerServlet extends
ManagerServlet {
args = new Object[5];
args[0] = smClient.getString("htmlManagerServlet.configTitle");
args[1] =
smClient.getString("htmlManagerServl
[tomcat] branch 9.0.x updated: Use canonical context path.
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 5b1cd9f7cf Use canonical context path.
5b1cd9f7cf is described below
commit 5b1cd9f7cf678ffe6c78ef8cfd8f0bdf3ef7e6d3
Author: Mark Thomas
AuthorDate: Tue Jul 4 19:10:30 2023 +0100
Use canonical context path.
This is more efficient and resolves a handful of Coverity Scan false
positives.
---
.../catalina/manager/HTMLManagerServlet.java | 26 +++---
.../catalina/manager/StatusManagerServlet.java | 14 ++--
.../manager/host/HTMLHostManagerServlet.java | 18 +++
3 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/java/org/apache/catalina/manager/HTMLManagerServlet.java
b/java/org/apache/catalina/manager/HTMLManagerServlet.java
index 13b548a83a..d38777d9a9 100644
--- a/java/org/apache/catalina/manager/HTMLManagerServlet.java
+++ b/java/org/apache/catalina/manager/HTMLManagerServlet.java
@@ -346,7 +346,7 @@ public final class HTMLManagerServlet extends
ManagerServlet {
PrintWriter writer = response.getWriter();
Object[] args = new Object[2];
-args[0] = request.getContextPath();
+args[0] = getServletContext().getContextPath();
args[1] = smClient.getString("htmlManagerServlet.title");
// HTML Header Section
@@ -371,18 +371,18 @@ public final class HTMLManagerServlet extends
ManagerServlet {
// Manager Section
args = new Object[9];
args[0] = smClient.getString("htmlManagerServlet.manager");
-args[1] = response.encodeURL(request.getContextPath() + "/html/list");
+args[1] = response.encodeURL(getServletContext().getContextPath() +
"/html/list");
args[2] = smClient.getString("htmlManagerServlet.list");
args[3] = // External link
-(request.getContextPath() + "/" +
+(getServletContext().getContextPath() + "/" +
smClient.getString("htmlManagerServlet.helpHtmlManagerFile"));
args[4] = smClient.getString("htmlManagerServlet.helpHtmlManager");
args[5] = // External link
-(request.getContextPath() + "/" +
+(getServletContext().getContextPath() + "/" +
smClient.getString("htmlManagerServlet.helpManagerFile"));
args[6] = smClient.getString("htmlManagerServlet.helpManager");
args[7] = response.encodeURL
-(request.getContextPath() + "/status");
+(getServletContext().getContextPath() + "/status");
args[8] = smClient.getString("statusServlet.title");
writer.print(MessageFormat.format(Constants.MANAGER_SECTION, args));
@@ -473,7 +473,7 @@ public final class HTMLManagerServlet extends
ManagerServlet {
args[2] = Escape.htmlElementContent(ctxt.getDisplayName());
}
args[3] = Boolean.valueOf(ctxt.getState().isAvailable());
-args[4] =
Escape.htmlElementContent(response.encodeURL(request.getContextPath() +
+args[4] =
Escape.htmlElementContent(response.encodeURL(getServletContext().getContextPath()
+
"/html/sessions?" + pathVersion));
Manager manager = ctxt.getManager();
if (manager instanceof DistributedManager &&
showProxySessions) {
@@ -539,7 +539,7 @@ public final class HTMLManagerServlet extends
ManagerServlet {
args = new Object[8];
args[0] = smClient.getString("htmlManagerServlet.deployTitle");
args[1] = smClient.getString("htmlManagerServlet.deployServer");
-args[2] = response.encodeURL(request.getContextPath() +
"/html/deploy");
+args[2] = response.encodeURL(getServletContext().getContextPath() +
"/html/deploy");
args[3] = smClient.getString("htmlManagerServlet.deployPath");
args[4] = smClient.getString("htmlManagerServlet.deployVersion");
args[5] = smClient.getString("htmlManagerServlet.deployConfig");
@@ -549,7 +549,7 @@ public final class HTMLManagerServlet extends
ManagerServlet {
args = new Object[4];
args[0] = smClient.getString("htmlManagerServlet.deployUpload");
-args[1] = response.encodeURL(request.getContextPath() +
"/html/upload");
+args[1] = response.encodeURL(getServletContext().getContextPath() +
"/html/upload");
args[2] = smClient.getString("htmlManagerServlet.deployUploadFile");
args[3] = smClient.getString("htmlManagerServlet.deployButton");
writer.print(MessageFormat.format(UPLOAD_SECTION, args));
@@ -558,7 +558,7 @@ public final class HTMLManagerServlet extends
ManagerServlet {
args = new Object[5];
args[0] = smClient.getString("htmlManagerServlet.configTitle");
args[1] =
smClient.getString("htmlManagerS
[tomcat] branch 10.1.x updated: Use canonical context path.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new d737daceba Use canonical context path.
d737daceba is described below
commit d737dacebad3221509d1c15f8a39cfd9a891e7d0
Author: Mark Thomas
AuthorDate: Tue Jul 4 19:10:30 2023 +0100
Use canonical context path.
This is more efficient and resolves a handful of Coverity Scan false
positives.
---
.../catalina/manager/HTMLManagerServlet.java | 26 +++---
.../catalina/manager/StatusManagerServlet.java | 14 ++--
.../manager/host/HTMLHostManagerServlet.java | 18 +++
3 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/java/org/apache/catalina/manager/HTMLManagerServlet.java
b/java/org/apache/catalina/manager/HTMLManagerServlet.java
index b6375ca22a..f990f462af 100644
--- a/java/org/apache/catalina/manager/HTMLManagerServlet.java
+++ b/java/org/apache/catalina/manager/HTMLManagerServlet.java
@@ -346,7 +346,7 @@ public final class HTMLManagerServlet extends
ManagerServlet {
PrintWriter writer = response.getWriter();
Object[] args = new Object[2];
-args[0] = request.getContextPath();
+args[0] = getServletContext().getContextPath();
args[1] = smClient.getString("htmlManagerServlet.title");
// HTML Header Section
@@ -371,18 +371,18 @@ public final class HTMLManagerServlet extends
ManagerServlet {
// Manager Section
args = new Object[9];
args[0] = smClient.getString("htmlManagerServlet.manager");
-args[1] = response.encodeURL(request.getContextPath() + "/html/list");
+args[1] = response.encodeURL(getServletContext().getContextPath() +
"/html/list");
args[2] = smClient.getString("htmlManagerServlet.list");
args[3] = // External link
-(request.getContextPath() + "/" +
+(getServletContext().getContextPath() + "/" +
smClient.getString("htmlManagerServlet.helpHtmlManagerFile"));
args[4] = smClient.getString("htmlManagerServlet.helpHtmlManager");
args[5] = // External link
-(request.getContextPath() + "/" +
+(getServletContext().getContextPath() + "/" +
smClient.getString("htmlManagerServlet.helpManagerFile"));
args[6] = smClient.getString("htmlManagerServlet.helpManager");
args[7] = response.encodeURL
-(request.getContextPath() + "/status");
+(getServletContext().getContextPath() + "/status");
args[8] = smClient.getString("statusServlet.title");
writer.print(MessageFormat.format(Constants.MANAGER_SECTION, args));
@@ -473,7 +473,7 @@ public final class HTMLManagerServlet extends
ManagerServlet {
args[2] = Escape.htmlElementContent(ctxt.getDisplayName());
}
args[3] = Boolean.valueOf(ctxt.getState().isAvailable());
-args[4] =
Escape.htmlElementContent(response.encodeURL(request.getContextPath() +
+args[4] =
Escape.htmlElementContent(response.encodeURL(getServletContext().getContextPath()
+
"/html/sessions?" + pathVersion));
Manager manager = ctxt.getManager();
if (manager instanceof DistributedManager &&
showProxySessions) {
@@ -539,7 +539,7 @@ public final class HTMLManagerServlet extends
ManagerServlet {
args = new Object[8];
args[0] = smClient.getString("htmlManagerServlet.deployTitle");
args[1] = smClient.getString("htmlManagerServlet.deployServer");
-args[2] = response.encodeURL(request.getContextPath() +
"/html/deploy");
+args[2] = response.encodeURL(getServletContext().getContextPath() +
"/html/deploy");
args[3] = smClient.getString("htmlManagerServlet.deployPath");
args[4] = smClient.getString("htmlManagerServlet.deployVersion");
args[5] = smClient.getString("htmlManagerServlet.deployConfig");
@@ -549,7 +549,7 @@ public final class HTMLManagerServlet extends
ManagerServlet {
args = new Object[4];
args[0] = smClient.getString("htmlManagerServlet.deployUpload");
-args[1] = response.encodeURL(request.getContextPath() +
"/html/upload");
+args[1] = response.encodeURL(getServletContext().getContextPath() +
"/html/upload");
args[2] = smClient.getString("htmlManagerServlet.deployUploadFile");
args[3] = smClient.getString("htmlManagerServlet.deployButton");
writer.print(MessageFormat.format(UPLOAD_SECTION, args));
@@ -558,7 +558,7 @@ public final class HTMLManagerServlet extends
ManagerServlet {
args = new Object[5];
args[0] = smClient.getString("htmlManagerServlet.configTitle");
args[1] =
smClient.getString("htmlManage
[tomcat] branch main updated: Use canonical context path.
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 3bb22b3fb8 Use canonical context path.
3bb22b3fb8 is described below
commit 3bb22b3fb8ce299a6a9778adc11ff28fce7f6538
Author: Mark Thomas
AuthorDate: Tue Jul 4 19:10:30 2023 +0100
Use canonical context path.
This is more efficient and resolves a handful of Coverity Scan false
positives.
---
.../catalina/manager/HTMLManagerServlet.java | 26 +++---
.../catalina/manager/StatusManagerServlet.java | 14 ++--
.../manager/host/HTMLHostManagerServlet.java | 18 +++
3 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/java/org/apache/catalina/manager/HTMLManagerServlet.java
b/java/org/apache/catalina/manager/HTMLManagerServlet.java
index b6375ca22a..f990f462af 100644
--- a/java/org/apache/catalina/manager/HTMLManagerServlet.java
+++ b/java/org/apache/catalina/manager/HTMLManagerServlet.java
@@ -346,7 +346,7 @@ public final class HTMLManagerServlet extends
ManagerServlet {
PrintWriter writer = response.getWriter();
Object[] args = new Object[2];
-args[0] = request.getContextPath();
+args[0] = getServletContext().getContextPath();
args[1] = smClient.getString("htmlManagerServlet.title");
// HTML Header Section
@@ -371,18 +371,18 @@ public final class HTMLManagerServlet extends
ManagerServlet {
// Manager Section
args = new Object[9];
args[0] = smClient.getString("htmlManagerServlet.manager");
-args[1] = response.encodeURL(request.getContextPath() + "/html/list");
+args[1] = response.encodeURL(getServletContext().getContextPath() +
"/html/list");
args[2] = smClient.getString("htmlManagerServlet.list");
args[3] = // External link
-(request.getContextPath() + "/" +
+(getServletContext().getContextPath() + "/" +
smClient.getString("htmlManagerServlet.helpHtmlManagerFile"));
args[4] = smClient.getString("htmlManagerServlet.helpHtmlManager");
args[5] = // External link
-(request.getContextPath() + "/" +
+(getServletContext().getContextPath() + "/" +
smClient.getString("htmlManagerServlet.helpManagerFile"));
args[6] = smClient.getString("htmlManagerServlet.helpManager");
args[7] = response.encodeURL
-(request.getContextPath() + "/status");
+(getServletContext().getContextPath() + "/status");
args[8] = smClient.getString("statusServlet.title");
writer.print(MessageFormat.format(Constants.MANAGER_SECTION, args));
@@ -473,7 +473,7 @@ public final class HTMLManagerServlet extends
ManagerServlet {
args[2] = Escape.htmlElementContent(ctxt.getDisplayName());
}
args[3] = Boolean.valueOf(ctxt.getState().isAvailable());
-args[4] =
Escape.htmlElementContent(response.encodeURL(request.getContextPath() +
+args[4] =
Escape.htmlElementContent(response.encodeURL(getServletContext().getContextPath()
+
"/html/sessions?" + pathVersion));
Manager manager = ctxt.getManager();
if (manager instanceof DistributedManager &&
showProxySessions) {
@@ -539,7 +539,7 @@ public final class HTMLManagerServlet extends
ManagerServlet {
args = new Object[8];
args[0] = smClient.getString("htmlManagerServlet.deployTitle");
args[1] = smClient.getString("htmlManagerServlet.deployServer");
-args[2] = response.encodeURL(request.getContextPath() +
"/html/deploy");
+args[2] = response.encodeURL(getServletContext().getContextPath() +
"/html/deploy");
args[3] = smClient.getString("htmlManagerServlet.deployPath");
args[4] = smClient.getString("htmlManagerServlet.deployVersion");
args[5] = smClient.getString("htmlManagerServlet.deployConfig");
@@ -549,7 +549,7 @@ public final class HTMLManagerServlet extends
ManagerServlet {
args = new Object[4];
args[0] = smClient.getString("htmlManagerServlet.deployUpload");
-args[1] = response.encodeURL(request.getContextPath() +
"/html/upload");
+args[1] = response.encodeURL(getServletContext().getContextPath() +
"/html/upload");
args[2] = smClient.getString("htmlManagerServlet.deployUploadFile");
args[3] = smClient.getString("htmlManagerServlet.deployButton");
writer.print(MessageFormat.format(UPLOAD_SECTION, args));
@@ -558,7 +558,7 @@ public final class HTMLManagerServlet extends
ManagerServlet {
args = new Object[5];
args[0] = smClient.getString("htmlManagerServlet.configTitle");
args[1] =
smClient.getString("htmlManagerSer
[tomcat] branch 8.5.x updated: Add comment to aid future maintenance.
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 841f82713b Add comment to aid future maintenance.
841f82713b is described below
commit 841f82713b74da59fa0a3121aae1e7959be0fd46
Author: Mark Thomas
AuthorDate: Tue Jul 4 18:31:16 2023 +0100
Add comment to aid future maintenance.
---
java/org/apache/catalina/core/StandardWrapperFacade.java | 4
1 file changed, 4 insertions(+)
diff --git a/java/org/apache/catalina/core/StandardWrapperFacade.java
b/java/org/apache/catalina/core/StandardWrapperFacade.java
index c4291bb7db..aef9b768af 100644
--- a/java/org/apache/catalina/core/StandardWrapperFacade.java
+++ b/java/org/apache/catalina/core/StandardWrapperFacade.java
@@ -73,6 +73,10 @@ public final class StandardWrapperFacade implements
ServletConfig {
@Override
public ServletContext getServletContext() {
+/*
+ * This method may be called concurrently but the same context object
will always be returned. There is no
+ * concurrency issue here.
+ */
if (context == null) {
context = config.getServletContext();
if (context instanceof ApplicationContext) {
-
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 comment to aid future maintenance.
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 8f53d2b13e Add comment to aid future maintenance.
8f53d2b13e is described below
commit 8f53d2b13e21d5390fd6d518a8028893a171e6b7
Author: Mark Thomas
AuthorDate: Tue Jul 4 18:31:16 2023 +0100
Add comment to aid future maintenance.
---
java/org/apache/catalina/core/StandardWrapperFacade.java | 4
1 file changed, 4 insertions(+)
diff --git a/java/org/apache/catalina/core/StandardWrapperFacade.java
b/java/org/apache/catalina/core/StandardWrapperFacade.java
index c4291bb7db..aef9b768af 100644
--- a/java/org/apache/catalina/core/StandardWrapperFacade.java
+++ b/java/org/apache/catalina/core/StandardWrapperFacade.java
@@ -73,6 +73,10 @@ public final class StandardWrapperFacade implements
ServletConfig {
@Override
public ServletContext getServletContext() {
+/*
+ * This method may be called concurrently but the same context object
will always be returned. There is no
+ * concurrency issue here.
+ */
if (context == null) {
context = config.getServletContext();
if (context instanceof ApplicationContext) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Add comment to aid future maintenance.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 8584f1f151 Add comment to aid future maintenance.
8584f1f151 is described below
commit 8584f1f15144f223ea81626c4b6ad01722d2b469
Author: Mark Thomas
AuthorDate: Tue Jul 4 18:31:16 2023 +0100
Add comment to aid future maintenance.
---
java/org/apache/catalina/core/StandardWrapperFacade.java | 4
1 file changed, 4 insertions(+)
diff --git a/java/org/apache/catalina/core/StandardWrapperFacade.java
b/java/org/apache/catalina/core/StandardWrapperFacade.java
index b7c0c8060b..84b38244ea 100644
--- a/java/org/apache/catalina/core/StandardWrapperFacade.java
+++ b/java/org/apache/catalina/core/StandardWrapperFacade.java
@@ -73,6 +73,10 @@ public final class StandardWrapperFacade implements
ServletConfig {
@Override
public ServletContext getServletContext() {
+/*
+ * This method may be called concurrently but the same context object
will always be returned. There is no
+ * concurrency issue here.
+ */
if (context == null) {
context = config.getServletContext();
if (context instanceof ApplicationContext) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Add comment to aid future maintenance.
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 1aad884e23 Add comment to aid future maintenance.
1aad884e23 is described below
commit 1aad884e23673b4bfa0b12ed573f646b214c52d5
Author: Mark Thomas
AuthorDate: Tue Jul 4 18:31:16 2023 +0100
Add comment to aid future maintenance.
---
java/org/apache/catalina/core/StandardWrapperFacade.java | 4
1 file changed, 4 insertions(+)
diff --git a/java/org/apache/catalina/core/StandardWrapperFacade.java
b/java/org/apache/catalina/core/StandardWrapperFacade.java
index b7c0c8060b..84b38244ea 100644
--- a/java/org/apache/catalina/core/StandardWrapperFacade.java
+++ b/java/org/apache/catalina/core/StandardWrapperFacade.java
@@ -73,6 +73,10 @@ public final class StandardWrapperFacade implements
ServletConfig {
@Override
public ServletContext getServletContext() {
+/*
+ * This method may be called concurrently but the same context object
will always be returned. There is no
+ * concurrency issue here.
+ */
if (context == null) {
context = config.getServletContext();
if (context instanceof ApplicationContext) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Add comment to aid future maintenance.
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 6ce6e3d389 Add comment to aid future maintenance.
6ce6e3d389 is described below
commit 6ce6e3d3895af587e75a795b698d1b3b2a7f0aa0
Author: Mark Thomas
AuthorDate: Tue Jul 4 18:20:46 2023 +0100
Add comment to aid future maintenance.
---
java/org/apache/catalina/core/StandardContext.java | 4
1 file changed, 4 insertions(+)
diff --git a/java/org/apache/catalina/core/StandardContext.java
b/java/org/apache/catalina/core/StandardContext.java
index 428aaa702c..b89bd9110f 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -2171,6 +2171,10 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
*/
@Override
public ServletContext getServletContext() {
+/*
+ * This method is called (multiple times) during context start which
is single threaded so there is concurrency
+ * issue here.
+ */
if (context == null) {
context = new ApplicationContext(this);
if (altDDName != null) {
-
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 comment to aid future maintenance.
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 61d541658c Add comment to aid future maintenance.
61d541658c is described below
commit 61d541658c10222fb02e9e3c687381f23e9243c8
Author: Mark Thomas
AuthorDate: Tue Jul 4 18:20:46 2023 +0100
Add comment to aid future maintenance.
---
java/org/apache/catalina/core/StandardContext.java | 4
1 file changed, 4 insertions(+)
diff --git a/java/org/apache/catalina/core/StandardContext.java
b/java/org/apache/catalina/core/StandardContext.java
index c4195b1fa6..3d03b12d97 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -2210,6 +2210,10 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
*/
@Override
public ServletContext getServletContext() {
+/*
+ * This method is called (multiple times) during context start which
is single threaded so there is concurrency
+ * issue here.
+ */
if (context == null) {
context = new ApplicationContext(this);
if (altDDName != null) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Add comment to aid future maintenance.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new d9bed19d98 Add comment to aid future maintenance.
d9bed19d98 is described below
commit d9bed19d982e186ce8e9c92005f60f5ab287138c
Author: Mark Thomas
AuthorDate: Tue Jul 4 18:20:46 2023 +0100
Add comment to aid future maintenance.
---
java/org/apache/catalina/core/StandardContext.java | 4
1 file changed, 4 insertions(+)
diff --git a/java/org/apache/catalina/core/StandardContext.java
b/java/org/apache/catalina/core/StandardContext.java
index f093341d09..b80cd0a001 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -2250,6 +2250,10 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
*/
@Override
public ServletContext getServletContext() {
+/*
+ * This method is called (multiple times) during context start which
is single threaded so there is concurrency
+ * issue here.
+ */
if (context == null) {
context = new ApplicationContext(this);
if (altDDName != null) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Add comment to aid future maintenance.
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 c598bedf2e Add comment to aid future maintenance.
c598bedf2e is described below
commit c598bedf2e391c4f37b381b91f570148c938dd4e
Author: Mark Thomas
AuthorDate: Tue Jul 4 18:20:46 2023 +0100
Add comment to aid future maintenance.
---
java/org/apache/catalina/core/StandardContext.java | 4
1 file changed, 4 insertions(+)
diff --git a/java/org/apache/catalina/core/StandardContext.java
b/java/org/apache/catalina/core/StandardContext.java
index 6476bf08c5..58b97c6d8f 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -2242,6 +2242,10 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
*/
@Override
public ServletContext getServletContext() {
+/*
+ * This method is called (multiple times) during context start which
is single threaded so there is concurrency
+ * issue here.
+ */
if (context == null) {
context = new ApplicationContext(this);
if (altDDName != null) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66676] WebSocket session complains about closed state when calling close()
https://bz.apache.org/bugzilla/show_bug.cgi?id=66676 --- Comment #8 from Georg F. --- I'll see what I can do. Will get back to you, when I have some results. Thanks again for your help. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot success in on tomcat-9.0.x
Build status: Build succeeded! Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/37/builds/613 Blamelist: Mark Thomas , Rainer Jung , remm Build Text: build successful Status Detected: restored build Build Source Stamp: [branch 9.0.x] 6cf71cc8ebfca9a1f04ed6fc10ff7d693716bf8f Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 1 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Use the canonical servlet context path
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 2a5c21868c Use the canonical servlet context path
2a5c21868c is described below
commit 2a5c21868cbef0efc78e32eaf5f6a6379602ea3d
Author: Mark Thomas
AuthorDate: Tue Jul 4 15:10:35 2023 +0100
Use the canonical servlet context path
It is generally more efficient to use the canonical path from the
context rather than the path from the request as that requires
additional processing as it must return the non-decoded, non-normalized
form.
This also silences a false positive from Coverity Scan.
---
webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java
b/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java
index edfee522bd..3b728284c7 100644
--- a/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java
+++ b/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java
@@ -44,7 +44,7 @@ public class SimpleImagePush extends HttpServlet {
pw.println("");
pw.println("");
pw.println("The following image was provided via a push
request.");
-pw.println("");
+pw.println("");
pw.println("");
pw.println("");
pw.flush();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Use the canonical servlet context path
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 0fed3496a6 Use the canonical servlet context path
0fed3496a6 is described below
commit 0fed3496a68798272fb98230422895c414c1d1b9
Author: Mark Thomas
AuthorDate: Tue Jul 4 15:10:35 2023 +0100
Use the canonical servlet context path
It is generally more efficient to use the canonical path from the
context rather than the path from the request as that requires
additional processing as it must return the non-decoded, non-normalized
form.
This also silences a false positive from Coverity Scan.
---
webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java
b/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java
index 4f52def0cd..3da6895904 100644
--- a/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java
+++ b/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java
@@ -44,7 +44,7 @@ public class SimpleImagePush extends HttpServlet {
pw.println("");
pw.println("");
pw.println("The following image was provided via a push
request.");
-pw.println("");
+pw.println("");
pw.println("");
pw.println("");
pw.flush();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Use the canonical servlet context path
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 bd5b3907cb Use the canonical servlet context path
bd5b3907cb is described below
commit bd5b3907cb48a4f53037d5f5758dff9fc40daa31
Author: Mark Thomas
AuthorDate: Tue Jul 4 15:10:35 2023 +0100
Use the canonical servlet context path
It is generally more efficient to use the canonical path from the
context rather than the path from the request as that requires
additional processing as it must return the non-decoded, non-normalized
form.
This also silences a false positive from Coverity Scan.
---
webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java
b/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java
index 4f52def0cd..3da6895904 100644
--- a/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java
+++ b/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java
@@ -44,7 +44,7 @@ public class SimpleImagePush extends HttpServlet {
pw.println("");
pw.println("");
pw.println("The following image was provided via a push
request.");
-pw.println("");
+pw.println("");
pw.println("");
pw.println("");
pw.flush();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE] Release Apache Tomcat 9.0.78
The proposed Apache Tomcat 9.0.78 release is now available for voting. The notable changes compared to 9.0.76 are: - Add ContextNamingInfoListener, a listener which creates context naming information environment entries - Add PropertiesRoleMappingListener, a listener which populates the context's role mapping from a properties file. Along with lots of other bug fixes and improvements. For full details, see the changelog: https://nightlies.apache.org/tomcat/tomcat-9.0.x/docs/changelog.html It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.78/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1444 The tag is: https://github.com/apache/tomcat/tree/9.0.78 caf0baff34789335ae23a56337db252c2a578456 The proposed 9.0.78 release is: [ ] -1, Broken - do not release [ ] +1, Stable - go ahead and release as 9.0.78 Rémy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Next is 9.0.79
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 6cf71cc8eb Next is 9.0.79 6cf71cc8eb is described below commit 6cf71cc8ebfca9a1f04ed6fc10ff7d693716bf8f Author: remm AuthorDate: Tue Jul 4 15:26:02 2023 +0200 Next is 9.0.79 --- build.properties.default | 2 +- res/maven/mvn.properties.default | 2 +- webapps/docs/changelog.xml | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.properties.default b/build.properties.default index 413163eaf8..ab7feae160 100644 --- a/build.properties.default +++ b/build.properties.default @@ -31,7 +31,7 @@ # - Version Control Flags - version.major=9 version.minor=0 -version.build=78 +version.build=79 version.patch=0 version.suffix= version.dev=-dev diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default index 6687474616..6fb3e602ba 100644 --- a/res/maven/mvn.properties.default +++ b/res/maven/mvn.properties.default @@ -39,7 +39,7 @@ maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d maven.asf.release.repo.repositoryId=apache.releases.https # Release version info -maven.asf.release.deploy.version=9.0.78 +maven.asf.release.deploy.version=9.0.79 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 7de87ce9d2..fa38ca4889 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -104,7 +104,9 @@ They eventually become mixed with the numbered issues (i.e., numbered issues do not "pop up" wrt. others). --> - + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r62822 - in /dev/tomcat/tomcat-9/v9.0.78: ./ bin/ bin/embed/ src/
Author: remm Date: Tue Jul 4 13:23:59 2023 New Revision: 62822 Log: Upload 9.0.78 for voting Added: dev/tomcat/tomcat-9/v9.0.78/ dev/tomcat/tomcat-9/v9.0.78/KEYS dev/tomcat/tomcat-9/v9.0.78/README.html dev/tomcat/tomcat-9/v9.0.78/RELEASE-NOTES dev/tomcat/tomcat-9/v9.0.78/bin/ dev/tomcat/tomcat-9/v9.0.78/bin/README.html dev/tomcat/tomcat-9/v9.0.78/bin/apache-tomcat-9.0.78-deployer.tar.gz (with props) dev/tomcat/tomcat-9/v9.0.78/bin/apache-tomcat-9.0.78-deployer.tar.gz.asc (with props) dev/tomcat/tomcat-9/v9.0.78/bin/apache-tomcat-9.0.78-deployer.tar.gz.sha512 dev/tomcat/tomcat-9/v9.0.78/bin/apache-tomcat-9.0.78-deployer.zip (with props) dev/tomcat/tomcat-9/v9.0.78/bin/apache-tomcat-9.0.78-deployer.zip.asc (with props) dev/tomcat/tomcat-9/v9.0.78/bin/apache-tomcat-9.0.78-deployer.zip.sha512 dev/tomcat/tomcat-9/v9.0.78/bin/apache-tomcat-9.0.78-fulldocs.tar.gz (with props) dev/tomcat/tomcat-9/v9.0.78/bin/apache-tomcat-9.0.78-fulldocs.tar.gz.asc (with props) dev/tomcat/tomcat-9/v9.0.78/bin/apache-tomcat-9.0.78-fulldocs.tar.gz.sha512 dev/tomcat/tomcat-9/v9.0.78/bin/apache-tomcat-9.0.78-windows-x64.zip (with props) dev/tomcat/tomcat-9/v9.0.78/bin/apache-tomcat-9.0.78-windows-x64.zip.asc (with props) dev/tomcat/tomcat-9/v9.0.78/bin/apache-tomcat-9.0.78-windows-x64.zip.sha512 dev/tomcat/tomcat-9/v9.0.78/bin/apache-tomcat-9.0.78-windows-x86.zip (with props) dev/tomcat/tomcat-9/v9.0.78/bin/apache-tomcat-9.0.78-windows-x86.zip.asc (with props) dev/tomcat/tomcat-9/v9.0.78/bin/apache-tomcat-9.0.78-windows-x86.zip.sha512 dev/tomcat/tomcat-9/v9.0.78/bin/apache-tomcat-9.0.78.exe (with props) dev/tomcat/tomcat-9/v9.0.78/bin/apache-tomcat-9.0.78.exe.asc (with props) dev/tomcat/tomcat-9/v9.0.78/bin/apache-tomcat-9.0.78.exe.sha512 dev/tomcat/tomcat-9/v9.0.78/bin/apache-tomcat-9.0.78.tar.gz (with props) dev/tomcat/tomcat-9/v9.0.78/bin/apache-tomcat-9.0.78.tar.gz.asc (with props) dev/tomcat/tomcat-9/v9.0.78/bin/apache-tomcat-9.0.78.tar.gz.sha512 dev/tomcat/tomcat-9/v9.0.78/bin/apache-tomcat-9.0.78.zip (with props) dev/tomcat/tomcat-9/v9.0.78/bin/apache-tomcat-9.0.78.zip.asc (with props) dev/tomcat/tomcat-9/v9.0.78/bin/apache-tomcat-9.0.78.zip.sha512 dev/tomcat/tomcat-9/v9.0.78/bin/embed/ dev/tomcat/tomcat-9/v9.0.78/bin/embed/apache-tomcat-9.0.78-embed.tar.gz (with props) dev/tomcat/tomcat-9/v9.0.78/bin/embed/apache-tomcat-9.0.78-embed.tar.gz.asc (with props) dev/tomcat/tomcat-9/v9.0.78/bin/embed/apache-tomcat-9.0.78-embed.tar.gz.sha512 dev/tomcat/tomcat-9/v9.0.78/bin/embed/apache-tomcat-9.0.78-embed.zip (with props) dev/tomcat/tomcat-9/v9.0.78/bin/embed/apache-tomcat-9.0.78-embed.zip.asc (with props) dev/tomcat/tomcat-9/v9.0.78/bin/embed/apache-tomcat-9.0.78-embed.zip.sha512 dev/tomcat/tomcat-9/v9.0.78/src/ dev/tomcat/tomcat-9/v9.0.78/src/apache-tomcat-9.0.78-src.tar.gz (with props) dev/tomcat/tomcat-9/v9.0.78/src/apache-tomcat-9.0.78-src.tar.gz.asc (with props) dev/tomcat/tomcat-9/v9.0.78/src/apache-tomcat-9.0.78-src.tar.gz.sha512 dev/tomcat/tomcat-9/v9.0.78/src/apache-tomcat-9.0.78-src.zip (with props) dev/tomcat/tomcat-9/v9.0.78/src/apache-tomcat-9.0.78-src.zip.asc (with props) dev/tomcat/tomcat-9/v9.0.78/src/apache-tomcat-9.0.78-src.zip.sha512 Added: dev/tomcat/tomcat-9/v9.0.78/KEYS == --- dev/tomcat/tomcat-9/v9.0.78/KEYS (added) +++ dev/tomcat/tomcat-9/v9.0.78/KEYS Tue Jul 4 13:23:59 2023 @@ -0,0 +1,237 @@ +This file contains the PGP&GPG keys of various Apache developers. +Please don't use them for email unless you have to. Their main +purpose is code signing. + +Apache users: pgp < KEYS +Apache developers: +(pgpk -ll && pgpk -xa ) >> this file. + or +(gpg --fingerprint --list-sigs + && gpg --armor --export ) >> this file. + +Apache developers: please ensure that your key is also available via the +PGP keyservers (such as pgpkeys.mit.edu). + + +pub 1024D/33C60243 2004-09-12 + Key fingerprint = DCFD 35E0 BF8C A734 4752 DE8B 6FB2 1E89 33C6 0243 +uid Mark E D Thomas +uid Mark E D Thomas +uid Mark E D Thomas +sub 2048g/0BECE548 2004-09-12 + +pub 4096R/2F6059E7 2009-09-18 + Key fingerprint = A9C5 DF4D 22E9 9998 D987 5A51 10C0 1C5A 2F60 59E7 +uid Mark E D Thomas +sub 4096R/5E763BEC 2009-09-18 + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1.4.9 (MingW32) + +mQGiBEFEjegRBADocGttfROvtLGrTOW3xRqZHmFWybmEaI6jmnRdN/1gGXmb3wQL +rHsS3fLFIIOYLPph0Kov9q4qNq36LekShIvjMBDFoj2/wRxaUtFq81asaRZg8Mcw +4kVeIoe8OIOuWmvYhU8SH2jJNUnVVrpTPAa6QWquTmseNi6UJMjLxuL7DwCg//9u +k2yj0vk6e4WSO6Fe5+EkQDED/AjQsy0kj9TpNHkKSSUR2evRlWPYA0YtxBSbsgON +tT0cYipAp5IcYt6Zq5QzHiZreyQXLAjItDS2oGCIXfNbTYJ3kxxJTCU/3wlefV
[tomcat] tag 9.0.78 created (now caf0baff34)
This is an automated email from the ASF dual-hosted git repository. remm pushed a change to tag 9.0.78 in repository https://gitbox.apache.org/repos/asf/tomcat.git at caf0baff34 (commit) This tag includes the following new commits: new caf0baff34 Tag 9.0.78 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/01: Tag 9.0.78
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to tag 9.0.78 in repository https://gitbox.apache.org/repos/asf/tomcat.git commit caf0baff34789335ae23a56337db252c2a578456 Author: remm AuthorDate: Tue Jul 4 15:22:56 2023 +0200 Tag 9.0.78 --- build.properties.release | 52 +++ res/install-win/Uninstall.exe.sig| Bin 0 -> 10251 bytes res/install-win/tomcat-installer.exe.sig | Bin 0 -> 10251 bytes res/maven/mvn.properties.release | 27 webapps/docs/changelog.xml | 2 +- 5 files changed, 80 insertions(+), 1 deletion(-) diff --git a/build.properties.release b/build.properties.release new file mode 100644 index 00..803835ee34 --- /dev/null +++ b/build.properties.release @@ -0,0 +1,52 @@ +# - +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# - + +# This file was auto-generated by the pre-release Ant target. + +# Any unwanted settings may be over-ridden in a build.properties file located +# in the same directory as this file. + +# Set the version-dev to "" (empty string) as this is not a development release. +version.dev= + +# Ensure consistent timestamps for reproducible builds. +ant.tstamp.now.iso=2023-07-04T13:15:43Z + +# Enable insertion of detached signatures into the Windows installer. +do.codesigning=true + +# Re-use the same GPG executable. +gpg.exec=/usr/bin/gpg + +# Reproducible builds require the use of the build tools defined below. The +# vendors (where appropriate) and versions must match exactly for a reproducible +# build since this data is embedded in various files, particularly JAR file +# manifests, as part of the build process. +# +# Apache Ant: Apache Ant(TM) version 1.10.12 compiled on January 18 2023 +# +# Java Name: OpenJDK 64-Bit Server VM +# Java Vendor: Eclipse Adoptium +# Java Version:11.0.19+7 + +# The following is provided for information only. Builds will be repeatable +# whether or not the build environment in consistent with this information. +# +# OS: amd64 Linux 6.3.8-200.fc38.x86_64 +# File encoding: UTF-8 +# +# Release Manager: remm diff --git a/res/install-win/Uninstall.exe.sig b/res/install-win/Uninstall.exe.sig new file mode 100644 index 00..833103e400 Binary files /dev/null and b/res/install-win/Uninstall.exe.sig differ diff --git a/res/install-win/tomcat-installer.exe.sig b/res/install-win/tomcat-installer.exe.sig new file mode 100644 index 00..a2b8229bf2 Binary files /dev/null and b/res/install-win/tomcat-installer.exe.sig differ diff --git a/res/maven/mvn.properties.release b/res/maven/mvn.properties.release new file mode 100644 index 00..4d7e013174 --- /dev/null +++ b/res/maven/mvn.properties.release @@ -0,0 +1,27 @@ +# - +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# - + +# This file was auto-generated by the pre-release Ant target. + +# Remove "-dev" from the version since this is not a development release. +maven.asf.release.deploy.version=9.0.78 + +# Re-use the same GPG executable. +gpg.exec=/usr/bin/gpg + +# Set the user name to use to upload the artefacts to Nexus. +asf.ldap.username=
svn commit: r62821 - /dev/tomcat/tomcat-9/v9.0.77/
Author: remm Date: Tue Jul 4 13:20:46 2023 New Revision: 62821 Log: Drop 9.0.77 Removed: dev/tomcat/tomcat-9/v9.0.77/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66676] WebSocket session complains about closed state when calling close()
https://bz.apache.org/bugzilla/show_bug.cgi?id=66676 --- Comment #7 from Mark Thomas --- We might need to take an iterative approach with this but as a starting point I'd like: - a log message logging the session ID and current stack when the session state is set to closed (and timestamp and thread ID but I'd expect these but default for any log message) - the thread ID and timestamp (which should already in the log message) for the stack trace when the error occurs -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Drop 9.0.77
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 7b1a9607f5 Drop 9.0.77 7b1a9607f5 is described below commit 7b1a9607f5e76e2337ca7f43252649ed584f90a5 Author: remm AuthorDate: Tue Jul 4 14:59:17 2023 +0200 Drop 9.0.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 f14f27ff99..7de87ce9d2 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -113,7 +113,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66676] WebSocket session complains about closed state when calling close()
https://bz.apache.org/bugzilla/show_bug.cgi?id=66676 --- Comment #6 from Georg F. --- I see - well from what I can tell is that it was happening for me 99 times in the last 30 days. I'll try to somehow improve logging to get a better understanding of who was accessing the session at which times. Let me know if you have some idea/wish of what should be logged additionally. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Align with 9.0.x, 10.1.x and 11.0.x
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 f8e136f187 Align with 9.0.x, 10.1.x and 11.0.x
f8e136f187 is described below
commit f8e136f187c4ebf9510a42cae2a84bee9f7ce156
Author: Mark Thomas
AuthorDate: Tue Jul 4 12:46:19 2023 +0100
Align with 9.0.x, 10.1.x and 11.0.x
---
.../apache/catalina/filters/LocalStrings_fr.properties | 1 +
.../apache/catalina/filters/LocalStrings_ja.properties | 1 +
java/org/apache/catalina/filters/RemoteIpFilter.java | 18 ++
3 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/java/org/apache/catalina/filters/LocalStrings_fr.properties
b/java/org/apache/catalina/filters/LocalStrings_fr.properties
index e66f39e8bb..3f5f4a041d 100644
--- a/java/org/apache/catalina/filters/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/filters/LocalStrings_fr.properties
@@ -52,6 +52,7 @@ http.403=L''accès à la ressource demandée [{0}] a été
interdit.
httpHeaderSecurityFilter.clickjack.invalid=Une valeur invalide [{0}] a été
spécifiée pour le header "anti click-jacking"
httpHeaderSecurityFilter.committed=Impossible d'ajouter les en-têtes HTTP car
la réponse a déjà été envoyée avant l'invocation du filtre de sécurité des
en-têtes
+rateLimitFilter.initialized=RateLimitFilter [{0}] initialisé avec [{1}]
requêtes toutes les [{2}] secondes. Fixé à [{3}] toutes les [{4}]
millisecondes. [{5}].
rateLimitFilter.maxRequestsExceeded=[{0}] [{1}] requêtes de [{2}] ont excédé
le maximum autorisé de [{3}] pour une période de [{4}] secondes.
remoteCidrFilter.invalid=Une configuration invalide a été fournie pour [{0}],
voir les précédents messages pour les détails
diff --git a/java/org/apache/catalina/filters/LocalStrings_ja.properties
b/java/org/apache/catalina/filters/LocalStrings_ja.properties
index dc4ebcae7b..4c5bee2a45 100644
--- a/java/org/apache/catalina/filters/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/filters/LocalStrings_ja.properties
@@ -52,6 +52,7 @@ http.403=指定されたリソース [{0}] へのアクセスは拒否されま
httpHeaderSecurityFilter.clickjack.invalid=クリックジャッキングヘッダーに無効な値 [{0}] が指定されました
httpHeaderSecurityFilter.committed=HTTP
ヘッダーセキュリティフィルターへの入力時に既に応答がコミットされているため、HTTP ヘッダーを追加できません
+rateLimitFilter.initialized=RateLimitFilter [{0}] は [{2}] 秒あたり [{1}]
リクエストで初期化されました。 実際は [{4}] ミリ秒あたり [{3}] です。 [{5}]。
rateLimitFilter.maxRequestsExceeded=[{0}] [{1}] [{2}] からのリクエストが、[{4}]
秒のウィンドウで許可される最大値 [{3}] を超えました。
remoteCidrFilter.invalid=[{0}] に不正な値が指定されました。詳細は直前のメッセージを参照してください。
diff --git a/java/org/apache/catalina/filters/RemoteIpFilter.java
b/java/org/apache/catalina/filters/RemoteIpFilter.java
index 1bb5f58e89..6fd69c9668 100644
--- a/java/org/apache/catalina/filters/RemoteIpFilter.java
+++ b/java/org/apache/catalina/filters/RemoteIpFilter.java
@@ -42,6 +42,7 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.AccessLog;
import org.apache.catalina.Globals;
+import org.apache.catalina.util.RequestUtil;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.buf.StringUtils;
@@ -633,22 +634,7 @@ public class RemoteIpFilter implements Filter {
@Override
public StringBuffer getRequestURL() {
-StringBuffer url = new StringBuffer();
-String scheme = getScheme();
-int port = getServerPort();
-if (port < 0) {
-port = 80; // Work around java.net.URL bug
-}
-url.append(scheme);
-url.append("://");
-url.append(getServerName());
-if ((scheme.equals("http") && (port != 80)) ||
(scheme.equals("https") && (port != 443))) {
-url.append(':');
-url.append(port);
-}
-url.append(getRequestURI());
-
-return url;
+return RequestUtil.getRequestURL(this);
}
}
-
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: Align with 10.1.x and 11.0.x
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 df6f8e53fc Align with 10.1.x and 11.0.x
df6f8e53fc is described below
commit df6f8e53fcd0280fdee987b84194eb9522f79b04
Author: Mark Thomas
AuthorDate: Tue Jul 4 12:38:24 2023 +0100
Align with 10.1.x and 11.0.x
---
java/org/apache/catalina/filters/LocalStrings_fr.properties | 1 +
java/org/apache/catalina/filters/LocalStrings_ja.properties | 1 +
2 files changed, 2 insertions(+)
diff --git a/java/org/apache/catalina/filters/LocalStrings_fr.properties
b/java/org/apache/catalina/filters/LocalStrings_fr.properties
index e66f39e8bb..3f5f4a041d 100644
--- a/java/org/apache/catalina/filters/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/filters/LocalStrings_fr.properties
@@ -52,6 +52,7 @@ http.403=L''accès à la ressource demandée [{0}] a été
interdit.
httpHeaderSecurityFilter.clickjack.invalid=Une valeur invalide [{0}] a été
spécifiée pour le header "anti click-jacking"
httpHeaderSecurityFilter.committed=Impossible d'ajouter les en-têtes HTTP car
la réponse a déjà été envoyée avant l'invocation du filtre de sécurité des
en-têtes
+rateLimitFilter.initialized=RateLimitFilter [{0}] initialisé avec [{1}]
requêtes toutes les [{2}] secondes. Fixé à [{3}] toutes les [{4}]
millisecondes. [{5}].
rateLimitFilter.maxRequestsExceeded=[{0}] [{1}] requêtes de [{2}] ont excédé
le maximum autorisé de [{3}] pour une période de [{4}] secondes.
remoteCidrFilter.invalid=Une configuration invalide a été fournie pour [{0}],
voir les précédents messages pour les détails
diff --git a/java/org/apache/catalina/filters/LocalStrings_ja.properties
b/java/org/apache/catalina/filters/LocalStrings_ja.properties
index dc4ebcae7b..4c5bee2a45 100644
--- a/java/org/apache/catalina/filters/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/filters/LocalStrings_ja.properties
@@ -52,6 +52,7 @@ http.403=指定されたリソース [{0}] へのアクセスは拒否されま
httpHeaderSecurityFilter.clickjack.invalid=クリックジャッキングヘッダーに無効な値 [{0}] が指定されました
httpHeaderSecurityFilter.committed=HTTP
ヘッダーセキュリティフィルターへの入力時に既に応答がコミットされているため、HTTP ヘッダーを追加できません
+rateLimitFilter.initialized=RateLimitFilter [{0}] は [{2}] 秒あたり [{1}]
リクエストで初期化されました。 実際は [{4}] ミリ秒あたり [{3}] です。 [{5}]。
rateLimitFilter.maxRequestsExceeded=[{0}] [{1}] [{2}] からのリクエストが、[{4}]
秒のウィンドウで許可される最大値 [{3}] を超えました。
remoteCidrFilter.invalid=[{0}] に不正な値が指定されました。詳細は直前のメッセージを参照してください。
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Align with 11.0.x
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 2dfeec8576 Align with 11.0.x
2dfeec8576 is described below
commit 2dfeec8576103d57fd8dae51080a77bc68b0322e
Author: Mark Thomas
AuthorDate: Tue Jul 4 12:38:01 2023 +0100
Align with 11.0.x
---
java/org/apache/catalina/filters/LocalStrings_fr.properties | 1 +
java/org/apache/catalina/filters/LocalStrings_ja.properties | 1 +
2 files changed, 2 insertions(+)
diff --git a/java/org/apache/catalina/filters/LocalStrings_fr.properties
b/java/org/apache/catalina/filters/LocalStrings_fr.properties
index e66f39e8bb..3f5f4a041d 100644
--- a/java/org/apache/catalina/filters/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/filters/LocalStrings_fr.properties
@@ -52,6 +52,7 @@ http.403=L''accès à la ressource demandée [{0}] a été
interdit.
httpHeaderSecurityFilter.clickjack.invalid=Une valeur invalide [{0}] a été
spécifiée pour le header "anti click-jacking"
httpHeaderSecurityFilter.committed=Impossible d'ajouter les en-têtes HTTP car
la réponse a déjà été envoyée avant l'invocation du filtre de sécurité des
en-têtes
+rateLimitFilter.initialized=RateLimitFilter [{0}] initialisé avec [{1}]
requêtes toutes les [{2}] secondes. Fixé à [{3}] toutes les [{4}]
millisecondes. [{5}].
rateLimitFilter.maxRequestsExceeded=[{0}] [{1}] requêtes de [{2}] ont excédé
le maximum autorisé de [{3}] pour une période de [{4}] secondes.
remoteCidrFilter.invalid=Une configuration invalide a été fournie pour [{0}],
voir les précédents messages pour les détails
diff --git a/java/org/apache/catalina/filters/LocalStrings_ja.properties
b/java/org/apache/catalina/filters/LocalStrings_ja.properties
index dc4ebcae7b..4c5bee2a45 100644
--- a/java/org/apache/catalina/filters/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/filters/LocalStrings_ja.properties
@@ -52,6 +52,7 @@ http.403=指定されたリソース [{0}] へのアクセスは拒否されま
httpHeaderSecurityFilter.clickjack.invalid=クリックジャッキングヘッダーに無効な値 [{0}] が指定されました
httpHeaderSecurityFilter.committed=HTTP
ヘッダーセキュリティフィルターへの入力時に既に応答がコミットされているため、HTTP ヘッダーを追加できません
+rateLimitFilter.initialized=RateLimitFilter [{0}] は [{2}] 秒あたり [{1}]
リクエストで初期化されました。 実際は [{4}] ミリ秒あたり [{3}] です。 [{5}]。
rateLimitFilter.maxRequestsExceeded=[{0}] [{1}] [{2}] からのリクエストが、[{4}]
秒のウィンドウで許可される最大値 [{3}] を超えました。
remoteCidrFilter.invalid=[{0}] に不正な値が指定されました。詳細は直前のメッセージを参照してください。
-
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: Code clean-up - formatting. No functional change.
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 9e8b4a2f83 Code clean-up - formatting. No functional change.
9e8b4a2f83 is described below
commit 9e8b4a2f832487020c26df390bffd23beb2c20e6
Author: Mark Thomas
AuthorDate: Tue Jul 4 12:32:11 2023 +0100
Code clean-up - formatting. No functional change.
---
java/org/apache/catalina/filters/Constants.java| 3 +-
java/org/apache/catalina/filters/CorsFilter.java | 12
.../catalina/filters/CsrfPreventionFilter.java | 10 +++
.../catalina/filters/CsrfPreventionFilterBase.java | 4 +--
.../org/apache/catalina/filters/ExpiresFilter.java | 34 +-
.../catalina/filters/HttpHeaderSecurityFilter.java | 4 ++-
.../apache/catalina/filters/RemoteIpFilter.java| 22 +++---
.../catalina/filters/RestCsrfPreventionFilter.java | 7 +++--
8 files changed, 53 insertions(+), 43 deletions(-)
diff --git a/java/org/apache/catalina/filters/Constants.java
b/java/org/apache/catalina/filters/Constants.java
index 25693aef56..dbec2a72cc 100644
--- a/java/org/apache/catalina/filters/Constants.java
+++ b/java/org/apache/catalina/filters/Constants.java
@@ -60,5 +60,6 @@ public final class Constants {
/**
* The servlet context attribute key under which the CSRF REST header name
can be found.
*/
-public static final String CSRF_REST_NONCE_HEADER_NAME_KEY =
"org.apache.catalina.filters.CSRF_REST_NONCE_HEADER_NAME";
+public static final String CSRF_REST_NONCE_HEADER_NAME_KEY =
+"org.apache.catalina.filters.CSRF_REST_NONCE_HEADER_NAME";
}
diff --git a/java/org/apache/catalina/filters/CorsFilter.java
b/java/org/apache/catalina/filters/CorsFilter.java
index c211ea66cc..ca29c554a9 100644
--- a/java/org/apache/catalina/filters/CorsFilter.java
+++ b/java/org/apache/catalina/filters/CorsFilter.java
@@ -278,8 +278,8 @@ public class CorsFilter implements Filter {
}
// Section 6.2.4
-String accessControlRequestHeadersHeader = request
-
.getHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_HEADERS);
+String accessControlRequestHeadersHeader =
+
request.getHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_HEADERS);
List accessControlRequestHeaders = new ArrayList<>();
if (accessControlRequestHeadersHeader != null &&
!accessControlRequestHeadersHeader.trim().isEmpty()) {
String[] headers =
accessControlRequestHeadersHeader.trim().split(",");
@@ -571,8 +571,8 @@ public class CorsFilter implements Filter {
String method = request.getMethod();
if (method != null) {
if ("OPTIONS".equals(method)) {
-String accessControlRequestMethodHeader = request
-
.getHeader(REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD);
+String accessControlRequestMethodHeader =
+
request.getHeader(REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD);
if (accessControlRequestMethodHeader != null &&
!accessControlRequestMethodHeader.isEmpty()) {
requestType = CORSRequestType.PRE_FLIGHT;
} else if (accessControlRequestMethodHeader != null &&
@@ -922,8 +922,8 @@ public class CorsFilter implements Filter {
/**
* Request headers sent as 'Access-Control-Request-Headers' header, for
pre-flight request.
*/
-public static final String HTTP_REQUEST_ATTRIBUTE_REQUEST_HEADERS =
HTTP_REQUEST_ATTRIBUTE_PREFIX +
-"request.headers";
+public static final String HTTP_REQUEST_ATTRIBUTE_REQUEST_HEADERS =
+HTTP_REQUEST_ATTRIBUTE_PREFIX + "request.headers";
// -- Constants
/**
diff --git a/java/org/apache/catalina/filters/CsrfPreventionFilter.java
b/java/org/apache/catalina/filters/CsrfPreventionFilter.java
index 9bb2660a33..ef5e979126 100644
--- a/java/org/apache/catalina/filters/CsrfPreventionFilter.java
+++ b/java/org/apache/catalina/filters/CsrfPreventionFilter.java
@@ -258,8 +258,8 @@ public class CsrfPreventionFilter extends
CsrfPreventionFilterBase {
return null;
}
@SuppressWarnings("unchecked")
-NonceCache nonceCache = (NonceCache) session
-.getAttribute(Constants.CSRF_NONCE_SESSION_ATTR_NAME);
+NonceCache nonceCache =
+(NonceCache)
session.getAttribute(Constants.CSRF_NONCE_SESSION_ATTR_NAME);
return nonceCache;
}
@@ -355,14 +355,14 @@ public class CsrfPreventionFilter extends
CsrfPreventionFilterBase {
// Although the internal implementation uses a Map, this cache
// implem
[tomcat] branch 9.0.x updated: Code clean-up - formatting. No functional change.
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 c303148225 Code clean-up - formatting. No functional change.
c303148225 is described below
commit c30314822526db2456dbfc10352899bd6188d1e9
Author: Mark Thomas
AuthorDate: Tue Jul 4 12:31:50 2023 +0100
Code clean-up - formatting. No functional change.
---
java/org/apache/catalina/filters/Constants.java| 3 +-
java/org/apache/catalina/filters/CorsFilter.java | 12
.../catalina/filters/CsrfPreventionFilter.java | 10 +++
.../catalina/filters/CsrfPreventionFilterBase.java | 4 +--
.../org/apache/catalina/filters/ExpiresFilter.java | 34 +-
.../catalina/filters/HttpHeaderSecurityFilter.java | 4 ++-
.../apache/catalina/filters/RateLimitFilter.java | 4 +--
.../apache/catalina/filters/RemoteIpFilter.java| 22 +++---
.../catalina/filters/RestCsrfPreventionFilter.java | 15 +-
9 files changed, 59 insertions(+), 49 deletions(-)
diff --git a/java/org/apache/catalina/filters/Constants.java
b/java/org/apache/catalina/filters/Constants.java
index 25693aef56..dbec2a72cc 100644
--- a/java/org/apache/catalina/filters/Constants.java
+++ b/java/org/apache/catalina/filters/Constants.java
@@ -60,5 +60,6 @@ public final class Constants {
/**
* The servlet context attribute key under which the CSRF REST header name
can be found.
*/
-public static final String CSRF_REST_NONCE_HEADER_NAME_KEY =
"org.apache.catalina.filters.CSRF_REST_NONCE_HEADER_NAME";
+public static final String CSRF_REST_NONCE_HEADER_NAME_KEY =
+"org.apache.catalina.filters.CSRF_REST_NONCE_HEADER_NAME";
}
diff --git a/java/org/apache/catalina/filters/CorsFilter.java
b/java/org/apache/catalina/filters/CorsFilter.java
index ef9705510c..1994bcc6b3 100644
--- a/java/org/apache/catalina/filters/CorsFilter.java
+++ b/java/org/apache/catalina/filters/CorsFilter.java
@@ -276,8 +276,8 @@ public class CorsFilter extends GenericFilter {
}
// Section 6.2.4
-String accessControlRequestHeadersHeader = request
-
.getHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_HEADERS);
+String accessControlRequestHeadersHeader =
+
request.getHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_HEADERS);
List accessControlRequestHeaders = new ArrayList<>();
if (accessControlRequestHeadersHeader != null &&
!accessControlRequestHeadersHeader.trim().isEmpty()) {
String[] headers =
accessControlRequestHeadersHeader.trim().split(",");
@@ -563,8 +563,8 @@ public class CorsFilter extends GenericFilter {
String method = request.getMethod();
if (method != null) {
if ("OPTIONS".equals(method)) {
-String accessControlRequestMethodHeader = request
-
.getHeader(REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD);
+String accessControlRequestMethodHeader =
+
request.getHeader(REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD);
if (accessControlRequestMethodHeader != null &&
!accessControlRequestMethodHeader.isEmpty()) {
requestType = CORSRequestType.PRE_FLIGHT;
} else if (accessControlRequestMethodHeader != null &&
@@ -924,8 +924,8 @@ public class CorsFilter extends GenericFilter {
/**
* Request headers sent as 'Access-Control-Request-Headers' header, for
pre-flight request.
*/
-public static final String HTTP_REQUEST_ATTRIBUTE_REQUEST_HEADERS =
HTTP_REQUEST_ATTRIBUTE_PREFIX +
-"request.headers";
+public static final String HTTP_REQUEST_ATTRIBUTE_REQUEST_HEADERS =
+HTTP_REQUEST_ATTRIBUTE_PREFIX + "request.headers";
// -- Constants
/**
diff --git a/java/org/apache/catalina/filters/CsrfPreventionFilter.java
b/java/org/apache/catalina/filters/CsrfPreventionFilter.java
index 9bb2660a33..ef5e979126 100644
--- a/java/org/apache/catalina/filters/CsrfPreventionFilter.java
+++ b/java/org/apache/catalina/filters/CsrfPreventionFilter.java
@@ -258,8 +258,8 @@ public class CsrfPreventionFilter extends
CsrfPreventionFilterBase {
return null;
}
@SuppressWarnings("unchecked")
-NonceCache nonceCache = (NonceCache) session
-.getAttribute(Constants.CSRF_NONCE_SESSION_ATTR_NAME);
+NonceCache nonceCache =
+(NonceCache)
session.getAttribute(Constants.CSRF_NONCE_SESSION_ATTR_NAME);
return nonceCache;
}
@@ -355,14 +355,14 @@ public class CsrfPreventionFilter extends
CsrfPreventionFilterBase {
//
[tomcat] branch 10.1.x updated: Code clean-up - formatting. No functional change.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 146e7f2fda Code clean-up - formatting. No functional change.
146e7f2fda is described below
commit 146e7f2fda19a0633ae8b10be910893ec615990e
Author: Mark Thomas
AuthorDate: Tue Jul 4 12:31:25 2023 +0100
Code clean-up - formatting. No functional change.
---
java/org/apache/catalina/filters/Constants.java| 3 +-
java/org/apache/catalina/filters/CorsFilter.java | 12
.../catalina/filters/CsrfPreventionFilter.java | 8 ++---
.../catalina/filters/CsrfPreventionFilterBase.java | 4 +--
.../org/apache/catalina/filters/ExpiresFilter.java | 34 +-
.../catalina/filters/HttpHeaderSecurityFilter.java | 4 ++-
.../apache/catalina/filters/RateLimitFilter.java | 4 +--
.../apache/catalina/filters/RemoteIpFilter.java| 22 +++---
.../catalina/filters/RestCsrfPreventionFilter.java | 15 +-
9 files changed, 58 insertions(+), 48 deletions(-)
diff --git a/java/org/apache/catalina/filters/Constants.java
b/java/org/apache/catalina/filters/Constants.java
index 25693aef56..dbec2a72cc 100644
--- a/java/org/apache/catalina/filters/Constants.java
+++ b/java/org/apache/catalina/filters/Constants.java
@@ -60,5 +60,6 @@ public final class Constants {
/**
* The servlet context attribute key under which the CSRF REST header name
can be found.
*/
-public static final String CSRF_REST_NONCE_HEADER_NAME_KEY =
"org.apache.catalina.filters.CSRF_REST_NONCE_HEADER_NAME";
+public static final String CSRF_REST_NONCE_HEADER_NAME_KEY =
+"org.apache.catalina.filters.CSRF_REST_NONCE_HEADER_NAME";
}
diff --git a/java/org/apache/catalina/filters/CorsFilter.java
b/java/org/apache/catalina/filters/CorsFilter.java
index 74314ba6b8..2760635f04 100644
--- a/java/org/apache/catalina/filters/CorsFilter.java
+++ b/java/org/apache/catalina/filters/CorsFilter.java
@@ -276,8 +276,8 @@ public class CorsFilter extends GenericFilter {
}
// Section 6.2.4
-String accessControlRequestHeadersHeader = request
-
.getHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_HEADERS);
+String accessControlRequestHeadersHeader =
+
request.getHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_HEADERS);
List accessControlRequestHeaders = new ArrayList<>();
if (accessControlRequestHeadersHeader != null &&
!accessControlRequestHeadersHeader.trim().isEmpty()) {
String[] headers =
accessControlRequestHeadersHeader.trim().split(",");
@@ -563,8 +563,8 @@ public class CorsFilter extends GenericFilter {
String method = request.getMethod();
if (method != null) {
if ("OPTIONS".equals(method)) {
-String accessControlRequestMethodHeader = request
-
.getHeader(REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD);
+String accessControlRequestMethodHeader =
+
request.getHeader(REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD);
if (accessControlRequestMethodHeader != null &&
!accessControlRequestMethodHeader.isEmpty()) {
requestType = CORSRequestType.PRE_FLIGHT;
} else if (accessControlRequestMethodHeader != null &&
@@ -894,8 +894,8 @@ public class CorsFilter extends GenericFilter {
/**
* Request headers sent as 'Access-Control-Request-Headers' header, for
pre-flight request.
*/
-public static final String HTTP_REQUEST_ATTRIBUTE_REQUEST_HEADERS =
HTTP_REQUEST_ATTRIBUTE_PREFIX +
-"request.headers";
+public static final String HTTP_REQUEST_ATTRIBUTE_REQUEST_HEADERS =
+HTTP_REQUEST_ATTRIBUTE_PREFIX + "request.headers";
// -- Constants
/**
diff --git a/java/org/apache/catalina/filters/CsrfPreventionFilter.java
b/java/org/apache/catalina/filters/CsrfPreventionFilter.java
index 28769a0b59..d33fdb8d08 100644
--- a/java/org/apache/catalina/filters/CsrfPreventionFilter.java
+++ b/java/org/apache/catalina/filters/CsrfPreventionFilter.java
@@ -258,8 +258,8 @@ public class CsrfPreventionFilter extends
CsrfPreventionFilterBase {
return null;
}
@SuppressWarnings("unchecked")
-NonceCache nonceCache = (NonceCache) session
-.getAttribute(Constants.CSRF_NONCE_SESSION_ATTR_NAME);
+NonceCache nonceCache =
+(NonceCache)
session.getAttribute(Constants.CSRF_NONCE_SESSION_ATTR_NAME);
return nonceCache;
}
@@ -343,14 +343,14 @@ public class CsrfPreventionFilter extends
CsrfPreventionFilterBase {
//
[tomcat] branch main updated: Code clean-up - formatting. No functional change.
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 83388f896a Code clean-up - formatting. No functional change.
83388f896a is described below
commit 83388f896aede1e54d77190638059a19474d6f70
Author: Mark Thomas
AuthorDate: Tue Jul 4 12:31:06 2023 +0100
Code clean-up - formatting. No functional change.
---
java/org/apache/catalina/filters/Constants.java| 3 +-
java/org/apache/catalina/filters/CorsFilter.java | 12
.../catalina/filters/CsrfPreventionFilter.java | 8 ++---
.../catalina/filters/CsrfPreventionFilterBase.java | 4 +--
.../org/apache/catalina/filters/ExpiresFilter.java | 34 +-
.../catalina/filters/HttpHeaderSecurityFilter.java | 4 ++-
.../apache/catalina/filters/RateLimitFilter.java | 4 +--
.../apache/catalina/filters/RemoteIpFilter.java| 22 +++---
.../catalina/filters/RestCsrfPreventionFilter.java | 15 +-
9 files changed, 58 insertions(+), 48 deletions(-)
diff --git a/java/org/apache/catalina/filters/Constants.java
b/java/org/apache/catalina/filters/Constants.java
index 25693aef56..dbec2a72cc 100644
--- a/java/org/apache/catalina/filters/Constants.java
+++ b/java/org/apache/catalina/filters/Constants.java
@@ -60,5 +60,6 @@ public final class Constants {
/**
* The servlet context attribute key under which the CSRF REST header name
can be found.
*/
-public static final String CSRF_REST_NONCE_HEADER_NAME_KEY =
"org.apache.catalina.filters.CSRF_REST_NONCE_HEADER_NAME";
+public static final String CSRF_REST_NONCE_HEADER_NAME_KEY =
+"org.apache.catalina.filters.CSRF_REST_NONCE_HEADER_NAME";
}
diff --git a/java/org/apache/catalina/filters/CorsFilter.java
b/java/org/apache/catalina/filters/CorsFilter.java
index 74314ba6b8..2760635f04 100644
--- a/java/org/apache/catalina/filters/CorsFilter.java
+++ b/java/org/apache/catalina/filters/CorsFilter.java
@@ -276,8 +276,8 @@ public class CorsFilter extends GenericFilter {
}
// Section 6.2.4
-String accessControlRequestHeadersHeader = request
-
.getHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_HEADERS);
+String accessControlRequestHeadersHeader =
+
request.getHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_HEADERS);
List accessControlRequestHeaders = new ArrayList<>();
if (accessControlRequestHeadersHeader != null &&
!accessControlRequestHeadersHeader.trim().isEmpty()) {
String[] headers =
accessControlRequestHeadersHeader.trim().split(",");
@@ -563,8 +563,8 @@ public class CorsFilter extends GenericFilter {
String method = request.getMethod();
if (method != null) {
if ("OPTIONS".equals(method)) {
-String accessControlRequestMethodHeader = request
-
.getHeader(REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD);
+String accessControlRequestMethodHeader =
+
request.getHeader(REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD);
if (accessControlRequestMethodHeader != null &&
!accessControlRequestMethodHeader.isEmpty()) {
requestType = CORSRequestType.PRE_FLIGHT;
} else if (accessControlRequestMethodHeader != null &&
@@ -894,8 +894,8 @@ public class CorsFilter extends GenericFilter {
/**
* Request headers sent as 'Access-Control-Request-Headers' header, for
pre-flight request.
*/
-public static final String HTTP_REQUEST_ATTRIBUTE_REQUEST_HEADERS =
HTTP_REQUEST_ATTRIBUTE_PREFIX +
-"request.headers";
+public static final String HTTP_REQUEST_ATTRIBUTE_REQUEST_HEADERS =
+HTTP_REQUEST_ATTRIBUTE_PREFIX + "request.headers";
// -- Constants
/**
diff --git a/java/org/apache/catalina/filters/CsrfPreventionFilter.java
b/java/org/apache/catalina/filters/CsrfPreventionFilter.java
index 28769a0b59..d33fdb8d08 100644
--- a/java/org/apache/catalina/filters/CsrfPreventionFilter.java
+++ b/java/org/apache/catalina/filters/CsrfPreventionFilter.java
@@ -258,8 +258,8 @@ public class CsrfPreventionFilter extends
CsrfPreventionFilterBase {
return null;
}
@SuppressWarnings("unchecked")
-NonceCache nonceCache = (NonceCache) session
-.getAttribute(Constants.CSRF_NONCE_SESSION_ATTR_NAME);
+NonceCache nonceCache =
+(NonceCache)
session.getAttribute(Constants.CSRF_NONCE_SESSION_ATTR_NAME);
return nonceCache;
}
@@ -343,14 +343,14 @@ public class CsrfPreventionFilter extends
CsrfPreventionFilterBase {
// Alth
[VOTE] Release Apache Tomcat 11.0.0-M9
The proposed Apache Tomcat 11.0.0-M9 release is now available for voting. Apache Tomcat 11.0.0-M9 is a milestone release of the 11.0.x branch and has been made to provide users with early access to the new features in Apache Tomcat 11.0.x so that they may provide feedback. The notable changes compared to the previous milestone include: - Add ContextNamingInfoListener, a listener which creates context naming information environment entries - Add PropertiesRoleMappingListener, a listener which populates the context's role mapping from a properties file. - Update the Jakarta EL and Jakarta WebSocket implementations to align with the latest changes planned for Jakarta EE 11 For full details, see the change log: https://nightlies.apache.org/tomcat/tomcat-11.0.x/docs/changelog.html Applications that run on Tomcat 9 and earlier will not run on Tomcat 11 without changes. Java EE applications designed for Tomcat 9 and earlier may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will automatically convert them to Jakarta EE and copy them to the webapps directory. Applications using deprecated APIs may require further changes. It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-11/v11.0.0-M9/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1443 The tag is: https://github.com/apache/tomcat/tree/11.0.0-M9 de714a23642a4d0baef342db6762a7f7a550d82c The proposed 11.0.0-M9 release is: [ ] -1 Broken - do not release [ ] +1 Alpha - go ahead and release as 11.0.0-M9 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r62819 - in /dev/tomcat/tomcat-11/v11.0.0-M9: ./ bin/ bin/embed/ src/
Author: markt Date: Tue Jul 4 10:55:40 2023 New Revision: 62819 Log: Upload 11.0.0-M9 for voting Added: dev/tomcat/tomcat-11/v11.0.0-M9/ dev/tomcat/tomcat-11/v11.0.0-M9/KEYS dev/tomcat/tomcat-11/v11.0.0-M9/README.html dev/tomcat/tomcat-11/v11.0.0-M9/RELEASE-NOTES dev/tomcat/tomcat-11/v11.0.0-M9/bin/ dev/tomcat/tomcat-11/v11.0.0-M9/bin/README.html dev/tomcat/tomcat-11/v11.0.0-M9/bin/apache-tomcat-11.0.0-M9-deployer.tar.gz (with props) dev/tomcat/tomcat-11/v11.0.0-M9/bin/apache-tomcat-11.0.0-M9-deployer.tar.gz.asc dev/tomcat/tomcat-11/v11.0.0-M9/bin/apache-tomcat-11.0.0-M9-deployer.tar.gz.sha512 dev/tomcat/tomcat-11/v11.0.0-M9/bin/apache-tomcat-11.0.0-M9-deployer.zip (with props) dev/tomcat/tomcat-11/v11.0.0-M9/bin/apache-tomcat-11.0.0-M9-deployer.zip.asc dev/tomcat/tomcat-11/v11.0.0-M9/bin/apache-tomcat-11.0.0-M9-deployer.zip.sha512 dev/tomcat/tomcat-11/v11.0.0-M9/bin/apache-tomcat-11.0.0-M9-fulldocs.tar.gz (with props) dev/tomcat/tomcat-11/v11.0.0-M9/bin/apache-tomcat-11.0.0-M9-fulldocs.tar.gz.asc dev/tomcat/tomcat-11/v11.0.0-M9/bin/apache-tomcat-11.0.0-M9-fulldocs.tar.gz.sha512 dev/tomcat/tomcat-11/v11.0.0-M9/bin/apache-tomcat-11.0.0-M9-windows-x64.zip (with props) dev/tomcat/tomcat-11/v11.0.0-M9/bin/apache-tomcat-11.0.0-M9-windows-x64.zip.asc dev/tomcat/tomcat-11/v11.0.0-M9/bin/apache-tomcat-11.0.0-M9-windows-x64.zip.sha512 dev/tomcat/tomcat-11/v11.0.0-M9/bin/apache-tomcat-11.0.0-M9.exe (with props) dev/tomcat/tomcat-11/v11.0.0-M9/bin/apache-tomcat-11.0.0-M9.exe.asc dev/tomcat/tomcat-11/v11.0.0-M9/bin/apache-tomcat-11.0.0-M9.exe.sha512 dev/tomcat/tomcat-11/v11.0.0-M9/bin/apache-tomcat-11.0.0-M9.tar.gz (with props) dev/tomcat/tomcat-11/v11.0.0-M9/bin/apache-tomcat-11.0.0-M9.tar.gz.asc dev/tomcat/tomcat-11/v11.0.0-M9/bin/apache-tomcat-11.0.0-M9.tar.gz.sha512 dev/tomcat/tomcat-11/v11.0.0-M9/bin/apache-tomcat-11.0.0-M9.zip (with props) dev/tomcat/tomcat-11/v11.0.0-M9/bin/apache-tomcat-11.0.0-M9.zip.asc dev/tomcat/tomcat-11/v11.0.0-M9/bin/apache-tomcat-11.0.0-M9.zip.sha512 dev/tomcat/tomcat-11/v11.0.0-M9/bin/embed/ dev/tomcat/tomcat-11/v11.0.0-M9/bin/embed/apache-tomcat-11.0.0-M9-embed.tar.gz (with props) dev/tomcat/tomcat-11/v11.0.0-M9/bin/embed/apache-tomcat-11.0.0-M9-embed.tar.gz.asc dev/tomcat/tomcat-11/v11.0.0-M9/bin/embed/apache-tomcat-11.0.0-M9-embed.tar.gz.sha512 dev/tomcat/tomcat-11/v11.0.0-M9/bin/embed/apache-tomcat-11.0.0-M9-embed.zip (with props) dev/tomcat/tomcat-11/v11.0.0-M9/bin/embed/apache-tomcat-11.0.0-M9-embed.zip.asc dev/tomcat/tomcat-11/v11.0.0-M9/bin/embed/apache-tomcat-11.0.0-M9-embed.zip.sha512 dev/tomcat/tomcat-11/v11.0.0-M9/src/ dev/tomcat/tomcat-11/v11.0.0-M9/src/apache-tomcat-11.0.0-M9-src.tar.gz (with props) dev/tomcat/tomcat-11/v11.0.0-M9/src/apache-tomcat-11.0.0-M9-src.tar.gz.asc dev/tomcat/tomcat-11/v11.0.0-M9/src/apache-tomcat-11.0.0-M9-src.tar.gz.sha512 dev/tomcat/tomcat-11/v11.0.0-M9/src/apache-tomcat-11.0.0-M9-src.zip (with props) dev/tomcat/tomcat-11/v11.0.0-M9/src/apache-tomcat-11.0.0-M9-src.zip.asc dev/tomcat/tomcat-11/v11.0.0-M9/src/apache-tomcat-11.0.0-M9-src.zip.sha512 Added: dev/tomcat/tomcat-11/v11.0.0-M9/KEYS == --- dev/tomcat/tomcat-11/v11.0.0-M9/KEYS (added) +++ dev/tomcat/tomcat-11/v11.0.0-M9/KEYS Tue Jul 4 10:55:40 2023 @@ -0,0 +1,453 @@ +This file contains the PGP&GPG keys of various Apache developers. +Please don't use them for email unless you have to. Their main +purpose is code signing. + +Apache users: pgp < KEYS +Apache developers: +(pgpk -ll && pgpk -xa ) >> this file. + or +(gpg --fingerprint --list-sigs + && gpg --armor --export ) >> this file. + +Apache developers: please ensure that your key is also available via the +PGP keyservers (such as pgpkeys.mit.edu). + + +pub 4096R/2F6059E7 2009-09-18 + Key fingerprint = A9C5 DF4D 22E9 9998 D987 5A51 10C0 1C5A 2F60 59E7 +uid Mark E D Thomas +sub 4096R/5E763BEC 2009-09-18 + +-BEGIN PGP PUBLIC KEY BLOCK- +Comment: GPGTools - http://gpgtools.org + +mQINBEq0DukBEAD4jovHOPJDxoD+JnO1Go2kiwpgRULasGlrVKuSUdP6wzcaqWmX +pqtOJKKwW2MQFQLmg7nQ9RjJwy3QCbKNDJQA/bwbQT1F7WzTCz2S6vxC4zxKck4t +6RZBq2dJsYKF0CEh6ZfY4dmKvhq+3istSoFRdHYoOPGWZpuRDqfZPdGm/m335/6K +GH59oysn1NE7a2a+kZzjBSEgv23+l4Z1Rg7+fpz1JcdHSdC2Z+ZRxML25eVatRVz +4yvDOZItqDURP24zWOodxgboldV6Y88C3v/7KRR+1vklzkuA2FqF8Q4r/2f0su7M +UVviQcy29y/RlLSDTTYoVlCZ1ni14qFU7Hpw43KJtgXmcUwq31T1+SlXdYjNJ1aF +kUi8BjCHDcSgE/IReKUanjHzm4XSymKDTeqqzidi4k6PDD4jyHb8k8vxi6qT6Udn +lcfo5NBkkUT1TauhEy8ktHhbl9k60BvvMBP9l6cURiJg1WS77egI4P/82oPbzzFi +GFqXyJKULVgxtdQ3JikCpodp3f1fh6PlYZwkW4xCJLJucJ5MiQp07HAkMVW5w+k8 +Xvuk4i5quh3N+2kzKHOOiQCDmN0sz0XjOE+7XBvM1lvz3+UarLfgSVmW8aheLd7e +aIl5ItBk8844ZJ60LrQ+JiIqvqJemxyIM6epoZvY5a3ZshZpcLilC5hW8QAR
[tomcat] 01/01: Tag 11.0.0-M9
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to tag 11.0.0-M9 in repository https://gitbox.apache.org/repos/asf/tomcat.git commit de714a23642a4d0baef342db6762a7f7a550d82c Author: Mark Thomas AuthorDate: Tue Jul 4 11:37:55 2023 +0100 Tag 11.0.0-M9 --- build.properties.release | 52 +++ res/install-win/Uninstall.exe.sig| Bin 0 -> 10251 bytes res/install-win/tomcat-installer.exe.sig | Bin 0 -> 10251 bytes res/maven/mvn.properties.release | 27 webapps/docs/changelog.xml | 2 +- 5 files changed, 80 insertions(+), 1 deletion(-) diff --git a/build.properties.release b/build.properties.release new file mode 100644 index 00..277704b8a3 --- /dev/null +++ b/build.properties.release @@ -0,0 +1,52 @@ +# - +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# - + +# This file was auto-generated by the pre-release Ant target. + +# Any unwanted settings may be over-ridden in a build.properties file located +# in the same directory as this file. + +# Set the version-dev to "" (empty string) as this is not a development release. +version.dev= + +# Ensure consistent timestamps for reproducible builds. +ant.tstamp.now.iso=2023-07-04T10:20:02Z + +# Enable insertion of detached signatures into the Windows installer. +do.codesigning=true + +# Re-use the same GPG executable. +gpg.exec=C:/Program Files (x86)/GnuPG/bin/gpg.exe + +# Reproducible builds require the use of the build tools defined below. The +# vendors (where appropriate) and versions must match exactly for a reproducible +# build since this data is embedded in various files, particularly JAR file +# manifests, as part of the build process. +# +# Apache Ant: Apache Ant(TM) version 1.10.12 compiled on October 13 2021 +# +# Java Name: OpenJDK 64-Bit Server VM +# Java Vendor: Oracle Corporation +# Java Version:21-ea+29-2411 + +# The following is provided for information only. Builds will be repeatable +# whether or not the build environment in consistent with this information. +# +# OS: amd64 Windows Server 2022 10.0 +# File encoding: UTF-8 +# +# Release Manager: markt diff --git a/res/install-win/Uninstall.exe.sig b/res/install-win/Uninstall.exe.sig new file mode 100644 index 00..0cb7184016 Binary files /dev/null and b/res/install-win/Uninstall.exe.sig differ diff --git a/res/install-win/tomcat-installer.exe.sig b/res/install-win/tomcat-installer.exe.sig new file mode 100644 index 00..8ddfa06a4c Binary files /dev/null and b/res/install-win/tomcat-installer.exe.sig differ diff --git a/res/maven/mvn.properties.release b/res/maven/mvn.properties.release new file mode 100644 index 00..f23cd4f738 --- /dev/null +++ b/res/maven/mvn.properties.release @@ -0,0 +1,27 @@ +# - +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# - + +# This file was auto-generated by the pre-release Ant target. + +# Remove "-dev" from the version since this is not a development release. +maven.asf.release.deploy.version=11.0.0-M9 + +# Re-use the same GPG executable. +gpg.exec=C:/Program Files (x86)/GnuPG/bin/gpg.exe + +# S
[tomcat] tag 11.0.0-M9 created (now de714a2364)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to tag 11.0.0-M9 in repository https://gitbox.apache.org/repos/asf/tomcat.git at de714a2364 (commit) This tag includes the following new commits: new de714a2364 Tag 11.0.0-M9 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot failure in on tomcat-9.0.x
Build status: BUILD FAILED: failed compile (failure) Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/37/builds/612 Blamelist: remm Build Text: failed compile (failure) Status Detected: new failure Build Source Stamp: [branch 9.0.x] 22a1062d216d30eca2688bb61bc520b412f9754a Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 2 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Update changelog entry for JSign 5.0
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 a0b1a59512 Update changelog entry for JSign 5.0 a0b1a59512 is described below commit a0b1a5951225ad615d594c710c3b55be2c95c699 Author: Mark Thomas AuthorDate: Tue Jul 4 11:11:00 2023 +0100 Update changelog entry for JSign 5.0 --- 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 9766f56aa8..977d8fe5cd 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -189,7 +189,7 @@ Update Checkstyle to 10.12.1. (markt) -Update JSign to 5.0. (markt) +Update JSign to 5.0. (markt/rjung) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Update changelog entry for JSign 5.0
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new 8a97efce09 Update changelog entry for JSign 5.0 8a97efce09 is described below commit 8a97efce0907676d599fc7f53ac28efbcba88a24 Author: Mark Thomas AuthorDate: Tue Jul 4 11:11:00 2023 +0100 Update changelog entry for JSign 5.0 --- 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 1fd5b4fd09..6987378381 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -198,7 +198,7 @@ Update BND to 6.4.1. (markt) -Update JSign to 5.0. (markt) +Update JSign to 5.0. (markt/rjung) - 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 changelog entry for JSign fix.
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 83d5e56bea Add changelog entry for JSign fix. 83d5e56bea is described below commit 83d5e56beab5689e5f87ab3558deb29a940b2523 Author: Mark Thomas AuthorDate: Tue Jul 4 11:08:59 2023 +0100 Add changelog entry for JSign fix. --- webapps/docs/changelog.xml | 7 +++ 1 file changed, 7 insertions(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 30ead13718..f14f27ff99 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -105,6 +105,13 @@ issues do not "pop up" wrt. others). --> + + + +Correct properties for JSign dependency. (rjung) + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: The 11.0.0-M8 release was cancelled
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 504c3104004fece6a2b736984100247756abba08 Author: Mark Thomas AuthorDate: Tue Jul 4 11:07:05 2023 +0100 The 11.0.0-M8 release was cancelled --- 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 3f7ebfb6a6..d71889d7ed 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -106,7 +106,7 @@ --> - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Add changelog entry for JSign fix.
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 4a91942341dad1b2962e3e5ef858f295e14b03be Author: Mark Thomas AuthorDate: Tue Jul 4 11:08:59 2023 +0100 Add changelog entry for JSign fix. --- webapps/docs/changelog.xml | 7 +++ 1 file changed, 7 insertions(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index d71889d7ed..c15078d332 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -105,6 +105,13 @@ issues do not "pop up" wrt. others). --> + + + +Correct properties for JSign dependency. (rjung) + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated (b7c1d9e343 -> 4a91942341)
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 b7c1d9e343 Fix jsign version number new 504c310400 The 11.0.0-M8 release was cancelled new 4a91942341 Add changelog entry for JSign fix. 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: webapps/docs/changelog.xml | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r62816 - /dev/tomcat/tomcat-11/v11.0.0-M8/
Author: markt Date: Tue Jul 4 10:06:23 2023 New Revision: 62816 Log: Drop 11.0.0-M8 - release cancelled Removed: dev/tomcat/tomcat-11/v11.0.0-M8/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 11.0.0-M8
I already did the fix but forgot the changelog item, because otherwise
the changelog for the version would be empty ...
Am 04.07.23 um 12:00 schrieb Mark Thomas:
On 04/07/2023 10:45, Rainer Jung wrote:
I see, the checksum and the version number in the comment was updated,
but not the one used for the download:
Thanks for catching this. I'll cancel the release, fix it and re-tag.
Mark
diff --git a/build.properties.default b/build.properties.default
index 172a08a083..aa8179820c 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -318,10 +318,10 @@
bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.b
# - JSign, version 4.1 or later -
jsign.version=4.2
-# checksums for JSign 4.2
+# checksums for JSign 5.0
jsign.checksum.enabled=true
jsign.checksum.algorithm=MD5|SHA-1
-jsign.checksum.value=10fb38a1182515d583a1e252c8219eae|1e3b44e0114d599b05be243513b85a51b0c45401
+jsign.checksum.value=79c4f9bdff74a4ccee3d72f020ad45b7|5a6677625413e0d8acb52f80fa6fbb9031a6a9d0
jsign.home=${base.path}/jsign-${jsign.version}
jsign.jar=${jsign.home}/jsign-${jsign.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c254896add..0dbdaaa8d3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -197,6 +197,9 @@
Update BND to 6.4.1. (markt)
+
+ Update JSign to 5.0. (markt)
+
The same is true for 9.0.
Regards,
Rainer
-
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 jsign version number
This is an automated email from the ASF dual-hosted git repository.
rjung 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 eb3beee476 Fix jsign version number
eb3beee476 is described below
commit eb3beee476d9f7dd60b37ffb50bc1961f686cb7c
Author: Rainer Jung
AuthorDate: Tue Jul 4 12:04:44 2023 +0200
Fix jsign version number
---
build.properties.default | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.properties.default b/build.properties.default
index 929dad74aa..672be22f80 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -307,7 +307,7 @@ spotbugs.jar=${spotbugs.home}/lib/spotbugs-ant.jar
spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/spotbugs-${spotbugs.version}.tgz
# - JSign, version 4.1 or later -
-jsign.version=4.2
+jsign.version=5.0
# checksums for JSign 5.0
jsign.checksum.enabled=true
-
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 jsign version number
This is an automated email from the ASF dual-hosted git repository.
rjung 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 250a8e0491 Fix jsign version number
250a8e0491 is described below
commit 250a8e0491e432a462519124997ba7a48af90751
Author: Rainer Jung
AuthorDate: Tue Jul 4 12:03:59 2023 +0200
Fix jsign version number
---
build.properties.default | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.properties.default b/build.properties.default
index d01a9c0377..413163eaf8 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -316,7 +316,7 @@ 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
# - JSign, version 4.1 or later -
-jsign.version=4.2
+jsign.version=5.0
# checksums for JSign 5.0
jsign.checksum.enabled=true
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix jsign version number
This is an automated email from the ASF dual-hosted git repository.
rjung 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 b7c1d9e343 Fix jsign version number
b7c1d9e343 is described below
commit b7c1d9e343e78b388b27ed7977f2a4ad3c266c07
Author: Rainer Jung
AuthorDate: Tue Jul 4 12:01:29 2023 +0200
Fix jsign version number
---
build.properties.default | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.properties.default b/build.properties.default
index a266768ed3..d7704a2349 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -317,7 +317,7 @@
openssl-lib.jar=${openssl-lib.home}/tomcat-coyote-openssl-java17-${openssl-lib.v
openssl-lib.loc=${base-maven.loc}/org/apache/tomcat/tomcat-coyote-openssl-java17/${openssl-lib.version}/tomcat-coyote-openssl-java17-${openssl-lib.version}.jar
# - JSign, version 4.1 or later -
-jsign.version=4.2
+jsign.version=5.0
# checksums for JSign 5.0
jsign.checksum.enabled=true
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Fix jsign version number
This is an automated email from the ASF dual-hosted git repository.
rjung pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 1fc525a931 Fix jsign version number
1fc525a931 is described below
commit 1fc525a9317be3f36218f276e69291220a310578
Author: Rainer Jung
AuthorDate: Tue Jul 4 12:03:20 2023 +0200
Fix jsign version number
---
build.properties.default | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.properties.default b/build.properties.default
index b969fe066a..e03fb7a009 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -338,7 +338,7 @@
openssl-lib.jar=${openssl-lib.home}/tomcat-coyote-openssl-java17-${openssl-lib.v
openssl-lib.loc=${base-maven.loc}/org/apache/tomcat/tomcat-coyote-openssl-java17/${openssl-lib.version}/tomcat-coyote-openssl-java17-${openssl-lib.version}.jar
# - JSign, version 4.1 or later -
-jsign.version=4.2
+jsign.version=5.0
# checksums for JSign 5.0
jsign.checksum.enabled=true
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE][CANCELLED] Release Apache Tomcat 11.0.0-M8
This release has been cancelled due to an error in the properties for the JSign update. Mark On 03/07/2023 20:33, Mark Thomas wrote: The proposed Apache Tomcat 11.0.0-M8 release is now available for voting. Apache Tomcat 11.0.0-M8 is a milestone release of the 11.0.x branch and has been made to provide users with early access to the new features in Apache Tomcat 11.0.x so that they may provide feedback. The notable changes compared to the previous milestone include: - Add ContextNamingInfoListener, a listener which creates context naming information environment entries - Add PropertiesRoleMappingListener, a listener which populates the context's role mapping from a properties file. - Update the Jakarta EL and Jakarta WebSocket implementations to align with the latest changes planned for Jakarta EE 11 For full details, see the change log: https://nightlies.apache.org/tomcat/tomcat-11.0.x/docs/changelog.html Applications that run on Tomcat 9 and earlier will not run on Tomcat 11 without changes. Java EE applications designed for Tomcat 9 and earlier may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will automatically convert them to Jakarta EE and copy them to the webapps directory. Applications using deprecated APIs may require further changes. It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-11/v11.0.0-M8/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1441 The tag is: https://github.com/apache/tomcat/tree/11.0.0-M8 434400d882a20e12ea03855f4bd93451bd3362c6 The proposed 11.0.0-M8 release is: [ ] -1 Broken - do not release [ ] +1 Alpha - go ahead and release as 11.0.0-M8 - 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: [VOTE] Release Apache Tomcat 11.0.0-M8
On 04/07/2023 10:45, Rainer Jung wrote:
I see, the checksum and the version number in the comment was updated,
but not the one used for the download:
Thanks for catching this. I'll cancel the release, fix it and re-tag.
Mark
diff --git a/build.properties.default b/build.properties.default
index 172a08a083..aa8179820c 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -318,10 +318,10 @@
bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.b
# - JSign, version 4.1 or later -
jsign.version=4.2
-# checksums for JSign 4.2
+# checksums for JSign 5.0
jsign.checksum.enabled=true
jsign.checksum.algorithm=MD5|SHA-1
-jsign.checksum.value=10fb38a1182515d583a1e252c8219eae|1e3b44e0114d599b05be243513b85a51b0c45401
+jsign.checksum.value=79c4f9bdff74a4ccee3d72f020ad45b7|5a6677625413e0d8acb52f80fa6fbb9031a6a9d0
jsign.home=${base.path}/jsign-${jsign.version}
jsign.jar=${jsign.home}/jsign-${jsign.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c254896add..0dbdaaa8d3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -197,6 +197,9 @@
Update BND to 6.4.1. (markt)
+
+ Update JSign to 5.0. (markt)
+
The same is true for 9.0.
Regards,
Rainer
-
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: [VOTE] Release Apache Tomcat 11.0.0-M8
I see, the checksum and the version number in the comment was updated,
but not the one used for the download:
diff --git a/build.properties.default b/build.properties.default
index 172a08a083..aa8179820c 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -318,10 +318,10 @@
bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.b
# - JSign, version 4.1 or later -
jsign.version=4.2
-# checksums for JSign 4.2
+# checksums for JSign 5.0
jsign.checksum.enabled=true
jsign.checksum.algorithm=MD5|SHA-1
-jsign.checksum.value=10fb38a1182515d583a1e252c8219eae|1e3b44e0114d599b05be243513b85a51b0c45401
+jsign.checksum.value=79c4f9bdff74a4ccee3d72f020ad45b7|5a6677625413e0d8acb52f80fa6fbb9031a6a9d0
jsign.home=${base.path}/jsign-${jsign.version}
jsign.jar=${jsign.home}/jsign-${jsign.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c254896add..0dbdaaa8d3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -197,6 +197,9 @@
Update BND to 6.4.1. (markt)
+
+Update JSign to 5.0. (markt)
+
The same is true for 9.0.
Regards,
Rainer
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 11.0.0-M8
Am 03.07.23 um 21:33 schrieb Mark Thomas: The proposed Apache Tomcat 11.0.0-M8 release is now available for voting. Apache Tomcat 11.0.0-M8 is a milestone release of the 11.0.x branch and has been made to provide users with early access to the new features in Apache Tomcat 11.0.x so that they may provide feedback. The notable changes compared to the previous milestone include: - Add ContextNamingInfoListener, a listener which creates context naming information environment entries - Add PropertiesRoleMappingListener, a listener which populates the context's role mapping from a properties file. - Update the Jakarta EL and Jakarta WebSocket implementations to align with the latest changes planned for Jakarta EE 11 For full details, see the change log: https://nightlies.apache.org/tomcat/tomcat-11.0.x/docs/changelog.html Applications that run on Tomcat 9 and earlier will not run on Tomcat 11 without changes. Java EE applications designed for Tomcat 9 and earlier may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will automatically convert them to Jakarta EE and copy them to the webapps directory. Applications using deprecated APIs may require further changes. It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-11/v11.0.0-M8/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1441 The tag is: https://github.com/apache/tomcat/tree/11.0.0-M8 434400d882a20e12ea03855f4bd93451bd3362c6 The proposed 11.0.0-M8 release is: [ ] -1 Broken - do not release [ ] +1 Alpha - go ahead and release as 11.0.0-M8 During downloadfile: [get] Getting: https://repo.maven.apache.org/maven2/net/jsign/jsign/4.2/jsign-4.2.jar [get] To: /shared/build/autobuild/workdirs/current/20230704_112956/bld/tomcat110_incoming/deps/download-1593579538.tmp I get Checksum check failure for jsign-4.2.jar (.../deps/download-1593579538.tmp). Algorithm: MD5|SHA-1 Expected value: 79c4f9bdff74a4ccee3d72f020ad45b7|5a6677625413e0d8acb52f80fa6fbb9031a6a9d0 Actual values: SHA-512: 0a5e3a96a99b6736fed913da201c0003d2009690b4157ad9894107b1b12b5e76befd0b0f5bf016b475c71b09e97f3d1eac8c4fab138a968fa64beec527dee16d SHA-384: 763de16603fc1921f86643e1c1103f40f5d8c82db4c6a2f90c89aa4baeabd02fd17cf35d587ff00540ffef369a57fb8e SHA-256: 290377fc4f593256200b3ea4061b7409e8276255f449d4c6de7833faf0850cc1 SHA-1: 1e3b44e0114d599b05be243513b85a51b0c45401 MD5: 10fb38a1182515d583a1e252c8219eae Was there some dependecy version upfdate without adjusting checksums? Or should I look for a problem on my side? Thanks ands regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE] Release Apache Tomcat 9.0.77
The proposed Apache Tomcat 9.0.77 release is now available for voting. The notable changes compared to 9.0.76 are: - Add ContextNamingInfoListener, a listener which creates context naming information environment entries - Add PropertiesRoleMappingListener, a listener which populates the context's role mapping from a properties file. Along with lots of other bug fixes and improvements. For full details, see the changelog: https://nightlies.apache.org/tomcat/tomcat-9.0.x/docs/changelog.html It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.77/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1442 The tag is: https://github.com/apache/tomcat/tree/9.0.77 822ce771d16cf6d3bf32185caeb8b83a28782396 The proposed 9.0.77 release is: [ ] -1, Broken - do not release [ ] +1, Stable - go ahead and release as 9.0.77 Rémy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Next release is 9.0.78
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 22a1062d21 Next release is 9.0.78 22a1062d21 is described below commit 22a1062d216d30eca2688bb61bc520b412f9754a Author: remm AuthorDate: Tue Jul 4 11:23:42 2023 +0200 Next release is 9.0.78 --- build.properties.default | 2 +- res/maven/mvn.properties.default | 2 +- webapps/docs/changelog.xml | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.properties.default b/build.properties.default index aa8179820c..d01a9c0377 100644 --- a/build.properties.default +++ b/build.properties.default @@ -31,7 +31,7 @@ # - Version Control Flags - version.major=9 version.minor=0 -version.build=77 +version.build=78 version.patch=0 version.suffix= version.dev=-dev diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default index a18562471e..6687474616 100644 --- a/res/maven/mvn.properties.default +++ b/res/maven/mvn.properties.default @@ -39,7 +39,7 @@ maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d maven.asf.release.repo.repositoryId=apache.releases.https # Release version info -maven.asf.release.deploy.version=9.0.77 +maven.asf.release.deploy.version=9.0.78 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 0dbdaaa8d3..30ead13718 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -104,7 +104,9 @@ They eventually become mixed with the numbered issues (i.e., numbered issues do not "pop up" wrt. others). --> - + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r62815 - in /dev/tomcat/tomcat-9/v9.0.77: ./ bin/ bin/embed/ src/
Author: remm Date: Tue Jul 4 09:18:38 2023 New Revision: 62815 Log: Upload 9.0.77 for voting Added: dev/tomcat/tomcat-9/v9.0.77/ dev/tomcat/tomcat-9/v9.0.77/KEYS dev/tomcat/tomcat-9/v9.0.77/README.html dev/tomcat/tomcat-9/v9.0.77/RELEASE-NOTES dev/tomcat/tomcat-9/v9.0.77/bin/ dev/tomcat/tomcat-9/v9.0.77/bin/README.html dev/tomcat/tomcat-9/v9.0.77/bin/apache-tomcat-9.0.77-deployer.tar.gz (with props) dev/tomcat/tomcat-9/v9.0.77/bin/apache-tomcat-9.0.77-deployer.tar.gz.asc (with props) dev/tomcat/tomcat-9/v9.0.77/bin/apache-tomcat-9.0.77-deployer.tar.gz.sha512 dev/tomcat/tomcat-9/v9.0.77/bin/apache-tomcat-9.0.77-deployer.zip (with props) dev/tomcat/tomcat-9/v9.0.77/bin/apache-tomcat-9.0.77-deployer.zip.asc (with props) dev/tomcat/tomcat-9/v9.0.77/bin/apache-tomcat-9.0.77-deployer.zip.sha512 dev/tomcat/tomcat-9/v9.0.77/bin/apache-tomcat-9.0.77-fulldocs.tar.gz (with props) dev/tomcat/tomcat-9/v9.0.77/bin/apache-tomcat-9.0.77-fulldocs.tar.gz.asc (with props) dev/tomcat/tomcat-9/v9.0.77/bin/apache-tomcat-9.0.77-fulldocs.tar.gz.sha512 dev/tomcat/tomcat-9/v9.0.77/bin/apache-tomcat-9.0.77-windows-x64.zip (with props) dev/tomcat/tomcat-9/v9.0.77/bin/apache-tomcat-9.0.77-windows-x64.zip.asc (with props) dev/tomcat/tomcat-9/v9.0.77/bin/apache-tomcat-9.0.77-windows-x64.zip.sha512 dev/tomcat/tomcat-9/v9.0.77/bin/apache-tomcat-9.0.77-windows-x86.zip (with props) dev/tomcat/tomcat-9/v9.0.77/bin/apache-tomcat-9.0.77-windows-x86.zip.asc (with props) dev/tomcat/tomcat-9/v9.0.77/bin/apache-tomcat-9.0.77-windows-x86.zip.sha512 dev/tomcat/tomcat-9/v9.0.77/bin/apache-tomcat-9.0.77.exe (with props) dev/tomcat/tomcat-9/v9.0.77/bin/apache-tomcat-9.0.77.exe.asc (with props) dev/tomcat/tomcat-9/v9.0.77/bin/apache-tomcat-9.0.77.exe.sha512 dev/tomcat/tomcat-9/v9.0.77/bin/apache-tomcat-9.0.77.tar.gz (with props) dev/tomcat/tomcat-9/v9.0.77/bin/apache-tomcat-9.0.77.tar.gz.asc (with props) dev/tomcat/tomcat-9/v9.0.77/bin/apache-tomcat-9.0.77.tar.gz.sha512 dev/tomcat/tomcat-9/v9.0.77/bin/apache-tomcat-9.0.77.zip (with props) dev/tomcat/tomcat-9/v9.0.77/bin/apache-tomcat-9.0.77.zip.asc (with props) dev/tomcat/tomcat-9/v9.0.77/bin/apache-tomcat-9.0.77.zip.sha512 dev/tomcat/tomcat-9/v9.0.77/bin/embed/ dev/tomcat/tomcat-9/v9.0.77/bin/embed/apache-tomcat-9.0.77-embed.tar.gz (with props) dev/tomcat/tomcat-9/v9.0.77/bin/embed/apache-tomcat-9.0.77-embed.tar.gz.asc (with props) dev/tomcat/tomcat-9/v9.0.77/bin/embed/apache-tomcat-9.0.77-embed.tar.gz.sha512 dev/tomcat/tomcat-9/v9.0.77/bin/embed/apache-tomcat-9.0.77-embed.zip (with props) dev/tomcat/tomcat-9/v9.0.77/bin/embed/apache-tomcat-9.0.77-embed.zip.asc (with props) dev/tomcat/tomcat-9/v9.0.77/bin/embed/apache-tomcat-9.0.77-embed.zip.sha512 dev/tomcat/tomcat-9/v9.0.77/src/ dev/tomcat/tomcat-9/v9.0.77/src/apache-tomcat-9.0.77-src.tar.gz (with props) dev/tomcat/tomcat-9/v9.0.77/src/apache-tomcat-9.0.77-src.tar.gz.asc (with props) dev/tomcat/tomcat-9/v9.0.77/src/apache-tomcat-9.0.77-src.tar.gz.sha512 dev/tomcat/tomcat-9/v9.0.77/src/apache-tomcat-9.0.77-src.zip (with props) dev/tomcat/tomcat-9/v9.0.77/src/apache-tomcat-9.0.77-src.zip.asc (with props) dev/tomcat/tomcat-9/v9.0.77/src/apache-tomcat-9.0.77-src.zip.sha512 Added: dev/tomcat/tomcat-9/v9.0.77/KEYS == --- dev/tomcat/tomcat-9/v9.0.77/KEYS (added) +++ dev/tomcat/tomcat-9/v9.0.77/KEYS Tue Jul 4 09:18:38 2023 @@ -0,0 +1,237 @@ +This file contains the PGP&GPG keys of various Apache developers. +Please don't use them for email unless you have to. Their main +purpose is code signing. + +Apache users: pgp < KEYS +Apache developers: +(pgpk -ll && pgpk -xa ) >> this file. + or +(gpg --fingerprint --list-sigs + && gpg --armor --export ) >> this file. + +Apache developers: please ensure that your key is also available via the +PGP keyservers (such as pgpkeys.mit.edu). + + +pub 1024D/33C60243 2004-09-12 + Key fingerprint = DCFD 35E0 BF8C A734 4752 DE8B 6FB2 1E89 33C6 0243 +uid Mark E D Thomas +uid Mark E D Thomas +uid Mark E D Thomas +sub 2048g/0BECE548 2004-09-12 + +pub 4096R/2F6059E7 2009-09-18 + Key fingerprint = A9C5 DF4D 22E9 9998 D987 5A51 10C0 1C5A 2F60 59E7 +uid Mark E D Thomas +sub 4096R/5E763BEC 2009-09-18 + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1.4.9 (MingW32) + +mQGiBEFEjegRBADocGttfROvtLGrTOW3xRqZHmFWybmEaI6jmnRdN/1gGXmb3wQL +rHsS3fLFIIOYLPph0Kov9q4qNq36LekShIvjMBDFoj2/wRxaUtFq81asaRZg8Mcw +4kVeIoe8OIOuWmvYhU8SH2jJNUnVVrpTPAa6QWquTmseNi6UJMjLxuL7DwCg//9u +k2yj0vk6e4WSO6Fe5+EkQDED/AjQsy0kj9TpNHkKSSUR2evRlWPYA0YtxBSbsgON +tT0cYipAp5IcYt6Zq5QzHiZreyQXLAjItDS2oGCIXfNbTYJ3kxxJTCU/3wlefV
[tomcat] 01/01: Tag 9.0.77
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to tag 9.0.77 in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 822ce771d16cf6d3bf32185caeb8b83a28782396 Author: remm AuthorDate: Tue Jul 4 11:10:29 2023 +0200 Tag 9.0.77 --- build.properties.release | 52 +++ res/install-win/Uninstall.exe.sig| Bin 0 -> 10247 bytes res/install-win/tomcat-installer.exe.sig | Bin 0 -> 10247 bytes res/maven/mvn.properties.release | 27 webapps/docs/changelog.xml | 2 +- 5 files changed, 80 insertions(+), 1 deletion(-) diff --git a/build.properties.release b/build.properties.release new file mode 100644 index 00..f355d33f22 --- /dev/null +++ b/build.properties.release @@ -0,0 +1,52 @@ +# - +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# - + +# This file was auto-generated by the pre-release Ant target. + +# Any unwanted settings may be over-ridden in a build.properties file located +# in the same directory as this file. + +# Set the version-dev to "" (empty string) as this is not a development release. +version.dev= + +# Ensure consistent timestamps for reproducible builds. +ant.tstamp.now.iso=2023-07-04T09:01:28Z + +# Enable insertion of detached signatures into the Windows installer. +do.codesigning=true + +# Re-use the same GPG executable. +gpg.exec=/usr/bin/gpg + +# Reproducible builds require the use of the build tools defined below. The +# vendors (where appropriate) and versions must match exactly for a reproducible +# build since this data is embedded in various files, particularly JAR file +# manifests, as part of the build process. +# +# Apache Ant: Apache Ant(TM) version 1.10.12 compiled on January 18 2023 +# +# Java Name: OpenJDK 64-Bit Server VM +# Java Vendor: Eclipse Adoptium +# Java Version:11.0.19+7 + +# The following is provided for information only. Builds will be repeatable +# whether or not the build environment in consistent with this information. +# +# OS: amd64 Linux 6.3.8-200.fc38.x86_64 +# File encoding: UTF-8 +# +# Release Manager: remm diff --git a/res/install-win/Uninstall.exe.sig b/res/install-win/Uninstall.exe.sig new file mode 100644 index 00..99ca15594e Binary files /dev/null and b/res/install-win/Uninstall.exe.sig differ diff --git a/res/install-win/tomcat-installer.exe.sig b/res/install-win/tomcat-installer.exe.sig new file mode 100644 index 00..5884ea34ce Binary files /dev/null and b/res/install-win/tomcat-installer.exe.sig differ diff --git a/res/maven/mvn.properties.release b/res/maven/mvn.properties.release new file mode 100644 index 00..561c0d55dd --- /dev/null +++ b/res/maven/mvn.properties.release @@ -0,0 +1,27 @@ +# - +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# - + +# This file was auto-generated by the pre-release Ant target. + +# Remove "-dev" from the version since this is not a development release. +maven.asf.release.deploy.version=9.0.77 + +# Re-use the same GPG executable. +gpg.exec=/usr/bin/gpg + +# Set the user name to use to upload the artefacts to Nexus. +asf.ldap.username=
[tomcat] tag 9.0.77 created (now 822ce771d1)
This is an automated email from the ASF dual-hosted git repository. remm pushed a change to tag 9.0.77 in repository https://gitbox.apache.org/repos/asf/tomcat.git at 822ce771d1 (commit) This tag includes the following new commits: new 822ce771d1 Tag 9.0.77 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 11.0.0-M8
On 03/07/2023 20:33, Mark Thomas wrote: The proposed 11.0.0-M8 release is: [ ] -1 Broken - do not release [X] +1 Alpha - go ahead and release as 11.0.0-M8 Unit tests pass on Windows, Linux, MacOS (M1) and MacOS (Intel) Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
