svn commit: r1895074 - in /tomcat/site/trunk/docs/tomcat-9.0-doc/api/org/apache/catalina: WebResourceRoot.CacheStrategy.html webresources/MyCacheStrategy.html

2021-11-15 Thread remm
Author: remm
Date: Mon Nov 15 21:52:59 2021
New Revision: 1895074

URL: http://svn.apache.org/viewvc?rev=1895074=rev
Log:
Add new files

Added:

tomcat/site/trunk/docs/tomcat-9.0-doc/api/org/apache/catalina/WebResourceRoot.CacheStrategy.html

tomcat/site/trunk/docs/tomcat-9.0-doc/api/org/apache/catalina/webresources/MyCacheStrategy.html

Added: 
tomcat/site/trunk/docs/tomcat-9.0-doc/api/org/apache/catalina/WebResourceRoot.CacheStrategy.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-9.0-doc/api/org/apache/catalina/WebResourceRoot.CacheStrategy.html?rev=1895074=auto
==
--- 
tomcat/site/trunk/docs/tomcat-9.0-doc/api/org/apache/catalina/WebResourceRoot.CacheStrategy.html
 (added)
+++ 
tomcat/site/trunk/docs/tomcat-9.0-doc/api/org/apache/catalina/WebResourceRoot.CacheStrategy.html
 Mon Nov 15 21:52:59 2021
@@ -0,0 +1,244 @@
+http://www.w3.org/TR/html4/loose.dtd;>
+
+
+
+
+
+WebResourceRoot.CacheStrategy (Apache Tomcat 9.0.55 API 
Documentation)
+
+
+
+
+
+var methods = {"i0":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance 
Methods"],4:["t3","Abstract Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+Skip navigation links
+
+
+
+
+Overview
+Package
+Class
+Tree
+Deprecated
+Index
+Help
+
+Apache Tomcat 9.0.55
+
+
+
+PrevClass
+NextClass
+
+
+Frames
+NoFrames
+
+
+AllClasses
+
+
+
+
+
+
+
+Summary:
+Nested|
+Field|
+Constr|
+Method
+
+
+Detail:
+Field|
+Constr|
+Method
+
+
+
+
+
+
+
+
+org.apache.catalina
+Interface 
WebResourceRoot.CacheStrategy
+
+
+
+
+
+
+All Known Implementing Classes:
+MyCacheStrategy
+
+
+Enclosing interface:
+WebResourceRoot
+
+
+
+public static interface WebResourceRoot.CacheStrategy
+Provides a mechanism to modify the caching behaviour.
+
+
+
+
+
+
+
+
+
+
+
+Method Summary
+
+All MethodsInstance MethodsAbstract Methods
+
+Modifier and Type
+Method and Description
+
+
+boolean
+noCache(https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">Stringpath)
+Should the result of looking up the resource at the given 
path be
+ excluded from caching?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Method Detail
+
+
+
+
+
+noCache
+booleannoCache(https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true;
 title="class or interface in java.lang">Stringpath)
+Should the result of looking up the resource at the given 
path be
+ excluded from caching?
+
+Parameters:
+path - The path to check against the strategy to see if the
+  result should be cached
+Returns:
+true if the result should not be cached, otherwise
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Skip navigation links
+
+
+
+
+Overview
+Package
+Class
+Tree
+Deprecated
+Index
+Help
+
+Apache Tomcat 9.0.55
+
+
+
+PrevClass
+NextClass
+
+
+Frames
+NoFrames
+
+
+AllClasses
+
+
+
+
+
+
+
+Summary:
+Nested|
+Field|
+Constr|
+Method
+
+
+Detail:
+Field|
+Constr|
+Method
+
+
+
+
+
+
+Copyright  2000-2021 Apache Software 
Foundation. All Rights Reserved.
+
+

Added: 
tomcat/site/trunk/docs/tomcat-9.0-doc/api/org/apache/catalina/webresources/MyCacheStrategy.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-9.0-doc/api/org/apache/catalina/webresources/MyCacheStrategy.html?rev=1895074=auto
==
--- 
tomcat/site/trunk/docs/tomcat-9.0-doc/api/org/apache/catalina/webresources/MyCacheStrategy.html
 (added)
+++ 
tomcat/site/trunk/docs/tomcat-9.0-doc/api/org/apache/catalina/webresources/MyCacheStrategy.html
 Mon Nov 15 21:52:59 2021
@@ -0,0 +1,293 @@
+http://www.w3.org/TR/html4/loose.dtd;>
+
+
+
+
+
+MyCacheStrategy (Apache Tomcat 9.0.55 API Documentation)
+
+
+
+
+
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance 
Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = 

[VOTE][RESULT] Release Apache Tomcat 8.5.73

2021-11-15 Thread Christopher Schultz

The following votes were cast:

Binding:
+1: isapir, michaelo, schultz

No other votes were cast, therefore the vote passes. I'll start the 
release process shortly.


Thanks to everyone who contributed to this release.

-chris

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: [VOTE] Release Apache Tomcat 8.5.73

2021-11-15 Thread Christopher Schultz




On 11/11/21 10:34, Christopher Schultz wrote:

The proposed Apache Tomcat 8.5.73 release is now available for voting.

The notable changes compared to 8.5.72 are:

- Improvements to native/APR including avoiding a JVM crash if APR fails
    to properly initialize and improving error handling.

- Improve robustness of JNDIRealm for exceptions occurring when getting
    the connection.

Along with lots of other bug fixes and improvements.

For full details, see the changelog:
https://ci.apache.org/projects/tomcat/tomcat-8.5.x/docs/changelog.html

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.73/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1342
The tag is:
https://github.com/apache/tomcat/tree/8.5.73/
Commit e8de8521b0f88b452ac6bd79abad3aad3bcc18b6

The proposed 8.5.73 release is:
[ ] Broken - do not release
[X] Stable - go ahead and release as 8.5.73 (stable)


Works on a boring web application.

Details:
* Environment
*  Java (build): openjdk version "1.8.0_292" OpenJDK Runtime 
Environment (build 1.8.0_292-8u292-b10-0+deb9u1-b10) OpenJDK 64-Bit 
Server VM (build 25.292-b10, mixed mode)
*  Java (test): openjdk version "1.8.0_292" OpenJDK Runtime 
Environment (build 1.8.0_292-8u292-b10-0+deb9u1-b10) OpenJDK 64-Bit 
Server VM (build 25.292-b10, mixed mode)

*  OS:   Linux 4.19.0-17-amd64 x86_64
*  cc:   cc (Debian 8.3.0-6) 8.3.0
*  make: GNU Make 4.2.1
*  OpenSSL:  OpenSSL 1.1.1 11 Sep 2018
*  APR:  1.6.5
*
* Valid SHA-512 signature for apache-tomcat-8.5.73.zip
* Valid GPG signature for apache-tomcat-8.5.73.zip
* Valid SHA-512 signature for apache-tomcat-8.5.73.tar.gz
* Valid GPG signature for apache-tomcat-8.5.73.tar.gz
* Valid SHA-512 signature for apache-tomcat-8.5.73.exe
* Valid GPG signature for apache-tomcat-8.5.73.exe
* Valid Windows Digital Signature for apache-tomcat-8.5.73.exe
* Valid SHA512 signature for apache-tomcat-8.5.73-src.zip
* Valid GPG signature for apache-tomcat-8.5.73-src.zip
* Valid SHA512 signature for apache-tomcat-8.5.73-src.tar.gz
* Valid GPG signature for apache-tomcat-8.5.73-src.tar.gz
*
* Binary Zip and tarball: Same
* Source Zip and tarball: Same
*
* Building dependencies returned: 0
* tcnative builds cleanly
* Tomcat builds cleanly
* Junit Tests: FAILED
*
* Tests that failed:
* org.apache.tomcat.util.net.openssl.ciphers.TestCipher.APR.txt
* org.apache.tomcat.util.net.openssl.ciphers.TestCipher.NIO.txt
* org.apache.tomcat.util.net.openssl.ciphers.TestCipher.NIO2.txt
* 
org.apache.tomcat.util.net.openssl.ciphers.TestOpenSSLCipherConfigurationParser.APR.txt
* 
org.apache.tomcat.util.net.openssl.ciphers.TestOpenSSLCipherConfigurationParser.NIO.txt
* 
org.apache.tomcat.util.net.openssl.ciphers.TestOpenSSLCipherConfigurationParser.NIO2.txt


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[ANN] Apache Tomcat 9.0.55 available

2021-11-15 Thread Rémy Maucherat
The Apache Tomcat team announces the immediate availability of Apache
Tomcat 9.0.55.

Apache Tomcat 9 is an open source software implementation of the Java
Servlet, JavaServer Pages, Java Unified Expression Language, Java
WebSocket and JASPIC technologies.

Apache Tomcat 9.0.55 is a bugfix and feature release. The notable
changes compared to 9.0.54 include:

- Experimental OpenSSL support through the Panama API incubating in Java
17, with support for OpenSSL 1.1+.

- Add support for custom caching strategies for web application
resources. This initial implementation allows control over whether or
not a resource is cached.

- Improve robustness of JNDIRealm for exceptions occurring when getting
the connection.

Along with lots of other bug fixes and improvements.

Please refer to the change log for the complete list of changes:
https://tomcat.apache.org/tomcat-9.0-doc/changelog.html


Downloads:
https://tomcat.apache.org/download-90.cgi

Migration guides from Apache Tomcat 7.x and 8.x:
https://tomcat.apache.org/migration.html

Enjoy!

- The Apache Tomcat team

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1895069 - in /tomcat/site/trunk/docs/tomcat-9.0-doc: ./ annotationapi/ annotationapi/javax/annotation/ annotationapi/javax/annotation/security/ annotationapi/javax/annotation/sql/ api/ ap

2021-11-15 Thread remm
Author: remm
Date: Mon Nov 15 20:04:58 2021
New Revision: 1895069

URL: http://svn.apache.org/viewvc?rev=1895069=rev
Log:
Update docs for 9.0.55 release


[This commit notification would consist of 70 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1895068 - in /tomcat/site/trunk: docs/ xdocs/

2021-11-15 Thread remm
Author: remm
Date: Mon Nov 15 19:58:51 2021
New Revision: 1895068

URL: http://svn.apache.org/viewvc?rev=1895068=rev
Log:
Update site for 9.0.55 release

Modified:
tomcat/site/trunk/docs/doap_Tomcat.rdf
tomcat/site/trunk/docs/download-90.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/migration-9.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/doap_Tomcat.rdf
tomcat/site/trunk/xdocs/download-90.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/migration-9.xml
tomcat/site/trunk/xdocs/oldnews.xml
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1895068=1895067=1895068=diff
==
--- tomcat/site/trunk/docs/doap_Tomcat.rdf (original)
+++ tomcat/site/trunk/docs/doap_Tomcat.rdf Mon Nov 15 19:58:51 2021
@@ -67,8 +67,8 @@
 
   
 Latest Stable 9.0.x Release
-2021-10-01
-9.0.54
+2021-11-10
+9.0.55
   
 
 

Modified: tomcat/site/trunk/docs/download-90.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-90.html?rev=1895068=1895067=1895068=diff
==
--- tomcat/site/trunk/docs/download-90.html (original)
+++ tomcat/site/trunk/docs/download-90.html Mon Nov 15 19:58:51 2021
@@ -12,7 +12,7 @@
 
   Quick Navigation
 
-[define v]9.0.54[end]
+[define v]9.0.55[end]
 https://downloads.apache.org/tomcat/tomcat-9/KEYS;>KEYS |
 [v] |
 Browse |

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1895068=1895067=1895068=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Mon Nov 15 19:58:51 2021
@@ -36,6 +36,29 @@ wiki page.
 Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat
 project logo are trademarks of the Apache Software Foundation.
 
+2021-11-15 Tomcat 9.0.55 Released
+
+The Apache Tomcat Project is proud to announce the release of version 9.0.55
+of Apache Tomcat. This release implements specifications that are part of the
+Java EE 8 platform. The notable changes compared to 9.0.54 include:
+
+Experimental OpenSSL support through the Panama API incubating in Java
+17, with support for OpenSSL 1.1+.
+Add support for custom caching strategies for web application
+resources. This initial implementation allows control over whether or
+not a resource is cached.
+Improve robustness of JNDIRealm for exceptions occurring when getting
+the connection. 
+
+
+Full details of these changes, and all the other changes, are available in the
+Tomcat 9
+changelog.
+
+
+
+https://tomcat.apache.org/download-90.cgi;>Download
+
 2021-11-15 Tomcat 10.0.13 Released
 
 The Apache Tomcat Project is proud to announce the release of version 10.0.13
@@ -119,27 +142,6 @@ changelog.
 
 https://tomcat.apache.org/download-80.cgi;>Download
 
-2021-10-01 Tomcat 9.0.54 Released
-
-The Apache Tomcat Project is proud to announce the release of version 9.0.54
-of Apache Tomcat. This release implements specifications that are part of the
-Java EE 8 platform. The notable changes compared to 9.0.53 include:
-
-Further robustness improvements to HTTP/2 flow control window
-management
-Improvements to the DataSourceUserDatabase
-Fix an issue that caused some Servlet non-blocking API reads of the
-HTTP request body to incorrectly use blocking IO 
-
-
-Full details of these changes, and all the other changes, are available in the
-Tomcat 9
-changelog.
-
-
-
-https://tomcat.apache.org/download-90.cgi;>Download
-
 2021-09-01 Tomcat Native 1.2.31 Released
 
 The Apache Tomcat Project is proud to announce the release of version 1.2.31 of

Modified: tomcat/site/trunk/docs/migration-9.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-9.html?rev=1895068=1895067=1895068=diff
==
--- tomcat/site/trunk/docs/migration-9.html (original)
+++ tomcat/site/trunk/docs/migration-9.html Mon Nov 15 19:58:51 2021
@@ -426,7 +426,8 @@ of Apache Tomcat.
 9.0.48
 9.0.50
 9.0.52
-9.0.53
+9.0.53
+9.0.54
 , new version:
 
 9.0.0-M1
@@ -487,7 +488,8 @@ of Apache Tomcat.
 9.0.50
 9.0.52
 9.0.53
-9.0.54
+9.0.54
+9.0.55
 trunk (unreleased)
 
 

Modified: tomcat/site/trunk/docs/oldnews.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews.html?rev=1895068=1895067=1895068=diff
==
--- tomcat/site/trunk/docs/oldnews.html 

[tomcat] branch 9.0.x updated: Date for 9.0.55

2021-11-15 Thread remm
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 4a6a0c3  Date for 9.0.55
4a6a0c3 is described below

commit 4a6a0c3b3a34737723ed3f2dbd1608a154eb2c9d
Author: remm 
AuthorDate: Mon Nov 15 20:52:01 2021 +0100

Date for 9.0.55
---
 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 460e413..43260c7 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -118,7 +118,7 @@
 
   
 
-
+
   
 
   

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: [VOTE] Release Apache Tomcat 8.5.73

2021-11-15 Thread Mark Thomas

On 15/11/2021 19:06, Michael Osipov wrote:

Am 2021-11-11 um 16:34 schrieb Christopher Schultz:

The proposed Apache Tomcat 8.5.73 release is now available for voting.

The notable changes compared to 8.5.72 are:

- Improvements to native/APR including avoiding a JVM crash if APR fails
    to properly initialize and improving error handling.

- Improve robustness of JNDIRealm for exceptions occurring when getting
    the connection.

Along with lots of other bug fixes and improvements.

For full details, see the changelog:
https://ci.apache.org/projects/tomcat/tomcat-8.5.x/docs/changelog.html

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.73/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1342
The tag is:
https://github.com/apache/tomcat/tree/8.5.73/
Commit e8de8521b0f88b452ac6bd79abad3aad3bcc18b6


+1

Though, two issues:
 > https://ci.apache.org/projects/tomcat/tomcat-8.5.x/docs/changelog.html
is not uptodate


That has moved. The correct link is:
https://nightlies.apache.org/tomcat/tomcat-8.5.x/docs/changelog.html


changelog.xml seems broken:
https://github.com/apache/tomcat/blob/5b9729beefdba83f6ca62a8a21cc010f58a33c4f/webapps/docs/changelog.xml#L107-L119


Fixed.

Mark

-
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: Correct version number

2021-11-15 Thread markt
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 843bc20  Correct version number
843bc20 is described below

commit 843bc2054815d591f6d1b3c297bfc9965b06f26c
Author: Mark Thomas 
AuthorDate: Mon Nov 15 19:31:59 2021 +

Correct version number
---
 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 b873535..0545ead 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,7 +104,7 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
   
 
   

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch main updated: Remove duplicate parser

2021-11-15 Thread remm
This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
 new e28fdd3  Remove duplicate parser
e28fdd3 is described below

commit e28fdd3e611ac7c057eda906570ee0cb61542e56
Author: remm 
AuthorDate: Mon Nov 15 20:28:54 2021 +0100

Remove duplicate parser
---
 modules/openssl-java17/pom.xml |   2 +-
 .../tomcat/util/net/openssl/panama/Asn1Parser.java | 105 -
 .../util/net/openssl/panama/OpenSSLEngine.java |   1 +
 3 files changed, 2 insertions(+), 106 deletions(-)

diff --git a/modules/openssl-java17/pom.xml b/modules/openssl-java17/pom.xml
index d9180b1..b4affb6 100644
--- a/modules/openssl-java17/pom.xml
+++ b/modules/openssl-java17/pom.xml
@@ -32,7 +32,7 @@
 jar
 
 
-10.0.12
+10.0.13
 
 
 
diff --git 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/Asn1Parser.java
 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/Asn1Parser.java
deleted file mode 100644
index ec32d48..000
--- 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/Asn1Parser.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * 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.tomcat.util.net.openssl.panama;
-
-import java.math.BigInteger;
-
-import org.apache.tomcat.util.res.StringManager;
-
-/**
- * This is a very basic ASN.1 parser that provides the limited functionality
- * required by Tomcat. It is a long way from a complete parser.
- *
- * TODO: Consider extending this parser and refactoring the SpnegoTokenFixer to
- *   use it.
- */
-public class Asn1Parser {
-
-private static final StringManager sm = 
StringManager.getManager(Asn1Parser.class);
-
-private final byte[] source;
-
-private int pos = 0;
-
-
-public Asn1Parser(byte[] source) {
-this.source = source;
-}
-
-
-public boolean eof() {
-return pos == source.length;
-}
-
-
-public int peekTag() {
-return source[pos] & 0xFF;
-}
-
-
-public void parseTag(int tag) {
-int value = next();
-if (value != tag) {
-throw new 
IllegalArgumentException(sm.getString("asn1Parser.tagMismatch",
-Integer.valueOf(tag), Integer.valueOf(value)));
-}
-}
-
-
-public void parseFullLength() {
-int len = parseLength();
-if (len + pos != source.length) {
-throw new 
IllegalArgumentException(sm.getString("asn1Parser.lengthInvalid",
-Integer.valueOf(len), Integer.valueOf(source.length - 
pos)));
-}
-}
-
-
-public int parseLength() {
-int len = next();
-if (len > 127) {
-int bytes = len - 128;
-len = 0;
-for (int i = 0; i < bytes; i++) {
-len = len << 8;
-len = len + next();
-}
-}
-return len;
-}
-
-
-public BigInteger parseInt() {
-parseTag(0x02);
-int len = parseLength();
-byte[] val = new byte[len];
-System.arraycopy(source, pos, val, 0, len);
-pos += len;
-return new BigInteger(val);
-}
-
-
-public void parseBytes(byte[] dest) {
-System.arraycopy(source, pos, dest, 0, dest.length);
-pos += dest.length;
-}
-
-
-private int next() {
-return source[pos++] & 0xFF;
-}
-}
diff --git 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
index 62ff9f2..eb9f074 100644
--- 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
+++ 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
@@ -61,6 +61,7 @@ import static org.apache.tomcat.util.openssl.openssl_h.*;
 
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
+import 

svn commit: r50953 - /dev/tomcat/tomcat-9/v9.0.55/ /release/tomcat/tomcat-9/v9.0.55/

2021-11-15 Thread remm
Author: remm
Date: Mon Nov 15 19:26:26 2021
New Revision: 50953

Log:
Apache Tomcat 9.0.55

Added:
release/tomcat/tomcat-9/v9.0.55/
  - copied from r50952, dev/tomcat/tomcat-9/v9.0.55/
Removed:
dev/tomcat/tomcat-9/v9.0.55/


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[VOTE][RESULT] Release Apache Tomcat 9.0.55

2021-11-15 Thread Rémy Maucherat
The following votes were cast:

Binding:
+1: mgrigorov, isapir, remm

No other votes were cast.

The vote therefore passes.


Thanks to everyone who contributed to this release.

Rémy

On Wed, Nov 10, 2021 at 9:55 AM Rémy Maucherat  wrote:
>
> The proposed Apache Tomcat 9.0.55 release is now available for voting.
>
> The notable changes compared to 9.0.55 are:
>
> - Experimental OpenSSL support through the Panama API incubating in Java
>17, with support for OpenSSL 1.1+
>The module is available here:
>https://github.com/apache/tomcat/tree/10.1.0-M7/modules/openssl-java17
>Note: The 10.1.0-M7 tag corresponds to the 9.0.55 tag epoch.
>
> - Add support for custom caching strategies for web application
>resources. This initial implementation allows control over whether or
>not a resource is cached.
>
> - Improve robustness of JNDIRealm for exceptions occurring when getting
>the connection.
>
> Along with lots of other bug fixes and improvements.
>
> For full details, see the changelog:
> https://ci.apache.org/projects/tomcat/tomcat-9.0.x/docs/changelog.html
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.55/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1340
> The tag is:
> https://github.com/apache/tomcat/tree/9.0.55
> 662cc9171c22ac790532d38a2b59990faaa7b971
>
> The proposed 9.0.55 release is:
> [ ] Broken - do not release
> [ ] Stable - go ahead and release as 9.0.55 (stable)
>
> Rémy

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: [VOTE] Release Apache Tomcat 9.0.55

2021-11-15 Thread Rémy Maucherat
On Wed, Nov 10, 2021 at 9:55 AM Rémy Maucherat  wrote:
>
> The proposed Apache Tomcat 9.0.55 release is now available for voting.
>
> The notable changes compared to 9.0.55 are:
>
> - Experimental OpenSSL support through the Panama API incubating in Java
>17, with support for OpenSSL 1.1+
>The module is available here:
>https://github.com/apache/tomcat/tree/10.1.0-M7/modules/openssl-java17
>Note: The 10.1.0-M7 tag corresponds to the 9.0.55 tag epoch.
>
> - Add support for custom caching strategies for web application
>resources. This initial implementation allows control over whether or
>not a resource is cached.
>
> - Improve robustness of JNDIRealm for exceptions occurring when getting
>the connection.
>
> Along with lots of other bug fixes and improvements.
>
> For full details, see the changelog:
> https://ci.apache.org/projects/tomcat/tomcat-9.0.x/docs/changelog.html
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.55/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1340
> The tag is:
> https://github.com/apache/tomcat/tree/9.0.55
> 662cc9171c22ac790532d38a2b59990faaa7b971
>
> The proposed 9.0.55 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 9.0.55 (stable)

Rémy

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: [VOTE] Release Apache Tomcat 8.5.73

2021-11-15 Thread Michael Osipov

Am 2021-11-11 um 16:34 schrieb Christopher Schultz:

The proposed Apache Tomcat 8.5.73 release is now available for voting.

The notable changes compared to 8.5.72 are:

- Improvements to native/APR including avoiding a JVM crash if APR fails
    to properly initialize and improving error handling.

- Improve robustness of JNDIRealm for exceptions occurring when getting
    the connection.

Along with lots of other bug fixes and improvements.

For full details, see the changelog:
https://ci.apache.org/projects/tomcat/tomcat-8.5.x/docs/changelog.html

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.73/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1342
The tag is:
https://github.com/apache/tomcat/tree/8.5.73/
Commit e8de8521b0f88b452ac6bd79abad3aad3bcc18b6


+1

Though, two issues:
> https://ci.apache.org/projects/tomcat/tomcat-8.5.x/docs/changelog.html
is not uptodate
changelog.xml seems broken:
https://github.com/apache/tomcat/blob/5b9729beefdba83f6ca62a8a21cc010f58a33c4f/webapps/docs/changelog.xml#L107-L119

Michael



[ANN] Apache Tomcat 10.0.13 available

2021-11-15 Thread Mark Thomas

The Apache Tomcat team announces the immediate availability of Apache
Tomcat 10.0.13.

This release is targeted at Jakarta EE 9.

Applications that run on Tomcat 9 and earlier will not run on Tomcat 10 
without changes. Java EE applications designed for Tomcat 9 and earlier 
may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat 
will automatically convert them to Jakarta EE and copy them to the 
webapps directory. This conversion is performed using the Apache Tomcat 
migration tool for Jakarta EE tool which is also available as a separate 
download for off-line use.


Apache Tomcat 10 is an open source software implementation of the
Jakarta Servlet, Jakarta Server Pages, Jakarta Expression Language,
Jakarta WebSocket, Jakarta Authentication and Jakarta Annotations
specifications.

The notable changes compared to 10.0.12 include:

- Experimental OpenSSL support through the Panama API incubating in Java
  17, with support for OpenSSL 1.1+

- Add support for custom caching strategies for web application
  resources. This initial implementation allows control over whether or
  not a resource is cached.

- Improve robustness of JNDIRealm for exceptions occurring when getting
  the connection.

Please refer to the change log for the complete list of changes:
http://tomcat.apache.org/tomcat-10.0-doc/changelog.html

Downloads:
http://tomcat.apache.org/download-10.cgi

Migration guides from Apache Tomcat 7.0.x, 8.5.x and 9.0.x:
http://tomcat.apache.org/migration.html

Enjoy!

- The Apache Tomcat team

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1895061 - in /tomcat/site/trunk: docs/ xdocs/

2021-11-15 Thread markt
Author: markt
Date: Mon Nov 15 17:30:11 2021
New Revision: 1895061

URL: http://svn.apache.org/viewvc?rev=1895061=rev
Log:
Update site for release of Tomcat 10.0.13

Modified:
tomcat/site/trunk/docs/doap_Tomcat.rdf
tomcat/site/trunk/docs/download-10.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/migration-10.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/doap_Tomcat.rdf
tomcat/site/trunk/xdocs/download-10.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/migration-10.xml
tomcat/site/trunk/xdocs/oldnews.xml
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1895061=1895060=1895061=diff
==
--- tomcat/site/trunk/docs/doap_Tomcat.rdf (original)
+++ tomcat/site/trunk/docs/doap_Tomcat.rdf Mon Nov 15 17:30:11 2021
@@ -60,8 +60,8 @@
 
   
 Latest Stable 10.0.x Release
-2021-10-01
-10.0.12
+2021-11-15
+10.0.13
   
 
 

Modified: tomcat/site/trunk/docs/download-10.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-10.html?rev=1895061=1895060=1895061=diff
==
--- tomcat/site/trunk/docs/download-10.html (original)
+++ tomcat/site/trunk/docs/download-10.html Mon Nov 15 17:30:11 2021
@@ -21,7 +21,7 @@
 
   Quick Navigation
 
-[define v]10.0.12[end]
+[define v]10.0.13[end]
 [define w]10.1.0-M7[end]
 https://downloads.apache.org/tomcat/tomcat-10/KEYS;>KEYS |
 [v] |

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1895061=1895060=1895061=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Mon Nov 15 17:30:11 2021
@@ -36,6 +36,38 @@ wiki page.
 Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat
 project logo are trademarks of the Apache Software Foundation.
 
+2021-11-15 Tomcat 10.0.13 Released
+
+The Apache Tomcat Project is proud to announce the release of version 10.0.13
+of Apache Tomcat. This release implements specifications that are part of the
+Jakarta EE 9 platform.
+Applications that run on Tomcat 9 and earlier will not run on Tomcat 10
+without changes. Java EE based 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. This conversion is performed using the
+https://github.com/apache/tomcat-jakartaee-migration;>Apache Tomcat
+migration tool for Jakarta EE tool which is also available as a separate
+https://tomcat.apache.org/download-migration.cgi;>download for 
off-line use.
+The notable changes in this release are:
+
+Experimental OpenSSL support through the Panama API incubating in Java 17,
+with support for OpenSSL 1.1+
+Add support for custom caching strategies for web application resources.
+This initial implementation allows control over whether or not a resource 
is
+cached.
+Improve robustness of JNDIRealm for exceptions occurring when getting the
+connection.
+
+
+Full details of these changes, and all the other changes, are available in the
+Tomcat 10
+changelog.
+
+
+
+https://tomcat.apache.org/download-10.cgi;>Download
+
 2021-11-15 Tomcat 10.1.0-M7 (alpha) Released
 
 The Apache Tomcat Project is proud to announce the release of version 10.1.0-M7
@@ -108,36 +140,6 @@ changelog.
 
 https://tomcat.apache.org/download-90.cgi;>Download
 
-2021-10-01 Tomcat 10.0.12 Released
-
-The Apache Tomcat Project is proud to announce the release of version 10.0.12
-of Apache Tomcat. This release implements specifications that are part of the
-Jakarta EE 9 platform.
-Applications that run on Tomcat 9 and earlier will not run on Tomcat 10
-without changes. Java EE based 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. This conversion is performed using the
-https://github.com/apache/tomcat-jakartaee-migration;>Apache Tomcat
-migration tool for Jakarta EE tool which is also available as a separate
-https://tomcat.apache.org/download-migration.cgi;>download for 
off-line use.
-The notable changes in this release are:
-
-Further robustness improvements to HTTP/2 flow control window
-management.
-Improvements to the DataSourceUserDatabase.
-Fix an issue that caused some Servlet non-blocking API reads of the
-HTTP request body to incorrectly use blocking IO. 
-
-
-Full details of these 

svn commit: r1895060 - in /tomcat/site/trunk: ./ docs/tomcat-10.0-doc/ docs/tomcat-10.0-doc/annotationapi/ docs/tomcat-10.0-doc/annotationapi/jakarta/annotation/ docs/tomcat-10.0-doc/annotationapi/jak

2021-11-15 Thread markt
Author: markt
Date: Mon Nov 15 17:27:47 2021
New Revision: 1895060

URL: http://svn.apache.org/viewvc?rev=1895060=rev
Log:
Update docs for 10.0.13 release


[This commit notification would consist of 1136 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[ANN] Apache Tomcat 10.1.0-M7 (alpha) available

2021-11-15 Thread Mark Thomas

The Apache Tomcat team announces the immediate availability of Apache
Tomcat 10.1.0-M7 (alpha).

Apache Tomcat 10 is an open source software implementation of the
Jakarta Servlet, Jakarta Server Pages, Jakarta Expression Language,
Jakarta WebSocket, Jakarta Authentication and Jakarta Annotations
specifications.

Applications that run on Tomcat 9 and earlier will not run on Tomcat 10 
without changes. Java EE applications designed for Tomcat 9 and earlier 
may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat 
will automatically convert them to Jakarta EE and copy them to the 
webapps directory. This conversion is performed using the Apache Tomcat 
migration tool for Jakarta EE tool which is also available as a separate 
download for off-line use.


Apache Tomcat 10.1.0-M7 is a milestone release of the 10.1.x branch and 
has been made to provide users with early access to the new features in 
Apache Tomcat 10.1.x so that they may provide feedback. The notable 
changes compared to 10.1.0-M6 include:


- Servlet API updates for Servlet 6 including refactoring
  HttpServlet.doHead(), support for generic attributes on Cookies, more
  consistent URI handling including an option to reject 'suspicious'
  URIs

- EL API updates for EL 5.0 including changes to ELResolver.getType()

- Experimental OpenSSL support through the Panama API incubating in Java
  17, with support for OpenSSL 1.1+

Please refer to the change log for the complete list of changes:
http://tomcat.apache.org/tomcat-10.1-doc/changelog.html

Downloads:
http://tomcat.apache.org/download-10.cgi

Migration guides from Apache Tomcat 7.0.x, 8.5.x and 9.0.x:
http://tomcat.apache.org/migration.html

Enjoy!

- The Apache Tomcat team

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r50950 - /release/tomcat/tomcat-10/v10.1.0-M6/

2021-11-15 Thread markt
Author: markt
Date: Mon Nov 15 17:15:18 2021
New Revision: 50950

Log:
Drop 10.1.0-M6 release mirrors

Removed:
release/tomcat/tomcat-10/v10.1.0-M6/


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1895059 - in /tomcat/site/trunk: docs/download-10.html docs/index.html docs/migration-10.1.html docs/oldnews.html docs/whichversion.html xdocs/download-10.xml xdocs/index.xml xdocs/migrat

2021-11-15 Thread markt
Author: markt
Date: Mon Nov 15 17:13:36 2021
New Revision: 1895059

URL: http://svn.apache.org/viewvc?rev=1895059=rev
Log:
Update site for 10.1.0-M7 release

Modified:
tomcat/site/trunk/docs/download-10.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/migration-10.1.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/download-10.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/migration-10.1.xml
tomcat/site/trunk/xdocs/oldnews.xml
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/docs/download-10.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-10.html?rev=1895059=1895058=1895059=diff
==
--- tomcat/site/trunk/docs/download-10.html (original)
+++ tomcat/site/trunk/docs/download-10.html Mon Nov 15 17:13:36 2021
@@ -22,7 +22,7 @@
   Quick Navigation
 
 [define v]10.0.12[end]
-[define w]10.1.0-M6[end]
+[define w]10.1.0-M7[end]
 https://downloads.apache.org/tomcat/tomcat-10/KEYS;>KEYS |
 [v] |
 [w] (alpha) |

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1895059=1895058=1895059=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Mon Nov 15 17:13:36 2021
@@ -36,6 +36,37 @@ wiki page.
 Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat
 project logo are trademarks of the Apache Software Foundation.
 
+2021-11-15 Tomcat 10.1.0-M7 (alpha) Released
+
+The Apache Tomcat Project is proud to announce the release of version 10.1.0-M7
+of Apache Tomcat. This release is a milestone release and is targeted at 
Jakarta
+EE 10.
+Applications that run on Tomcat 9 and earlier will not run on Tomcat 10
+without changes. Java EE based 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. This conversion is performed using the
+https://github.com/apache/tomcat-jakartaee-migration;>Apache Tomcat
+migration tool for Jakarta EE tool which is also available as a separate
+https://tomcat.apache.org/download-migration.cgi;>download for 
off-line use.
+The notable changes in this release are:
+
+Servlet API updates for Servlet 6 including refactoring
+  HttpServlet.doHead(), support for generic attributes on Cookies, more
+  consistent URI handling including an option to reject 'suspicious' URIs
+EL API updates for EL 5.0 including changes to ELResolver.getType()
+Experimental OpenSSL support through the Panama API incubating in Java 17,
+  with support for OpenSSL 1.1+ 
+
+
+Full details of these changes, and all the other changes, are available in the
+Tomcat 10.1
+(alpha) changelog.
+
+
+
+https://tomcat.apache.org/download-10.cgi;>Download
+
 2021-10-06 Tomcat 8.5.72 Released
 
 The Apache Tomcat Project is proud to announce the release of version 8.5.72.
@@ -105,38 +136,6 @@ changelog.
 
 
 
-https://tomcat.apache.org/download-10.cgi;>Download
-
-2021-10-01 Tomcat 10.1.0-M6 (alpha) Released
-
-The Apache Tomcat Project is proud to announce the release of version 10.1.0-M6
-of Apache Tomcat. This release is a milestone release and is targeted at 
Jakarta
-EE 10.
-Applications that run on Tomcat 9 and earlier will not run on Tomcat 10
-without changes. Java EE based 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. This conversion is performed using the
-https://github.com/apache/tomcat-jakartaee-migration;>Apache Tomcat
-migration tool for Jakarta EE tool which is also available as a separate
-https://tomcat.apache.org/download-migration.cgi;>download for 
off-line use.
-The notable changes in this release are:
-
-Servlet API updates for Servlet 6 including removal of all deprecated
-code, updated schemas and a new API for connection and request IDs.
-EL API updates for EL 5.0 including deprecation of the use of
-FeatureDescriptor, improvements to BeanELResolver and the addition of
-MethodReference.
-Further robustness improvements to HTTP/2 flow control window
-management 
-
-
-Full details of these changes, and all the other changes, are available in the
-Tomcat 10.1
-(alpha) changelog.
-
-
-
 https://tomcat.apache.org/download-10.cgi;>Download
 
 2021-09-01 Tomcat Native 1.2.31 Released

Modified: tomcat/site/trunk/docs/migration-10.1.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-10.1.html?rev=1895059=1895058=1895059=diff
==
--- 

svn commit: r1895058 - in /tomcat/site/trunk: ./ docs/tomcat-10.1-doc/ docs/tomcat-10.1-doc/annotationapi/ docs/tomcat-10.1-doc/annotationapi/jakarta/annotation/ docs/tomcat-10.1-doc/annotationapi/jak

2021-11-15 Thread markt
Author: markt
Date: Mon Nov 15 17:12:47 2021
New Revision: 1895058

URL: http://svn.apache.org/viewvc?rev=1895058=rev
Log:
Update docs for 10.1.0-M7 release


[This commit notification would consist of 76 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch 9.0.x updated: Remove test implementation committed in error

2021-11-15 Thread markt
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 6b5b4c9  Remove test implementation committed in error
6b5b4c9 is described below

commit 6b5b4c99e9d3012d88de821f5a61931ce55b1ce0
Author: Mark Thomas 
AuthorDate: Mon Nov 15 17:04:30 2021 +

Remove test implementation committed in error
---
 .../catalina/webresources/MyCacheStrategy.java | 29 --
 1 file changed, 29 deletions(-)

diff --git a/java/org/apache/catalina/webresources/MyCacheStrategy.java 
b/java/org/apache/catalina/webresources/MyCacheStrategy.java
deleted file mode 100644
index ac23782..000
--- a/java/org/apache/catalina/webresources/MyCacheStrategy.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.webresources;
-
-import org.apache.catalina.WebResourceRoot.CacheStrategy;
-
-public class MyCacheStrategy implements CacheStrategy {
-
-
-@Override
-public boolean noCache(String path) {
-System.out.println(path);
-return true;
-}
-}

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch 10.0.x updated: Remove test implementation committed in error

2021-11-15 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/10.0.x by this push:
 new 605f057  Remove test implementation committed in error
605f057 is described below

commit 605f057b250509c66aab020436f68f213f7668d6
Author: Mark Thomas 
AuthorDate: Mon Nov 15 17:04:30 2021 +

Remove test implementation committed in error
---
 .../catalina/webresources/MyCacheStrategy.java | 29 --
 1 file changed, 29 deletions(-)

diff --git a/java/org/apache/catalina/webresources/MyCacheStrategy.java 
b/java/org/apache/catalina/webresources/MyCacheStrategy.java
deleted file mode 100644
index ac23782..000
--- a/java/org/apache/catalina/webresources/MyCacheStrategy.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.webresources;
-
-import org.apache.catalina.WebResourceRoot.CacheStrategy;
-
-public class MyCacheStrategy implements CacheStrategy {
-
-
-@Override
-public boolean noCache(String path) {
-System.out.println(path);
-return true;
-}
-}

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch main updated: Remove test implementation committed in error

2021-11-15 Thread markt
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 e296a91  Remove test implementation committed in error
e296a91 is described below

commit e296a915849ff5ef0eec537ab04bba577d3bf0d3
Author: Mark Thomas 
AuthorDate: Mon Nov 15 17:04:30 2021 +

Remove test implementation committed in error
---
 .../catalina/webresources/MyCacheStrategy.java | 29 --
 1 file changed, 29 deletions(-)

diff --git a/java/org/apache/catalina/webresources/MyCacheStrategy.java 
b/java/org/apache/catalina/webresources/MyCacheStrategy.java
deleted file mode 100644
index ac23782..000
--- a/java/org/apache/catalina/webresources/MyCacheStrategy.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.webresources;
-
-import org.apache.catalina.WebResourceRoot.CacheStrategy;
-
-public class MyCacheStrategy implements CacheStrategy {
-
-
-@Override
-public boolean noCache(String path) {
-System.out.println(path);
-return true;
-}
-}

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch 10.0.x updated: Add release date for Apache Tomcat 10.0.13

2021-11-15 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/10.0.x by this push:
 new 3356c85  Add release date for Apache Tomcat 10.0.13
3356c85 is described below

commit 3356c85bcae58fa34766a85b5fffb369fb879691
Author: Mark Thomas 
AuthorDate: Mon Nov 15 16:57:43 2021 +

Add release date for Apache Tomcat 10.0.13
---
 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 4c29077..ce7c169 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -118,7 +118,7 @@
 
   
 
-
+
   
 
   

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch main updated: Add release date for 10.1.0-M7

2021-11-15 Thread markt
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 3bc9941  Add release date for 10.1.0-M7
3bc9941 is described below

commit 3bc9941330ab4c58e7339883e7cb90af6843e387
Author: Mark Thomas 
AuthorDate: Mon Nov 15 16:56:08 2021 +

Add release date for 10.1.0-M7
---
 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 15e8083..a6825c3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -122,7 +122,7 @@
 
   
 
-
+
   
 
   

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r50949 - /dev/tomcat/tomcat-10/v10.0.13/ /release/tomcat/tomcat-10/v10.0.13/

2021-11-15 Thread markt
Author: markt
Date: Mon Nov 15 16:51:05 2021
New Revision: 50949

Log:
Release Apache Tomact 10.0.13

Added:
release/tomcat/tomcat-10/v10.0.13/
  - copied from r50948, dev/tomcat/tomcat-10/v10.0.13/
Removed:
dev/tomcat/tomcat-10/v10.0.13/


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[VOTE][RESULT] Release Apache Tomcat 10.0.13

2021-11-15 Thread Mark Thomas

The following votes were cast:

Binding:
+1: remm, mgrigorov, isapir, markt

No other votes were cast.

The vote therefore passes.


Thanks to everyone who contributed to this release.

Mark


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r50948 - /dev/tomcat/tomcat-10/v10.1.0-M7/ /release/tomcat/tomcat-10/v10.1.0-M7/

2021-11-15 Thread markt
Author: markt
Date: Mon Nov 15 16:48:49 2021
New Revision: 50948

Log:
Release Apache Tomact 10.1.0-M7

Added:
release/tomcat/tomcat-10/v10.1.0-M7/
  - copied from r50947, dev/tomcat/tomcat-10/v10.1.0-M7/
Removed:
dev/tomcat/tomcat-10/v10.1.0-M7/


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[VOTE][RESULT] Release Apache Tomcat 10.1.0-M7

2021-11-15 Thread Mark Thomas

The following votes were cast:

Binding:
+1: remm, markt, mgrigorov, isapir

No other votes were cast.

The vote therefore passes.


Thanks to everyone who contributed to this release.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: [VOTE] Release Apache Tomcat 10.0.13

2021-11-15 Thread Mark Thomas

On 09/11/2021 22:51, Mark Thomas wrote:




The proposed 10.0.13 release is:
[ ] Broken - do not release
[X] Stable - go ahead and release as 10.0.13 (stable)


Tests pass for NIO, NIO2 and APR/Native with Tomcat Native 1.2.31 on 
Linux, MacOS and Windows.


Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch main updated: Optimize ALPN

2021-11-15 Thread remm
This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
 new 69b668d  Optimize ALPN
69b668d is described below

commit 69b668d9cc764e5bfaeac27aca493710d07cbbb1
Author: remm 
AuthorDate: Mon Nov 15 15:48:38 2021 +0100

Optimize ALPN

Make one callback static.
---
 .../util/net/openssl/panama/OpenSSLContext.java| 34 --
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
index f976432..612a0fe 100644
--- 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
+++ 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
@@ -141,7 +141,7 @@ public class OpenSSLContext implements 
org.apache.tomcat.util.net.SSLContext {
 openSSLCallbackAlpnSelectProtoHandle = 
lookup.findVirtual(OpenSSLContext.class, "openSSLCallbackAlpnSelectProto",
 MethodType.methodType(int.class, MemoryAddress.class, 
MemoryAddress.class,
 MemoryAddress.class, MemoryAddress.class, 
int.class, MemoryAddress.class));
-openSSLCallbackTmpDHHandle = 
lookup.findVirtual(OpenSSLContext.class, "openSSLCallbackTmpDH",
+openSSLCallbackTmpDHHandle = 
lookup.findStatic(OpenSSLContext.class, "openSSLCallbackTmpDH",
 MethodType.methodType(MemoryAddress.class, 
MemoryAddress.class, int.class, int.class));
 } catch (Exception e) {
 throw new IllegalStateException(e);
@@ -212,7 +212,8 @@ public class OpenSSLContext implements 
org.apache.tomcat.util.net.SSLContext {
 
 private final SSLHostConfig sslHostConfig;
 private final SSLHostConfigCertificate certificate;
-private final List negotiableProtocols;
+private final boolean alpn;
+private final List negotiableProtocols;
 
 private int certificateVerifyMode = -1;
 
@@ -381,7 +382,16 @@ public class OpenSSLContext implements 
org.apache.tomcat.util.net.SSLContext {
 openSSLCallbackPasswordFunctionDescriptor, scope);
 SSL_CTX_set_default_passwd_cb(ctx, openSSLCallbackPassword);
 
-this.negotiableProtocols = negotiableProtocols;
+alpn = (negotiableProtocols != null && negotiableProtocols.size() 
> 0);
+if (alpn) {
+this.negotiableProtocols = new 
ArrayList<>(negotiableProtocols.size() + 1);
+for (String negotiableProtocol : negotiableProtocols) {
+
this.negotiableProtocols.add(negotiableProtocol.getBytes(StandardCharsets.ISO_8859_1));
+}
+this.negotiableProtocols.add(HTTP_11_PROTOCOL);
+} else {
+this.negotiableProtocols = null;
+}
 
 success = true;
 } catch(Exception e) {
@@ -715,7 +725,6 @@ public class OpenSSLContext implements 
org.apache.tomcat.util.net.SSLContext {
 
CLinker.getInstance().upcallStub(openSSLCallbackAlpnSelectProtoHandle.bindTo(this),
 openSSLCallbackAlpnSelectProtoFunctionDescriptor, 
state.scope);
 SSL_CTX_set_alpn_select_cb(state.ctx, 
openSSLCallbackAlpnSelectProto, MemoryAddress.NULL);
-
 // Skip NPN (annoying and likely not useful anymore)
 //SSLContext.setNpnProtos(state.ctx, protocolsArray, 
SSL.SSL_SELECTOR_FAILURE_NO_ADVERTISE);
 }
@@ -795,7 +804,7 @@ public class OpenSSLContext implements 
org.apache.tomcat.util.net.SSLContext {
 }
 
 // DH *(*tmp_dh_callback)(SSL *ssl, int is_export, int keylength)
-public MemoryAddress openSSLCallbackTmpDH(MemoryAddress ssl, int isExport, 
int keylength) {
+public static MemoryAddress openSSLCallbackTmpDH(MemoryAddress ssl, int 
isExport, int keylength) {
 var pkey = SSL_get_privatekey(ssl);
 int type = (MemoryAddress.NULL.equals(pkey)) ? EVP_PKEY_NONE() : 
EVP_PKEY_base_id(pkey);
 /*
@@ -830,12 +839,7 @@ public class OpenSSLContext implements 
org.apache.tomcat.util.net.SSLContext {
 // However, the Java 17 API forces use of a scope later on, so create 
one for everything
 try (ResourceScope scope = ResourceScope.newConfinedScope()) {
 byte[] advertisedBytes = in.asSegment(inlen, scope).toByteArray();
-ArrayList negotiableProtocolsBytes = new 
ArrayList<>(negotiableProtocols.size() + 1);
-for (String negotiableProtocol : negotiableProtocols) {
-negotiableProtocolsBytes.add(negotiableProtocol.getBytes());
-}
-