[tomcat] branch 8.5.x updated: Fix parsing logic

2020-12-04 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 fa4f710  Fix parsing logic
fa4f710 is described below

commit fa4f7105de8f94bee4ece30ec0b53721d1e9cd52
Author: Mark Thomas 
AuthorDate: Fri Dec 4 11:58:10 2020 +

Fix parsing logic
---
 java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java 
b/java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java
index 21a5924..54ea3f0 100644
--- a/java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java
+++ b/java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java
@@ -150,7 +150,7 @@ public class TLSClientHelloExtractor {
 // Read the extensions until we run out of data or find the data
 // we need
 while (netInBuffer.hasRemaining() && (sniValue == null ||
-clientRequestedApplicationProtocols.isEmpty()) || 
clientRequestedProtocols.isEmpty()) {
+clientRequestedApplicationProtocols.isEmpty() || 
clientRequestedProtocols.isEmpty())) {
 // Extension type is two byte
 char extensionType = netInBuffer.getChar();
 // Extension size is another two bytes


-
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 parsing logic

2020-12-04 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 073f9d0  Fix parsing logic
073f9d0 is described below

commit 073f9d07f6655bfee368bdac1cb5cf938782cbc8
Author: Mark Thomas 
AuthorDate: Fri Dec 4 11:58:10 2020 +

Fix parsing logic
---
 java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java 
b/java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java
index 21a5924..54ea3f0 100644
--- a/java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java
+++ b/java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java
@@ -150,7 +150,7 @@ public class TLSClientHelloExtractor {
 // Read the extensions until we run out of data or find the data
 // we need
 while (netInBuffer.hasRemaining() && (sniValue == null ||
-clientRequestedApplicationProtocols.isEmpty()) || 
clientRequestedProtocols.isEmpty()) {
+clientRequestedApplicationProtocols.isEmpty() || 
clientRequestedProtocols.isEmpty())) {
 // Extension type is two byte
 char extensionType = netInBuffer.getChar();
 // Extension size is another two bytes


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



[tomcat] branch master updated: Fix parsing logic

2020-12-04 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new 1e3bd8a  Fix parsing logic
1e3bd8a is described below

commit 1e3bd8abdd6105fc1e24dbd438e8e4e4619b9d01
Author: Mark Thomas 
AuthorDate: Fri Dec 4 11:58:10 2020 +

Fix parsing logic
---
 java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java 
b/java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java
index 21a5924..54ea3f0 100644
--- a/java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java
+++ b/java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java
@@ -150,7 +150,7 @@ public class TLSClientHelloExtractor {
 // Read the extensions until we run out of data or find the data
 // we need
 while (netInBuffer.hasRemaining() && (sniValue == null ||
-clientRequestedApplicationProtocols.isEmpty()) || 
clientRequestedProtocols.isEmpty()) {
+clientRequestedApplicationProtocols.isEmpty() || 
clientRequestedProtocols.isEmpty())) {
 // Extension type is two byte
 char extensionType = netInBuffer.getChar();
 // Extension size is another two bytes


-
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 BZ 64110 - request attr for requested ciphers and protocols

2020-12-04 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 2448e04  Fix BZ 64110 - request attr for requested ciphers and 
protocols
2448e04 is described below

commit 2448e046c314bbf356535ac6c5a6f93f2cde5e6f
Author: Mark Thomas 
AuthorDate: Wed Nov 25 18:44:11 2020 +

Fix BZ 64110 - request attr for requested ciphers and protocols

https://bz.apache.org/bugzilla/show_bug.cgi?id=64110
---
 java/org/apache/catalina/connector/Request.java|  8 ++
 java/org/apache/catalina/util/TLSUtil.java | 19 +++--
 java/org/apache/coyote/AbstractProcessor.java  |  8 ++
 java/org/apache/tomcat/util/buf/HexUtils.java  | 14 
 java/org/apache/tomcat/util/net/AprSSLSupport.java | 13 
 .../apache/tomcat/util/net/LocalStrings.properties |  1 +
 java/org/apache/tomcat/util/net/Nio2Endpoint.java  |  7 +-
 java/org/apache/tomcat/util/net/NioEndpoint.java   |  7 +-
 .../apache/tomcat/util/net/SSLImplementation.java  | 27 +++
 java/org/apache/tomcat/util/net/SSLSupport.java| 33 +++-
 .../apache/tomcat/util/net/SecureNio2Channel.java  | 22 +-
 .../apache/tomcat/util/net/SecureNioChannel.java   | 20 +
 .../tomcat/util/net/TLSClientHelloExtractor.java   | 89 --
 .../tomcat/util/net/jsse/JSSEImplementation.java   | 11 ++-
 .../apache/tomcat/util/net/jsse/JSSESupport.java   | 34 -
 .../util/net/openssl/OpenSSLImplementation.java|  9 +++
 webapps/docs/changelog.xml |  9 +++
 webapps/docs/config/http.xml   |  6 ++
 18 files changed, 306 insertions(+), 31 deletions(-)

diff --git a/java/org/apache/catalina/connector/Request.java 
b/java/org/apache/catalina/connector/Request.java
index 094bdec..dcf6c7f 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -944,6 +944,14 @@ public class Request implements HttpServletRequest {
 if (attr != null) {
 attributes.put(SSLSupport.PROTOCOL_VERSION_KEY, attr);
 }
+attr = 
coyoteRequest.getAttribute(SSLSupport.REQUESTED_PROTOCOL_VERSIONS_KEY);
+if (attr != null) {
+attributes.put(SSLSupport.REQUESTED_PROTOCOL_VERSIONS_KEY, 
attr);
+}
+attr = 
coyoteRequest.getAttribute(SSLSupport.REQUESTED_CIPHERS_KEY);
+if (attr != null) {
+attributes.put(SSLSupport.REQUESTED_CIPHERS_KEY, attr);
+}
 attr = attributes.get(name);
 sslAttributesParsed = true;
 }
diff --git a/java/org/apache/catalina/util/TLSUtil.java 
b/java/org/apache/catalina/util/TLSUtil.java
index a739021..7f895dd 100644
--- a/java/org/apache/catalina/util/TLSUtil.java
+++ b/java/org/apache/catalina/util/TLSUtil.java
@@ -33,11 +33,18 @@ public class TLSUtil {
  * information, otherwise {@code false}
  */
 public static boolean isTLSRequestAttribute(String name) {
-return Globals.CERTIFICATES_ATTR.equals(name) ||
-Globals.CIPHER_SUITE_ATTR.equals(name) ||
-Globals.KEY_SIZE_ATTR.equals(name)  ||
-Globals.SSL_SESSION_ID_ATTR.equals(name) ||
-Globals.SSL_SESSION_MGR_ATTR.equals(name) ||
-SSLSupport.PROTOCOL_VERSION_KEY.equals(name);
+switch (name) {
+case Globals.CERTIFICATES_ATTR:
+case Globals.CIPHER_SUITE_ATTR:
+case Globals.KEY_SIZE_ATTR:
+case Globals.SSL_SESSION_ID_ATTR:
+case Globals.SSL_SESSION_MGR_ATTR:
+case SSLSupport.PROTOCOL_VERSION_KEY:
+case SSLSupport.REQUESTED_PROTOCOL_VERSIONS_KEY:
+case SSLSupport.REQUESTED_CIPHERS_KEY:
+return true;
+default:
+return false;
+}
 }
 }
diff --git a/java/org/apache/coyote/AbstractProcessor.java 
b/java/org/apache/coyote/AbstractProcessor.java
index 6480ddf..6140839 100644
--- a/java/org/apache/coyote/AbstractProcessor.java
+++ b/java/org/apache/coyote/AbstractProcessor.java
@@ -798,6 +798,14 @@ public abstract class AbstractProcessor extends 
AbstractProcessorLight implement
 if (sslO != null) {
 request.setAttribute(SSLSupport.PROTOCOL_VERSION_KEY, 
sslO);
 }
+sslO = sslSupport.getRequestedProtocols();
+if (sslO != null) {
+
request.setAttribute(SSLSupport.REQUESTED_PROTOCOL_VERSIONS_KEY, sslO);
+}
+sslO = sslSupport.getRequestedCiphers();
+if (sslO != null) {
+request.setAttribute(SSLSupport.REQUESTED_CIPHERS_KEY, 
sslO);
+}
 request.setAttribute(SSLSupport.SESSION_MGR, sslSupport

[tomcat] branch 9.0.x updated: Fix BZ 64110 - request attr for requested ciphers and protocols

2020-12-04 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 344d073  Fix BZ 64110 - request attr for requested ciphers and 
protocols
344d073 is described below

commit 344d07333dd3ef1b821d075a30a99a4226b90f53
Author: Mark Thomas 
AuthorDate: Wed Nov 25 18:44:11 2020 +

Fix BZ 64110 - request attr for requested ciphers and protocols

https://bz.apache.org/bugzilla/show_bug.cgi?id=64110
---
 java/org/apache/catalina/connector/Request.java|  8 ++
 java/org/apache/catalina/util/TLSUtil.java | 19 +++--
 java/org/apache/coyote/AbstractProcessor.java  |  8 ++
 java/org/apache/tomcat/util/buf/HexUtils.java  | 14 
 java/org/apache/tomcat/util/net/AprSSLSupport.java | 13 
 .../apache/tomcat/util/net/LocalStrings.properties |  1 +
 java/org/apache/tomcat/util/net/Nio2Endpoint.java  |  7 +-
 java/org/apache/tomcat/util/net/NioEndpoint.java   |  7 +-
 .../apache/tomcat/util/net/SSLImplementation.java  | 27 +++
 java/org/apache/tomcat/util/net/SSLSupport.java| 33 +++-
 .../apache/tomcat/util/net/SecureNio2Channel.java  | 22 +-
 .../apache/tomcat/util/net/SecureNioChannel.java   | 20 +
 .../tomcat/util/net/TLSClientHelloExtractor.java   | 89 --
 .../tomcat/util/net/jsse/JSSEImplementation.java   | 11 ++-
 .../apache/tomcat/util/net/jsse/JSSESupport.java   | 34 -
 .../util/net/openssl/OpenSSLImplementation.java|  9 +++
 webapps/docs/changelog.xml |  9 +++
 webapps/docs/config/http.xml   |  6 ++
 18 files changed, 306 insertions(+), 31 deletions(-)

diff --git a/java/org/apache/catalina/connector/Request.java 
b/java/org/apache/catalina/connector/Request.java
index 34d06c8..cd6e343 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -917,6 +917,14 @@ public class Request implements HttpServletRequest {
 if (attr != null) {
 attributes.put(SSLSupport.PROTOCOL_VERSION_KEY, attr);
 }
+attr = 
coyoteRequest.getAttribute(SSLSupport.REQUESTED_PROTOCOL_VERSIONS_KEY);
+if (attr != null) {
+attributes.put(SSLSupport.REQUESTED_PROTOCOL_VERSIONS_KEY, 
attr);
+}
+attr = 
coyoteRequest.getAttribute(SSLSupport.REQUESTED_CIPHERS_KEY);
+if (attr != null) {
+attributes.put(SSLSupport.REQUESTED_CIPHERS_KEY, attr);
+}
 attr = attributes.get(name);
 sslAttributesParsed = true;
 }
diff --git a/java/org/apache/catalina/util/TLSUtil.java 
b/java/org/apache/catalina/util/TLSUtil.java
index a739021..7f895dd 100644
--- a/java/org/apache/catalina/util/TLSUtil.java
+++ b/java/org/apache/catalina/util/TLSUtil.java
@@ -33,11 +33,18 @@ public class TLSUtil {
  * information, otherwise {@code false}
  */
 public static boolean isTLSRequestAttribute(String name) {
-return Globals.CERTIFICATES_ATTR.equals(name) ||
-Globals.CIPHER_SUITE_ATTR.equals(name) ||
-Globals.KEY_SIZE_ATTR.equals(name)  ||
-Globals.SSL_SESSION_ID_ATTR.equals(name) ||
-Globals.SSL_SESSION_MGR_ATTR.equals(name) ||
-SSLSupport.PROTOCOL_VERSION_KEY.equals(name);
+switch (name) {
+case Globals.CERTIFICATES_ATTR:
+case Globals.CIPHER_SUITE_ATTR:
+case Globals.KEY_SIZE_ATTR:
+case Globals.SSL_SESSION_ID_ATTR:
+case Globals.SSL_SESSION_MGR_ATTR:
+case SSLSupport.PROTOCOL_VERSION_KEY:
+case SSLSupport.REQUESTED_PROTOCOL_VERSIONS_KEY:
+case SSLSupport.REQUESTED_CIPHERS_KEY:
+return true;
+default:
+return false;
+}
 }
 }
diff --git a/java/org/apache/coyote/AbstractProcessor.java 
b/java/org/apache/coyote/AbstractProcessor.java
index d6e3877..b214cad 100644
--- a/java/org/apache/coyote/AbstractProcessor.java
+++ b/java/org/apache/coyote/AbstractProcessor.java
@@ -805,6 +805,14 @@ public abstract class AbstractProcessor extends 
AbstractProcessorLight implement
 if (sslO != null) {
 request.setAttribute(SSLSupport.PROTOCOL_VERSION_KEY, 
sslO);
 }
+sslO = sslSupport.getRequestedProtocols();
+if (sslO != null) {
+
request.setAttribute(SSLSupport.REQUESTED_PROTOCOL_VERSIONS_KEY, sslO);
+}
+sslO = sslSupport.getRequestedCiphers();
+if (sslO != null) {
+request.setAttribute(SSLSupport.REQUESTED_CIPHERS_KEY, 
sslO);
+}
 request.setAttribute(SSLSupport.SESSION_MGR, sslSupport

[tomcat] branch master updated: Fix Javadoc errors

2020-12-04 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new 0fbab05  Fix Javadoc errors
0fbab05 is described below

commit 0fbab050ce47157e22c9f1eae776c12c1adad346
Author: Mark Thomas 
AuthorDate: Fri Dec 4 09:05:56 2020 +

Fix Javadoc errors
---
 java/org/apache/tomcat/util/net/SSLSupport.java   | 7 ---
 java/org/apache/tomcat/util/net/jsse/JSSESupport.java | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/SSLSupport.java 
b/java/org/apache/tomcat/util/net/SSLSupport.java
index 2a69b8c..bf80f94 100644
--- a/java/org/apache/tomcat/util/net/SSLSupport.java
+++ b/java/org/apache/tomcat/util/net/SSLSupport.java
@@ -151,7 +151,8 @@ public interface SSLSupport {
  *
  * @return the list of SSL/TLS protocol versions requested by the client
  *
- * @throws IOException
+ * @throws IOException If an error occurs trying to obtain the client
+ *   requested protocol information from the socket
  */
 public String getRequestedProtocols() throws IOException;
 
@@ -159,8 +160,8 @@ public interface SSLSupport {
 *
 * @return the list of SSL/TLS ciphers requested by the client
 *
-* @throws IOException
+ * @throws IOException If an error occurs trying to obtain the client
+ *   request cipher information from the socket
 */
public String getRequestedCiphers() throws IOException;
 }
-
diff --git a/java/org/apache/tomcat/util/net/jsse/JSSESupport.java 
b/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
index fdce0c2..10e9417 100644
--- a/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
+++ b/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
@@ -78,7 +78,7 @@ public class JSSESupport implements SSLSupport, 
SSLSessionManager {
 private Map> additionalAttributes;
 
 /**
- * @param session
+ * @param session SSLSession from which information is to be extracted
  *
  * @deprecated This will be removed in Tomcat 10.1.x onwards
  * Use {@link JSSESupport#JSSESupport(SSLSession, Map)}


-
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: Increment version for next development cycle

2020-12-04 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 a44e737  Increment version for next development cycle
a44e737 is described below

commit a44e73727f4e22307f85093ac72f3288fa5e309c
Author: Mark Thomas 
AuthorDate: Fri Dec 4 08:53:34 2020 +

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 49221fe..fda8951 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=8
 version.minor=5
-version.build=61
+version.build=62
 version.patch=0
 version.suffix=-dev
 
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 3615f18..a8de9ef 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=8.5.61
+maven.asf.release.deploy.version=8.5.62
 
 #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 60ac020..33db707 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -103,7 +103,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: Increment version for next development cycle

2020-12-04 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 bdfda53  Increment version for next development cycle
bdfda53 is described below

commit bdfda53b8a57fd52f63b3f1fac3992116009fdf2
Author: Mark Thomas 
AuthorDate: Fri Dec 4 08:51:46 2020 +

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 565e2b1..51ccaac 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=9
 version.minor=0
-version.build=41
+version.build=42
 version.patch=0
 version.suffix=-dev
 
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index e2176fd..97b2b7a 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.41
+maven.asf.release.deploy.version=9.0.42
 
 #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 38c4f56..2923f37 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -103,7 +103,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] 01/02: Increment version for next development cycle

2020-12-04 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit be54a6e76053478a731e26e8a27eadd1dd6f9b5c
Author: Mark Thomas 
AuthorDate: Fri Dec 4 08:49:16 2020 +

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 110d60f..dd1a4c0 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=10
 version.minor=0
-version.build=0
+version.build=1
 version.patch=0
 version.suffix=-dev
 
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 591eb64..e921722 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -39,7 +39,7 @@ 
maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d
 maven.asf.release.repo.repositoryId=apache.releases.https
 
 # Release version info
-maven.asf.release.deploy.version=10.0.0
+maven.asf.release.deploy.version=10.0.1
 
 #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 6af0349..36f61d8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -103,7 +103,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] 02/02: Move entry to correct version

2020-12-04 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit 10a059d81d32e192b69277718ec03712a70495de
Author: Mark Thomas 
AuthorDate: Fri Dec 4 08:50:04 2020 +

Move entry to correct version
---
 webapps/docs/changelog.xml | 14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 36f61d8..0f89120 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,6 +104,15 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+64110: Add support for additional TLS related request
+attributes that provide details of the protocols and ciphers requested
+by a client in the initial TLS handshake. (markt)
+  
+
+  
 
 
   
@@ -129,11 +138,6 @@
 specified to wait for client connections to complete and close before
 the Container hierarchy is stopped. (markt)
   
-  
-64110: Add support for additional TLS related request
-attributes that provide details of the protocols and ciphers requested
-by a client in the initial TLS handshake. (markt)
-  
   
 64921: Ensure that the 
LoadBalancerDrainingValve
 uses the correct setting for the secure attribute for any session


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



[tomcat] branch master updated (4189868 -> 10a059d)

2020-12-04 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from 4189868  Merge pull request #380 from markt-asf/bz-64110
 new be54a6e  Increment version for next development cycle
 new 10a059d  Move entry to correct version

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 +-
 res/maven/mvn.properties.default |  2 +-
 webapps/docs/changelog.xml   | 18 --
 3 files changed, 14 insertions(+), 8 deletions(-)


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



[tomcat] branch master updated: Fix BZ 64110 - request attr for requested ciphers and protocols

2020-12-04 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new cf84fb6  Fix BZ 64110 - request attr for requested ciphers and 
protocols
 new 4189868  Merge pull request #380 from markt-asf/bz-64110
cf84fb6 is described below

commit cf84fb6fd7119de3d7c2607d91ee3f9c4d9959a8
Author: Mark Thomas 
AuthorDate: Wed Nov 25 18:44:11 2020 +

Fix BZ 64110 - request attr for requested ciphers and protocols

https://bz.apache.org/bugzilla/show_bug.cgi?id=64110
---
 java/org/apache/catalina/connector/Request.java|  8 ++
 java/org/apache/catalina/util/TLSUtil.java | 19 +++--
 java/org/apache/coyote/AbstractProcessor.java  |  8 ++
 java/org/apache/tomcat/util/buf/HexUtils.java  | 14 
 java/org/apache/tomcat/util/net/AprSSLSupport.java | 13 
 .../apache/tomcat/util/net/LocalStrings.properties |  1 +
 java/org/apache/tomcat/util/net/Nio2Endpoint.java  |  7 +-
 java/org/apache/tomcat/util/net/NioEndpoint.java   |  7 +-
 .../apache/tomcat/util/net/SSLImplementation.java  | 27 +++
 java/org/apache/tomcat/util/net/SSLSupport.java| 30 
 .../apache/tomcat/util/net/SecureNio2Channel.java  | 22 +-
 .../apache/tomcat/util/net/SecureNioChannel.java   | 20 +
 .../tomcat/util/net/TLSClientHelloExtractor.java   | 89 --
 .../tomcat/util/net/jsse/JSSEImplementation.java   | 11 ++-
 .../apache/tomcat/util/net/jsse/JSSESupport.java   | 34 -
 .../util/net/openssl/OpenSSLImplementation.java|  9 +++
 webapps/docs/changelog.xml |  5 ++
 webapps/docs/config/http.xml   |  6 ++
 18 files changed, 300 insertions(+), 30 deletions(-)

diff --git a/java/org/apache/catalina/connector/Request.java 
b/java/org/apache/catalina/connector/Request.java
index e2dff97..37ed6d2 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -885,6 +885,14 @@ public class Request implements HttpServletRequest {
 if (attr != null) {
 attributes.put(SSLSupport.PROTOCOL_VERSION_KEY, attr);
 }
+attr = 
coyoteRequest.getAttribute(SSLSupport.REQUESTED_PROTOCOL_VERSIONS_KEY);
+if (attr != null) {
+attributes.put(SSLSupport.REQUESTED_PROTOCOL_VERSIONS_KEY, 
attr);
+}
+attr = 
coyoteRequest.getAttribute(SSLSupport.REQUESTED_CIPHERS_KEY);
+if (attr != null) {
+attributes.put(SSLSupport.REQUESTED_CIPHERS_KEY, attr);
+}
 attr = attributes.get(name);
 sslAttributesParsed = true;
 }
diff --git a/java/org/apache/catalina/util/TLSUtil.java 
b/java/org/apache/catalina/util/TLSUtil.java
index a739021..7f895dd 100644
--- a/java/org/apache/catalina/util/TLSUtil.java
+++ b/java/org/apache/catalina/util/TLSUtil.java
@@ -33,11 +33,18 @@ public class TLSUtil {
  * information, otherwise {@code false}
  */
 public static boolean isTLSRequestAttribute(String name) {
-return Globals.CERTIFICATES_ATTR.equals(name) ||
-Globals.CIPHER_SUITE_ATTR.equals(name) ||
-Globals.KEY_SIZE_ATTR.equals(name)  ||
-Globals.SSL_SESSION_ID_ATTR.equals(name) ||
-Globals.SSL_SESSION_MGR_ATTR.equals(name) ||
-SSLSupport.PROTOCOL_VERSION_KEY.equals(name);
+switch (name) {
+case Globals.CERTIFICATES_ATTR:
+case Globals.CIPHER_SUITE_ATTR:
+case Globals.KEY_SIZE_ATTR:
+case Globals.SSL_SESSION_ID_ATTR:
+case Globals.SSL_SESSION_MGR_ATTR:
+case SSLSupport.PROTOCOL_VERSION_KEY:
+case SSLSupport.REQUESTED_PROTOCOL_VERSIONS_KEY:
+case SSLSupport.REQUESTED_CIPHERS_KEY:
+return true;
+default:
+return false;
+}
 }
 }
diff --git a/java/org/apache/coyote/AbstractProcessor.java 
b/java/org/apache/coyote/AbstractProcessor.java
index f5787aa..7947a59 100644
--- a/java/org/apache/coyote/AbstractProcessor.java
+++ b/java/org/apache/coyote/AbstractProcessor.java
@@ -795,6 +795,14 @@ public abstract class AbstractProcessor extends 
AbstractProcessorLight implement
 if (sslO != null) {
 request.setAttribute(SSLSupport.PROTOCOL_VERSION_KEY, 
sslO);
 }
+sslO = sslSupport.getRequestedProtocols();
+if (sslO != null) {
+
request.setAttribute(SSLSupport.REQUESTED_PROTOCOL_VERSIONS_KEY, sslO);
+}
+sslO = sslSupport.getRequestedCiphers();
+if (sslO != null) {
+request.setAttribute(SSLSupport.REQUESTED_CIPHERS_KEY, 
sslO

[tomcat] branch master updated: Fix checkstyle warnings

2020-12-04 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new 3bc0f91  Fix checkstyle warnings
3bc0f91 is described below

commit 3bc0f9101e07c34f59c626687d8af5d358a26c7f
Author: Mark Thomas 
AuthorDate: Fri Dec 4 08:06:39 2020 +

Fix checkstyle warnings
---
 java/org/apache/catalina/ssi/ExpressionParseTree.java | 4 ++--
 java/org/apache/catalina/util/LifecycleMBeanBase.java | 1 -
 java/org/apache/catalina/valves/rewrite/Substitution.java | 2 +-
 java/org/apache/tomcat/websocket/WsFrameBase.java | 2 +-
 test/org/apache/catalina/authenticator/TestFormAuthenticator.java | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/catalina/ssi/ExpressionParseTree.java 
b/java/org/apache/catalina/ssi/ExpressionParseTree.java
index 83da544..dd048c0 100644
--- a/java/org/apache/catalina/ssi/ExpressionParseTree.java
+++ b/java/org/apache/catalina/ssi/ExpressionParseTree.java
@@ -213,7 +213,7 @@ public class ExpressionParseTree {
 /**
  * A node in the expression parse tree.
  */
-private static abstract class Node {
+private abstract static class Node {
 /**
  * @return {@code true} if the node evaluates to true.
  */
@@ -266,7 +266,7 @@ public class ExpressionParseTree {
 /**
  * A node implementation that represents an operation.
  */
-private static abstract class OppNode extends Node {
+private abstract static class OppNode extends Node {
 /**
  * The left branch.
  */
diff --git a/java/org/apache/catalina/util/LifecycleMBeanBase.java 
b/java/org/apache/catalina/util/LifecycleMBeanBase.java
index bfe2fec..4cb1b44 100644
--- a/java/org/apache/catalina/util/LifecycleMBeanBase.java
+++ b/java/org/apache/catalina/util/LifecycleMBeanBase.java
@@ -18,7 +18,6 @@
 package org.apache.catalina.util;
 
 import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 
 import org.apache.catalina.Globals;
diff --git a/java/org/apache/catalina/valves/rewrite/Substitution.java 
b/java/org/apache/catalina/valves/rewrite/Substitution.java
index 26fc210..50d78db 100644
--- a/java/org/apache/catalina/valves/rewrite/Substitution.java
+++ b/java/org/apache/catalina/valves/rewrite/Substitution.java
@@ -25,7 +25,7 @@ import org.apache.catalina.util.URLEncoder;
 
 public class Substitution {
 
-public static abstract class SubstitutionElement {
+public abstract static class SubstitutionElement {
 public abstract String evaluate(Matcher rule, Matcher cond, Resolver 
resolver);
 }
 
diff --git a/java/org/apache/tomcat/websocket/WsFrameBase.java 
b/java/org/apache/tomcat/websocket/WsFrameBase.java
index c4108fe..fd8c4eb 100644
--- a/java/org/apache/tomcat/websocket/WsFrameBase.java
+++ b/java/org/apache/tomcat/websocket/WsFrameBase.java
@@ -912,7 +912,7 @@ public abstract class WsFrameBase {
 protected abstract void resumeProcessing();
 
 
-private static abstract class TerminalTransformation implements 
Transformation {
+private abstract static class TerminalTransformation implements 
Transformation {
 
 @Override
 public boolean validateRsvBits(int i) {
diff --git a/test/org/apache/catalina/authenticator/TestFormAuthenticator.java 
b/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
index cc488d8..9d4ca09 100644
--- a/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
+++ b/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
@@ -418,7 +418,7 @@ public class TestFormAuthenticator extends TomcatBaseTest {
  * Encapsulate the logic needed to run a suitably-configured tomcat
  * instance, send it an HTTP request and process the server response
  */
-private static abstract class FormAuthClientBase extends SimpleHttpClient {
+private abstract static class FormAuthClientBase extends SimpleHttpClient {
 
 protected static final String LOGIN_PARAM_TAG = "action=";
 protected static final String LOGIN_RESOURCE = "j_security_check";


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



[tomcat] 02/02: Action review comments

2020-12-03 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch bz-64110
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit f98f1164a77a49e785e7beb7325e89c38a8a2f4d
Author: Mark Thomas 
AuthorDate: Thu Dec 3 19:06:06 2020 +

Action review comments
---
 java/org/apache/catalina/util/TLSUtil.java  | 21 +
 .../apache/tomcat/util/net/LocalStrings.properties  |  1 +
 .../apache/tomcat/util/net/SecureNio2Channel.java   |  4 ++--
 .../apache/tomcat/util/net/SecureNioChannel.java|  2 +-
 .../tomcat/util/net/TLSClientHelloExtractor.java| 10 +-
 5 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/java/org/apache/catalina/util/TLSUtil.java 
b/java/org/apache/catalina/util/TLSUtil.java
index 37ae78c..7f895dd 100644
--- a/java/org/apache/catalina/util/TLSUtil.java
+++ b/java/org/apache/catalina/util/TLSUtil.java
@@ -33,13 +33,18 @@ public class TLSUtil {
  * information, otherwise {@code false}
  */
 public static boolean isTLSRequestAttribute(String name) {
-return Globals.CERTIFICATES_ATTR.equals(name) ||
-Globals.CIPHER_SUITE_ATTR.equals(name) ||
-Globals.KEY_SIZE_ATTR.equals(name)  ||
-Globals.SSL_SESSION_ID_ATTR.equals(name) ||
-Globals.SSL_SESSION_MGR_ATTR.equals(name) ||
-SSLSupport.PROTOCOL_VERSION_KEY.equals(name) ||
-SSLSupport.REQUESTED_PROTOCOL_VERSIONS_KEY.equals(name) ||
-SSLSupport.REQUESTED_CIPHERS_KEY.equals(name);
+switch (name) {
+case Globals.CERTIFICATES_ATTR:
+case Globals.CIPHER_SUITE_ATTR:
+case Globals.KEY_SIZE_ATTR:
+case Globals.SSL_SESSION_ID_ATTR:
+case Globals.SSL_SESSION_MGR_ATTR:
+case SSLSupport.PROTOCOL_VERSION_KEY:
+case SSLSupport.REQUESTED_PROTOCOL_VERSIONS_KEY:
+case SSLSupport.REQUESTED_CIPHERS_KEY:
+return true;
+default:
+return false;
+}
 }
 }
diff --git a/java/org/apache/tomcat/util/net/LocalStrings.properties 
b/java/org/apache/tomcat/util/net/LocalStrings.properties
index 1de8916..a6bb669 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings.properties
@@ -146,6 +146,7 @@ nioBlockingSelector.selectError=Error selecting key
 
 sniExtractor.clientHelloInvalid=The ClientHello message was not correctly 
formatted
 sniExtractor.clientHelloTooBig=The ClientHello was not presented in a single 
TLS record so no SNI information could be extracted
+sniExtractor.tooEarly=It is illegal to call this method before the client 
hello has been parsed
 
 socket.apr.clientAbort=The client aborted the connection.
 socket.apr.closed=The socket [{0}] associated with this connection has been 
closed.
diff --git a/java/org/apache/tomcat/util/net/SecureNio2Channel.java 
b/java/org/apache/tomcat/util/net/SecureNio2Channel.java
index cbe3f8b..611038e 100644
--- a/java/org/apache/tomcat/util/net/SecureNio2Channel.java
+++ b/java/org/apache/tomcat/util/net/SecureNio2Channel.java
@@ -65,7 +65,7 @@ public class SecureNio2Channel extends Nio2Channel  {
 
 protected SSLEngine sslEngine;
 
-protected boolean sniComplete = false;
+protected volatile boolean sniComplete = false;
 
 private volatile boolean handshakeComplete = false;
 private volatile HandshakeStatus handshakeStatus; //gets set by handshake
@@ -73,7 +73,7 @@ public class SecureNio2Channel extends Nio2Channel  {
 protected boolean closed;
 protected boolean closing;
 
-private Map> additionalTlsAttributes = new HashMap<>();
+private final Map> additionalTlsAttributes = new 
HashMap<>();
 
 private volatile boolean unwrapBeforeRead;
 private final CompletionHandler> 
handshakeReadCompletionHandler;
diff --git a/java/org/apache/tomcat/util/net/SecureNioChannel.java 
b/java/org/apache/tomcat/util/net/SecureNioChannel.java
index 6e1fe14..1ac2061 100644
--- a/java/org/apache/tomcat/util/net/SecureNioChannel.java
+++ b/java/org/apache/tomcat/util/net/SecureNioChannel.java
@@ -71,7 +71,7 @@ public class SecureNioChannel extends NioChannel {
 protected boolean closed = false;
 protected boolean closing = false;
 
-private Map> additionalTlsAttributes = new HashMap<>();
+private final Map> additionalTlsAttributes = new 
HashMap<>();
 
 public SecureNioChannel(SocketBufferHandler bufHandler, NioEndpoint 
endpoint) {
 super(bufHandler);
diff --git a/java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java 
b/java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java
index cb8436e..21a5924 100644
--- a/java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java
+++ b/java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java
@@ -200,7 +200,7 

[tomcat] 01/02: Fix BZ 64110 - request attr for requested ciphers and protocols

2020-12-03 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch bz-64110
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit a0e8389070b51eedb7d13b4d885b7c9f1e4b635c
Author: Mark Thomas 
AuthorDate: Wed Nov 25 18:44:11 2020 +

Fix BZ 64110 - request attr for requested ciphers and protocols

https://bz.apache.org/bugzilla/show_bug.cgi?id=64110
---
 java/org/apache/catalina/connector/Request.java|  8 +++
 java/org/apache/catalina/util/TLSUtil.java |  4 +-
 java/org/apache/coyote/AbstractProcessor.java  |  8 +++
 java/org/apache/tomcat/util/buf/HexUtils.java  | 14 
 java/org/apache/tomcat/util/net/AprSSLSupport.java | 13 
 java/org/apache/tomcat/util/net/Nio2Endpoint.java  |  7 +-
 java/org/apache/tomcat/util/net/NioEndpoint.java   |  7 +-
 .../apache/tomcat/util/net/SSLImplementation.java  | 27 +++
 java/org/apache/tomcat/util/net/SSLSupport.java| 30 
 .../apache/tomcat/util/net/SecureNio2Channel.java  | 20 ++
 .../apache/tomcat/util/net/SecureNioChannel.java   | 20 ++
 .../tomcat/util/net/TLSClientHelloExtractor.java   | 83 --
 .../tomcat/util/net/jsse/JSSEImplementation.java   | 11 ++-
 .../apache/tomcat/util/net/jsse/JSSESupport.java   | 34 -
 .../util/net/openssl/OpenSSLImplementation.java|  9 +++
 webapps/docs/changelog.xml |  5 ++
 webapps/docs/config/http.xml   |  6 ++
 17 files changed, 285 insertions(+), 21 deletions(-)

diff --git a/java/org/apache/catalina/connector/Request.java 
b/java/org/apache/catalina/connector/Request.java
index e2dff97..37ed6d2 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -885,6 +885,14 @@ public class Request implements HttpServletRequest {
 if (attr != null) {
 attributes.put(SSLSupport.PROTOCOL_VERSION_KEY, attr);
 }
+attr = 
coyoteRequest.getAttribute(SSLSupport.REQUESTED_PROTOCOL_VERSIONS_KEY);
+if (attr != null) {
+attributes.put(SSLSupport.REQUESTED_PROTOCOL_VERSIONS_KEY, 
attr);
+}
+attr = 
coyoteRequest.getAttribute(SSLSupport.REQUESTED_CIPHERS_KEY);
+if (attr != null) {
+attributes.put(SSLSupport.REQUESTED_CIPHERS_KEY, attr);
+}
 attr = attributes.get(name);
 sslAttributesParsed = true;
 }
diff --git a/java/org/apache/catalina/util/TLSUtil.java 
b/java/org/apache/catalina/util/TLSUtil.java
index a739021..37ae78c 100644
--- a/java/org/apache/catalina/util/TLSUtil.java
+++ b/java/org/apache/catalina/util/TLSUtil.java
@@ -38,6 +38,8 @@ public class TLSUtil {
 Globals.KEY_SIZE_ATTR.equals(name)  ||
 Globals.SSL_SESSION_ID_ATTR.equals(name) ||
 Globals.SSL_SESSION_MGR_ATTR.equals(name) ||
-SSLSupport.PROTOCOL_VERSION_KEY.equals(name);
+SSLSupport.PROTOCOL_VERSION_KEY.equals(name) ||
+SSLSupport.REQUESTED_PROTOCOL_VERSIONS_KEY.equals(name) ||
+SSLSupport.REQUESTED_CIPHERS_KEY.equals(name);
 }
 }
diff --git a/java/org/apache/coyote/AbstractProcessor.java 
b/java/org/apache/coyote/AbstractProcessor.java
index f5787aa..7947a59 100644
--- a/java/org/apache/coyote/AbstractProcessor.java
+++ b/java/org/apache/coyote/AbstractProcessor.java
@@ -795,6 +795,14 @@ public abstract class AbstractProcessor extends 
AbstractProcessorLight implement
 if (sslO != null) {
 request.setAttribute(SSLSupport.PROTOCOL_VERSION_KEY, 
sslO);
 }
+sslO = sslSupport.getRequestedProtocols();
+if (sslO != null) {
+
request.setAttribute(SSLSupport.REQUESTED_PROTOCOL_VERSIONS_KEY, sslO);
+}
+sslO = sslSupport.getRequestedCiphers();
+if (sslO != null) {
+request.setAttribute(SSLSupport.REQUESTED_CIPHERS_KEY, 
sslO);
+}
 request.setAttribute(SSLSupport.SESSION_MGR, sslSupport);
 }
 } catch (Exception e) {
diff --git a/java/org/apache/tomcat/util/buf/HexUtils.java 
b/java/org/apache/tomcat/util/buf/HexUtils.java
index 977205e..c7bada8 100644
--- a/java/org/apache/tomcat/util/buf/HexUtils.java
+++ b/java/org/apache/tomcat/util/buf/HexUtils.java
@@ -74,6 +74,20 @@ public final class HexUtils {
 }
 
 
+public static String toHexString(char c) {
+// 2 bytes / 4 hex digits
+StringBuilder sb = new StringBuilder(4);
+
+sb.append(hex[(c & 0xf000) >> 4]);
+sb.append(hex[(c & 0x0f00)]);
+
+sb.append(hex[(c & 0xf0) >> 4]);
+sb.append(hex[(c & 0x0f)]);
+
+return sb.toString();
+}
+
+
 public static String toHexString(byte[] bytes) 

[tomcat] branch bz-64110 created (now f98f116)

2020-12-03 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch bz-64110
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


  at f98f116  Action review comments

This branch includes the following new commits:

 new a0e8389  Fix BZ 64110 - request attr for requested ciphers and 
protocols
 new f98f116  Action review comments

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.



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



svn commit: r1884073 - in /tomcat/site/trunk: docs/security-10.html docs/security-8.html docs/security-9.html xdocs/security-10.xml xdocs/security-8.xml xdocs/security-9.xml

2020-12-03 Thread markt
Author: markt
Date: Thu Dec  3 18:01:08 2020
New Revision: 1884073

URL: http://svn.apache.org/viewvc?rev=1884073=rev
Log:
Publish CVE-2020-17527

Modified:
tomcat/site/trunk/docs/security-10.html
tomcat/site/trunk/docs/security-8.html
tomcat/site/trunk/docs/security-9.html
tomcat/site/trunk/xdocs/security-10.xml
tomcat/site/trunk/xdocs/security-8.xml
tomcat/site/trunk/xdocs/security-9.xml

Modified: tomcat/site/trunk/docs/security-10.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-10.html?rev=1884073=1884072=1884073=diff
==
--- tomcat/site/trunk/docs/security-10.html (original)
+++ tomcat/site/trunk/docs/security-10.html Thu Dec  3 18:01:08 2020
@@ -2,7 +2,7 @@
 Apache Tomcat - Apache Tomcat 10 
vulnerabilitieshttp://tomcat.apache.org/;>Apache 
Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" 
alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left">https://www.google.com/search; method="get">GOhttps://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png; alt="Next ASF 
event">
   Save the date!
 Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi;>Tomcat 10 
(alpha)https://tomcat.apache.org/download-90.cgi;>Tomcat 
9https://tomcat.apache.org/download-80.cgi;>Tomcat 
8https://tomcat.apache.org/download-70.cgi;>Tomcat 
7https://tomcat.apache.org/download-connectors.cgi;>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 10.0 (alpha)Tomcat 
 >9.0Tomcat 
 >8.5Tomcat 
 >7.0Tomcat Connectorshref="./native-doc/">Tomcat Nativehref="https://cwiki.apache.org/confluence/display/TOMCAT;>Wikihref="./migration.html">Migration Guidehref="./presentations.html">Presentationshref="https://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems? href="./security.html">Security Reportshref="./findhelp.html">Find helphref="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQ href="./lists.html">Mailing ListsBug 
 >DatabaseIRCGet 
 >Involved
 OverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://www.apache.org/foundation/contributing.html;>Support 
Apachehref="https://www.apache.org/foundation/sponsorship.html;>Sponsorship href="http://www.apache.org/foundation/thanks.html;>Thankshref="http://www.apache.org/licenses/;>License id="mainRight">Contentid="Table_of_Contents">Table of Contents
-Apache Tomcat 10.x 
vulnerabilitiesFixed 
in Apache Tomcat 10.0.0-M8Fixed in Apache Tomcat 
10.0.0-M7Fixed in 
Apache Tomcat 10.0.0-M6Fixed in Apache Tomcat 
10.0.0-M5
+Apache Tomcat 10.x 
vulnerabilitiesFixed 
in Apache Tomcat 10.0.0-M10Fixed in Apache Tomcat 
10.0.0-M8Fixed in 
Apache Tomcat 10.0.0-M7Fixed in Apache Tomcat 
10.0.0-M6Fixed in 
Apache Tomcat 10.0.0-M5
 Apache Tomcat 10.x 
vulnerabilities
 This page lists all security vulnerabilities fixed in released versions
of Apache Tomcat 10.x. Each vulnerability is given a
@@ -39,6 +39,27 @@
Tomcat Security Team. Thank you.
 
 
+  17 
November 2020 Fixed in Apache Tomcat 10.0.0-M10
+
+Moderate: HTTP/2 request header mix-up
+   http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-17527; 
rel="nofollow">CVE-2020-17527
+
+While investigating issue https://bz.apache.org/bugzilla/show_bug.cgi?id=64830;>64830 it was 
discovered that Apache
+   Tomcat could re-use an HTTP request header value from the previous 
stream
+   received on an HTTP/2 connection for the request associated with the
+   subsequent stream. While this would most likely lead to an error and the
+   closure of the HTTP/2 connection, it is possible that information could
+   leak between requests.
+
+
+This was fixed with commit
+   https://github.com/apache/tomcat/commit/8d2fe6894d6e258a6d615d7f786acca80e6020cb;>8d2fe689.
+
+This issue was identified by the Apache Tomcat Security team on 10
+   November 2020. The i

svn commit: r44827 [1/2] - in /dev/tomcat/tomcat-8/v8.5.61: ./ bin/ bin/embed/ bin/extras/ src/

2020-12-03 Thread markt
Author: markt
Date: Thu Dec  3 14:18:47 2020
New Revision: 44827

Log:
Upload 8.5.61 for voting

Added:
dev/tomcat/tomcat-8/v8.5.61/
dev/tomcat/tomcat-8/v8.5.61/KEYS
dev/tomcat/tomcat-8/v8.5.61/README.html
dev/tomcat/tomcat-8/v8.5.61/RELEASE-NOTES
dev/tomcat/tomcat-8/v8.5.61/bin/
dev/tomcat/tomcat-8/v8.5.61/bin/README.html
dev/tomcat/tomcat-8/v8.5.61/bin/apache-tomcat-8.5.61-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.61/bin/apache-tomcat-8.5.61-deployer.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.61/bin/apache-tomcat-8.5.61-deployer.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.61/bin/apache-tomcat-8.5.61-deployer.zip   (with 
props)
dev/tomcat/tomcat-8/v8.5.61/bin/apache-tomcat-8.5.61-deployer.zip.asc
dev/tomcat/tomcat-8/v8.5.61/bin/apache-tomcat-8.5.61-deployer.zip.sha512
dev/tomcat/tomcat-8/v8.5.61/bin/apache-tomcat-8.5.61-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.61/bin/apache-tomcat-8.5.61-fulldocs.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.61/bin/apache-tomcat-8.5.61-fulldocs.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.61/bin/apache-tomcat-8.5.61-windows-x64.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.61/bin/apache-tomcat-8.5.61-windows-x64.zip.asc
dev/tomcat/tomcat-8/v8.5.61/bin/apache-tomcat-8.5.61-windows-x64.zip.sha512
dev/tomcat/tomcat-8/v8.5.61/bin/apache-tomcat-8.5.61-windows-x86.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.61/bin/apache-tomcat-8.5.61-windows-x86.zip.asc
dev/tomcat/tomcat-8/v8.5.61/bin/apache-tomcat-8.5.61-windows-x86.zip.sha512
dev/tomcat/tomcat-8/v8.5.61/bin/apache-tomcat-8.5.61.exe   (with props)
dev/tomcat/tomcat-8/v8.5.61/bin/apache-tomcat-8.5.61.exe.asc
dev/tomcat/tomcat-8/v8.5.61/bin/apache-tomcat-8.5.61.exe.sha512
dev/tomcat/tomcat-8/v8.5.61/bin/apache-tomcat-8.5.61.tar.gz   (with props)
dev/tomcat/tomcat-8/v8.5.61/bin/apache-tomcat-8.5.61.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.61/bin/apache-tomcat-8.5.61.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.61/bin/apache-tomcat-8.5.61.zip   (with props)
dev/tomcat/tomcat-8/v8.5.61/bin/apache-tomcat-8.5.61.zip.asc
dev/tomcat/tomcat-8/v8.5.61/bin/apache-tomcat-8.5.61.zip.sha512
dev/tomcat/tomcat-8/v8.5.61/bin/embed/
dev/tomcat/tomcat-8/v8.5.61/bin/embed/apache-tomcat-8.5.61-embed.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.61/bin/embed/apache-tomcat-8.5.61-embed.tar.gz.asc

dev/tomcat/tomcat-8/v8.5.61/bin/embed/apache-tomcat-8.5.61-embed.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.61/bin/embed/apache-tomcat-8.5.61-embed.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.61/bin/embed/apache-tomcat-8.5.61-embed.zip.asc
dev/tomcat/tomcat-8/v8.5.61/bin/embed/apache-tomcat-8.5.61-embed.zip.sha512
dev/tomcat/tomcat-8/v8.5.61/bin/extras/
dev/tomcat/tomcat-8/v8.5.61/bin/extras/catalina-jmx-remote.jar   (with 
props)
dev/tomcat/tomcat-8/v8.5.61/bin/extras/catalina-jmx-remote.jar.asc
dev/tomcat/tomcat-8/v8.5.61/bin/extras/catalina-jmx-remote.jar.sha512
dev/tomcat/tomcat-8/v8.5.61/bin/extras/catalina-ws.jar   (with props)
dev/tomcat/tomcat-8/v8.5.61/bin/extras/catalina-ws.jar.asc
dev/tomcat/tomcat-8/v8.5.61/bin/extras/catalina-ws.jar.sha512
dev/tomcat/tomcat-8/v8.5.61/src/
dev/tomcat/tomcat-8/v8.5.61/src/apache-tomcat-8.5.61-src.tar.gz   (with 
props)
dev/tomcat/tomcat-8/v8.5.61/src/apache-tomcat-8.5.61-src.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.61/src/apache-tomcat-8.5.61-src.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.61/src/apache-tomcat-8.5.61-src.zip   (with props)
dev/tomcat/tomcat-8/v8.5.61/src/apache-tomcat-8.5.61-src.zip.asc
dev/tomcat/tomcat-8/v8.5.61/src/apache-tomcat-8.5.61-src.zip.sha512

Added: dev/tomcat/tomcat-8/v8.5.61/KEYS
==
--- dev/tomcat/tomcat-8/v8.5.61/KEYS (added)
+++ dev/tomcat/tomcat-8/v8.5.61/KEYS Thu Dec  3 14:18:47 2020
@@ -0,0 +1,676 @@
+This file contains the PGP 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).
+
+
+Type Bits/KeyIDDate   User ID
+pub  2048/F22C4FED 2001/07/02 Andy Armstrong 
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: PGPfreeware 7.0.3 for non-commercial use <http://www.pgp.com>
+
+mQGiBDtAWuURBADZ0KUEyUkSUiTA09e7tvEbX25STsjxrR+DNTainCls+XlkVOij
+gBv216lqge9tIsS0L6hCP4OQbFf/64qVtJssX4QXdyiZGb5wpmcj0Mz602Ew8r+N
+I0S5NvmogoYWW7BlP4r61jNxO5zrr03KaijM5r4ipJdLUxyOmM6P2jRPUwCg/5gm
+bpqiYl7pXX5FgDeB36tmD+UD/06iLqOnoiKO0vMbOk7URclhCObMNrHqxTxozMTS
+B9soYURbIeArei+plYo2n+1qB12ayybjhVu3uksXRdT9bEkyxMfslvLb

svn commit: r44827 [2/2] - in /dev/tomcat/tomcat-8/v8.5.61: ./ bin/ bin/embed/ bin/extras/ src/

2020-12-03 Thread markt
Added: dev/tomcat/tomcat-8/v8.5.61/src/apache-tomcat-8.5.61-src.zip.asc
==
--- dev/tomcat/tomcat-8/v8.5.61/src/apache-tomcat-8.5.61-src.zip.asc (added)
+++ dev/tomcat/tomcat-8/v8.5.61/src/apache-tomcat-8.5.61-src.zip.asc Thu Dec  3 
14:18:47 2020
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAl/I8qMACgkQEMAcWi9g
+WedjbRAAtt5HufA5KoV51etkljdw/Gmww7lY13xVpzOCLAhg+gPRGv0cC8GlC4KD
+MjgDFfhPEBW5nM/gBNePhIsmNZX3Ge5i2/fuquiwMeEdcliPayKPomDxOlFxB1AJ
+gYbsg+agS7c68QPg7vm3fE3T7oih1b182RvxRFcio1413zDxo9UEgk+BdjObgLZl
+g5s21qfuM8reTyqAzjI64MO+4CrmU8LZIlVUv/Z8E4i+7Lnf3uVgoqkQg4iie5Wa
+lSvHdFVQR5e5EGObzDYy/+mdWB+LcYihcVfXpHZL+U57YO/csGtnIaWAQs6ki6Gd
+mlfXLDxFU8IVASLSB1KbDzVyQIUCYfyizKFGyFSbtQL2vJNniUQ5tyYMYl3Wgk6s
+lacu1Rry1NcztqOnQvHwgTpCggN9zewBk01oZWg5naNux6ui6TASBKYwWUhSkQ9o
+nt4mZfvdIEhBfkfxSLpOwrK9DxfYIsShQRq2LcvoVoV5UDnvtUwKzElcKrEyY7Ae
+EynyR+0slbUTutAQZVMf6RjDGQEiYM5QnubjSJRB/OyCdzWf/5CnspsrH15wifJA
+L3k5hvca61mwr9lClwW2r8xT4qRCzYqpb/xLeeTEfpGT7Ani8GFNXqm6QxA4ntpi
++pY4U12wHMzy+Rhjzz4DehS78fX1In2HGQoorI71ZHOcH8Rxg4E=
+=0vaw
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-8/v8.5.61/src/apache-tomcat-8.5.61-src.zip.sha512
==
--- dev/tomcat/tomcat-8/v8.5.61/src/apache-tomcat-8.5.61-src.zip.sha512 (added)
+++ dev/tomcat/tomcat-8/v8.5.61/src/apache-tomcat-8.5.61-src.zip.sha512 Thu Dec 
 3 14:18:47 2020
@@ -0,0 +1 @@
+01f7076b1afa7a279b3144fed9c6e6952c6f11d8147e9b53ac6742bc8170f41d7554ffd47a6d5808aca349a65d63f8b43fee8f0e96c96585505d3f74f2d431c9
 *apache-tomcat-8.5.61-src.zip
\ No newline at end of file



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



[tomcat] 01/01: Tag 8.5.61

2020-12-03 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to tag 8.5.61
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 77d330abea52e4aeb039ca7eb8a766e0e1c56a71
Author: Mark Thomas 
AuthorDate: Thu Dec 3 13:59:25 2020 +

Tag 8.5.61
---
 build.properties.default   | 2 +-
 webapps/docs/changelog.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 49221fe..38fe392 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=8
 version.minor=5
 version.build=61
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Source control flags -
 git.branch=8.5.x
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 60ac020..13a7f7e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -103,7 +103,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] tag 8.5.61 created (now 77d330a)

2020-12-03 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to tag 8.5.61
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


  at 77d330a  (commit)
This tag includes the following new commits:

 new 77d330a  Tag 8.5.61

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



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



svn commit: r44818 - in /dev/tomcat/tomcat-9/v9.0.41: ./ bin/ bin/embed/ src/

2020-12-03 Thread markt
Author: markt
Date: Thu Dec  3 12:42:32 2020
New Revision: 44818

Log:
Upload 9.0.41 for voting

Added:
dev/tomcat/tomcat-9/v9.0.41/
dev/tomcat/tomcat-9/v9.0.41/KEYS
dev/tomcat/tomcat-9/v9.0.41/README.html
dev/tomcat/tomcat-9/v9.0.41/RELEASE-NOTES
dev/tomcat/tomcat-9/v9.0.41/bin/
dev/tomcat/tomcat-9/v9.0.41/bin/README.html
dev/tomcat/tomcat-9/v9.0.41/bin/apache-tomcat-9.0.41-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-9/v9.0.41/bin/apache-tomcat-9.0.41-deployer.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.41/bin/apache-tomcat-9.0.41-deployer.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.41/bin/apache-tomcat-9.0.41-deployer.zip   (with 
props)
dev/tomcat/tomcat-9/v9.0.41/bin/apache-tomcat-9.0.41-deployer.zip.asc
dev/tomcat/tomcat-9/v9.0.41/bin/apache-tomcat-9.0.41-deployer.zip.sha512
dev/tomcat/tomcat-9/v9.0.41/bin/apache-tomcat-9.0.41-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-9/v9.0.41/bin/apache-tomcat-9.0.41-fulldocs.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.41/bin/apache-tomcat-9.0.41-fulldocs.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.41/bin/apache-tomcat-9.0.41-windows-x64.zip   
(with props)
dev/tomcat/tomcat-9/v9.0.41/bin/apache-tomcat-9.0.41-windows-x64.zip.asc
dev/tomcat/tomcat-9/v9.0.41/bin/apache-tomcat-9.0.41-windows-x64.zip.sha512
dev/tomcat/tomcat-9/v9.0.41/bin/apache-tomcat-9.0.41-windows-x86.zip   
(with props)
dev/tomcat/tomcat-9/v9.0.41/bin/apache-tomcat-9.0.41-windows-x86.zip.asc
dev/tomcat/tomcat-9/v9.0.41/bin/apache-tomcat-9.0.41-windows-x86.zip.sha512
dev/tomcat/tomcat-9/v9.0.41/bin/apache-tomcat-9.0.41.exe   (with props)
dev/tomcat/tomcat-9/v9.0.41/bin/apache-tomcat-9.0.41.exe.asc
dev/tomcat/tomcat-9/v9.0.41/bin/apache-tomcat-9.0.41.exe.sha512
dev/tomcat/tomcat-9/v9.0.41/bin/apache-tomcat-9.0.41.tar.gz   (with props)
dev/tomcat/tomcat-9/v9.0.41/bin/apache-tomcat-9.0.41.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.41/bin/apache-tomcat-9.0.41.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.41/bin/apache-tomcat-9.0.41.zip   (with props)
dev/tomcat/tomcat-9/v9.0.41/bin/apache-tomcat-9.0.41.zip.asc
dev/tomcat/tomcat-9/v9.0.41/bin/apache-tomcat-9.0.41.zip.sha512
dev/tomcat/tomcat-9/v9.0.41/bin/embed/
dev/tomcat/tomcat-9/v9.0.41/bin/embed/apache-tomcat-9.0.41-embed.tar.gz   
(with props)
dev/tomcat/tomcat-9/v9.0.41/bin/embed/apache-tomcat-9.0.41-embed.tar.gz.asc

dev/tomcat/tomcat-9/v9.0.41/bin/embed/apache-tomcat-9.0.41-embed.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.41/bin/embed/apache-tomcat-9.0.41-embed.zip   
(with props)
dev/tomcat/tomcat-9/v9.0.41/bin/embed/apache-tomcat-9.0.41-embed.zip.asc
dev/tomcat/tomcat-9/v9.0.41/bin/embed/apache-tomcat-9.0.41-embed.zip.sha512
dev/tomcat/tomcat-9/v9.0.41/src/
dev/tomcat/tomcat-9/v9.0.41/src/apache-tomcat-9.0.41-src.tar.gz   (with 
props)
dev/tomcat/tomcat-9/v9.0.41/src/apache-tomcat-9.0.41-src.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.41/src/apache-tomcat-9.0.41-src.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.41/src/apache-tomcat-9.0.41-src.zip   (with props)
dev/tomcat/tomcat-9/v9.0.41/src/apache-tomcat-9.0.41-src.zip.asc
dev/tomcat/tomcat-9/v9.0.41/src/apache-tomcat-9.0.41-src.zip.sha512

Added: dev/tomcat/tomcat-9/v9.0.41/KEYS
==
--- dev/tomcat/tomcat-9/v9.0.41/KEYS (added)
+++ dev/tomcat/tomcat-9/v9.0.41/KEYS Thu Dec  3 12:42:32 2020
@@ -0,0 +1,676 @@
+This file contains the PGP 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).
+
+
+Type Bits/KeyIDDate   User ID
+pub  2048/F22C4FED 2001/07/02 Andy Armstrong 
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: PGPfreeware 7.0.3 for non-commercial use <http://www.pgp.com>
+
+mQGiBDtAWuURBADZ0KUEyUkSUiTA09e7tvEbX25STsjxrR+DNTainCls+XlkVOij
+gBv216lqge9tIsS0L6hCP4OQbFf/64qVtJssX4QXdyiZGb5wpmcj0Mz602Ew8r+N
+I0S5NvmogoYWW7BlP4r61jNxO5zrr03KaijM5r4ipJdLUxyOmM6P2jRPUwCg/5gm
+bpqiYl7pXX5FgDeB36tmD+UD/06iLqOnoiKO0vMbOk7URclhCObMNrHqxTxozMTS
+B9soYURbIeArei+plYo2n+1qB12ayybjhVu3uksXRdT9bEkyxMfslvLbIpDAG8Cz
+gNftTbKx/MVS7cQU0II8BKo2Akr+1FZah+sD4ovK8SfkMXUQUbTeefTntsAQKyyU
+9M9tA/9on9tBiHFl0qVJht6N4GiJ2G689v7rS2giLgKjetjiCduxBXEgvUSuyQID
+nF9ATrpXjITwsRlGKFmpZiFm5oCeCXihIVH0u6q066xNW2AXkLVoJ1l1Rs2Z0lsb
+0cq3xEAcwAmYLKQvCtgDV8CYgWKVmPi+49rSuQn7Lo9l02OUbLQgQW5keSBBcm1z
+dHJvbmcgPGFuZHlAdGFnaXNoLmNvbT6JAFgEEBECABgFAjtAWuUICwMJCAcCAQoC
+GQEFGwMACgkQajrT9PIsT+1plgCfXAovWnVL3MjrTfcGlFSKw7GHCSYAoJkz
+x+r2ANe8/0e+u5ZcYtSaSry+uQI

[tomcat] 01/01: Tag 9.0.41

2020-12-03 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to tag 9.0.41
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 75d7a2069bf4360bcd8b885c6b7387d70c9cb052
Author: Mark Thomas 
AuthorDate: Thu Dec 3 11:38:47 2020 +

Tag 9.0.41
---
 build.properties.default   | 2 +-
 webapps/docs/changelog.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 565e2b1..f3c1360 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=9
 version.minor=0
 version.build=41
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Source control flags -
 git.branch=master
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 38c4f56..f11f25c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -103,7 +103,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] tag 9.0.41 created (now 75d7a20)

2020-12-03 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to tag 9.0.41
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


  at 75d7a20  (commit)
This tag includes the following new commits:

 new 75d7a20  Tag 9.0.41

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



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



svn commit: r44813 - in /dev/tomcat/tomcat-10/v10.0.0: ./ bin/ bin/embed/ src/

2020-12-03 Thread markt
Author: markt
Date: Thu Dec  3 08:10:59 2020
New Revision: 44813

Log:
UpUpload 10.0.0 for voting

Added:
dev/tomcat/tomcat-10/v10.0.0/
dev/tomcat/tomcat-10/v10.0.0/KEYS
dev/tomcat/tomcat-10/v10.0.0/README.html
dev/tomcat/tomcat-10/v10.0.0/RELEASE-NOTES
dev/tomcat/tomcat-10/v10.0.0/bin/
dev/tomcat/tomcat-10/v10.0.0/bin/README.html
dev/tomcat/tomcat-10/v10.0.0/bin/apache-tomcat-10.0.0-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-10/v10.0.0/bin/apache-tomcat-10.0.0-deployer.tar.gz.asc
dev/tomcat/tomcat-10/v10.0.0/bin/apache-tomcat-10.0.0-deployer.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.0/bin/apache-tomcat-10.0.0-deployer.zip   (with 
props)
dev/tomcat/tomcat-10/v10.0.0/bin/apache-tomcat-10.0.0-deployer.zip.asc
dev/tomcat/tomcat-10/v10.0.0/bin/apache-tomcat-10.0.0-deployer.zip.sha512
dev/tomcat/tomcat-10/v10.0.0/bin/apache-tomcat-10.0.0-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-10/v10.0.0/bin/apache-tomcat-10.0.0-fulldocs.tar.gz.asc
dev/tomcat/tomcat-10/v10.0.0/bin/apache-tomcat-10.0.0-fulldocs.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.0/bin/apache-tomcat-10.0.0-windows-x64.zip   
(with props)
dev/tomcat/tomcat-10/v10.0.0/bin/apache-tomcat-10.0.0-windows-x64.zip.asc
dev/tomcat/tomcat-10/v10.0.0/bin/apache-tomcat-10.0.0-windows-x64.zip.sha512
dev/tomcat/tomcat-10/v10.0.0/bin/apache-tomcat-10.0.0-windows-x86.zip   
(with props)
dev/tomcat/tomcat-10/v10.0.0/bin/apache-tomcat-10.0.0-windows-x86.zip.asc
dev/tomcat/tomcat-10/v10.0.0/bin/apache-tomcat-10.0.0-windows-x86.zip.sha512
dev/tomcat/tomcat-10/v10.0.0/bin/apache-tomcat-10.0.0.exe   (with props)
dev/tomcat/tomcat-10/v10.0.0/bin/apache-tomcat-10.0.0.exe.asc
dev/tomcat/tomcat-10/v10.0.0/bin/apache-tomcat-10.0.0.exe.sha512
dev/tomcat/tomcat-10/v10.0.0/bin/apache-tomcat-10.0.0.tar.gz   (with props)
dev/tomcat/tomcat-10/v10.0.0/bin/apache-tomcat-10.0.0.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.0/bin/apache-tomcat-10.0.0.zip   (with props)
dev/tomcat/tomcat-10/v10.0.0/bin/apache-tomcat-10.0.0.zip.sha512
dev/tomcat/tomcat-10/v10.0.0/bin/embed/
dev/tomcat/tomcat-10/v10.0.0/bin/embed/apache-tomcat-10.0.0-embed.tar.gz   
(with props)
dev/tomcat/tomcat-10/v10.0.0/bin/embed/apache-tomcat-10.0.0-embed.tar.gz.asc

dev/tomcat/tomcat-10/v10.0.0/bin/embed/apache-tomcat-10.0.0-embed.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.0/bin/embed/apache-tomcat-10.0.0-embed.zip   
(with props)
dev/tomcat/tomcat-10/v10.0.0/bin/embed/apache-tomcat-10.0.0-embed.zip.asc
dev/tomcat/tomcat-10/v10.0.0/bin/embed/apache-tomcat-10.0.0-embed.zip.sha512
dev/tomcat/tomcat-10/v10.0.0/src/
dev/tomcat/tomcat-10/v10.0.0/src/apache-tomcat-10.0.0-src.tar.gz   (with 
props)
dev/tomcat/tomcat-10/v10.0.0/src/apache-tomcat-10.0.0-src.tar.gz.asc
dev/tomcat/tomcat-10/v10.0.0/src/apache-tomcat-10.0.0-src.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.0/src/apache-tomcat-10.0.0-src.zip   (with props)
dev/tomcat/tomcat-10/v10.0.0/src/apache-tomcat-10.0.0-src.zip.asc
dev/tomcat/tomcat-10/v10.0.0/src/apache-tomcat-10.0.0-src.zip.sha512

Added: dev/tomcat/tomcat-10/v10.0.0/KEYS
==
--- dev/tomcat/tomcat-10/v10.0.0/KEYS (added)
+++ dev/tomcat/tomcat-10/v10.0.0/KEYS Thu Dec  3 08:10:59 2020
@@ -0,0 +1,676 @@
+This file contains the PGP 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).
+
+
+Type Bits/KeyIDDate   User ID
+pub  2048/F22C4FED 2001/07/02 Andy Armstrong 
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: PGPfreeware 7.0.3 for non-commercial use <http://www.pgp.com>
+
+mQGiBDtAWuURBADZ0KUEyUkSUiTA09e7tvEbX25STsjxrR+DNTainCls+XlkVOij
+gBv216lqge9tIsS0L6hCP4OQbFf/64qVtJssX4QXdyiZGb5wpmcj0Mz602Ew8r+N
+I0S5NvmogoYWW7BlP4r61jNxO5zrr03KaijM5r4ipJdLUxyOmM6P2jRPUwCg/5gm
+bpqiYl7pXX5FgDeB36tmD+UD/06iLqOnoiKO0vMbOk7URclhCObMNrHqxTxozMTS
+B9soYURbIeArei+plYo2n+1qB12ayybjhVu3uksXRdT9bEkyxMfslvLbIpDAG8Cz
+gNftTbKx/MVS7cQU0II8BKo2Akr+1FZah+sD4ovK8SfkMXUQUbTeefTntsAQKyyU
+9M9tA/9on9tBiHFl0qVJht6N4GiJ2G689v7rS2giLgKjetjiCduxBXEgvUSuyQID
+nF9ATrpXjITwsRlGKFmpZiFm5oCeCXihIVH0u6q066xNW2AXkLVoJ1l1Rs2Z0lsb
+0cq3xEAcwAmYLKQvCtgDV8CYgWKVmPi+49rSuQn7Lo9l02OUbLQgQW5keSBBcm1z
+dHJvbmcgPGFuZHlAdGFnaXNoLmNvbT6JAFgEEBECABgFAjtAWuUICwMJCAcCAQoC
+GQEFGwMACgkQajrT9PIsT+1plgCfXAovWnVL3MjrTfcGlFSKw7GHCSYAoJkz
+x+r2ANe8/0e+u5ZcYtSaSry+uQINBDtAWuUQCAD2Qle3CH8IF3KiutapQvMF6PlT
+ETlPtvFuuUs4INoBp1ajFOmPQFXz0AfGy0OplK33TGSGSfgMg71l6RfUodNQ+PVZ
+X9x2Uk89PY3

[tomcat] 01/01: Tag 10.0.0

2020-12-02 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to tag 10.0.0
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 4c8b650437e2464c1c31c6598a263b3805b7a81f
Author: Mark Thomas 
AuthorDate: Wed Dec 2 20:32:14 2020 +

Tag 10.0.0
---
 build.properties.default   | 2 +-
 webapps/docs/changelog.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 110d60f..3ce6a4c 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=10
 version.minor=0
 version.build=0
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Source control flags -
 git.branch=master
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1c768d4..5714a6a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -103,7 +103,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] tag 10.0.0 created (now 4c8b650)

2020-12-02 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to tag 10.0.0
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


  at 4c8b650  (commit)
This tag includes the following new commits:

 new 4c8b650  Tag 10.0.0

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] branch master updated (a9aa71e -> df3a323)

2020-12-02 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from a9aa71e  Ensure values are not duplicated when manipulating the vary 
header
 add df3a323  It is time to drop the milestone modifier

No new revisions were added by this update.

Summary of changes:
 build.properties.default | 2 +-
 res/maven/mvn.properties.default | 2 +-
 webapps/docs/changelog.xml   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


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



[tomcat] branch 7.0.x updated: Ensure values are not duplicated when manipulating the vary header

2020-12-02 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 03454db  Ensure values are not duplicated when manipulating the vary 
header
03454db is described below

commit 03454dba0567c02e585ad1e745c840925dc650ce
Author: Mark Thomas 
AuthorDate: Wed Dec 2 18:51:26 2020 +

Ensure values are not duplicated when manipulating the vary header
---
 java/org/apache/tomcat/util/http/ResponseUtil.java | 14 +++---
 .../apache/tomcat/util/http/TestResponseUtil.java  | 50 +++---
 webapps/docs/changelog.xml |  4 ++
 3 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/java/org/apache/tomcat/util/http/ResponseUtil.java 
b/java/org/apache/tomcat/util/http/ResponseUtil.java
index 1c40d3b..4f5cfbd 100644
--- a/java/org/apache/tomcat/util/http/ResponseUtil.java
+++ b/java/org/apache/tomcat/util/http/ResponseUtil.java
@@ -21,9 +21,9 @@ import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Enumeration;
-import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
 import java.util.List;
-import java.util.Set;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -76,7 +76,7 @@ public class ResponseUtil {
 // the existing values, check if the new value is already present and
 // then add it if not. The good news is field names are tokens which
 // makes parsing simpler.
-Set fieldNames = new HashSet();
+LinkedHashSet fieldNames = new LinkedHashSet();
 
 for (String varyHeader : varyHeaders) {
 StringReader input = new StringReader(varyHeader);
@@ -97,10 +97,12 @@ public class ResponseUtil {
 // Replace existing header(s) to ensure any invalid values are removed
 fieldNames.add(name);
 StringBuilder varyHeader = new StringBuilder();
-varyHeader.append(name);
-for (String fieldName : fieldNames) {
+Iterator iter = fieldNames.iterator();
+// There must be at least one value as one is added just above
+varyHeader.append(iter.next());
+while (iter.hasNext()) {
 varyHeader.append(',');
-varyHeader.append(fieldName);
+varyHeader.append(iter.next());
 }
 adapter.setHeader(VARY_HEADER, varyHeader.toString());
 }
diff --git a/test/org/apache/tomcat/util/http/TestResponseUtil.java 
b/test/org/apache/tomcat/util/http/TestResponseUtil.java
index 68b296d..2597ff4 100644
--- a/test/org/apache/tomcat/util/http/TestResponseUtil.java
+++ b/test/org/apache/tomcat/util/http/TestResponseUtil.java
@@ -16,8 +16,8 @@
  */
 package org.apache.tomcat.util.http;
 
-import java.util.HashSet;
-import java.util.Set;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -31,7 +31,7 @@ public class TestResponseUtil {
 TesterResponse response = new TesterResponse();
 response.getCoyoteResponse();
 response.addHeader("vary", "host");
-Set expected = new HashSet();
+List expected = new ArrayList();
 expected.add("*");
 doTestAddVaryFieldName(response, "*", expected);
 }
@@ -42,7 +42,7 @@ public class TestResponseUtil {
 TesterResponse response = new TesterResponse();
 response.getCoyoteResponse();
 response.addHeader("vary", "*");
-Set expected = new HashSet();
+List expected = new ArrayList();
 expected.add("*");
 doTestAddVaryFieldName(response, "*", expected);
 }
@@ -52,7 +52,7 @@ public class TestResponseUtil {
 public void testAddAllWithNone() {
 TesterResponse response = new TesterResponse();
 response.getCoyoteResponse();
-Set expected = new HashSet();
+List expected = new ArrayList();
 expected.add("*");
 doTestAddVaryFieldName(response, "*", expected);
 }
@@ -63,9 +63,9 @@ public class TestResponseUtil {
 TesterResponse response = new TesterResponse();
 response.getCoyoteResponse();
 response.addHeader("vary", "foo, bar");
-Set expected = new HashSet();
-expected.add("bar");
+List expected = new ArrayList();
 expected.add("foo");
+expected.add("bar");
 expected.add("too");
 doTestAddVaryFieldName(response, "too", expected);
 }
@@ -76,7 +76,7 @@ public class TestResponseUtil {
 TesterResponse response = new TesterResponse();
 response.getCoyoteResponse();
 response.addHeader("vary", "foo, *");
-Set expected = new HashS

[tomcat] branch 8.5.x updated: Ensure values are not duplicated when manipulating the vary header

2020-12-02 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 9cda0bf  Ensure values are not duplicated when manipulating the vary 
header
9cda0bf is described below

commit 9cda0bf32d664c76e2d950fdafd5d4dc55b00a55
Author: Mark Thomas 
AuthorDate: Wed Dec 2 18:51:26 2020 +

Ensure values are not duplicated when manipulating the vary header
---
 java/org/apache/tomcat/util/http/ResponseUtil.java | 14 +++---
 .../apache/tomcat/util/http/TestResponseUtil.java  | 50 +++---
 webapps/docs/changelog.xml |  4 ++
 3 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/java/org/apache/tomcat/util/http/ResponseUtil.java 
b/java/org/apache/tomcat/util/http/ResponseUtil.java
index 295e7b7..cdc6ceb 100644
--- a/java/org/apache/tomcat/util/http/ResponseUtil.java
+++ b/java/org/apache/tomcat/util/http/ResponseUtil.java
@@ -21,9 +21,9 @@ import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Enumeration;
-import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
 import java.util.List;
-import java.util.Set;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -76,7 +76,7 @@ public class ResponseUtil {
 // the existing values, check if the new value is already present and
 // then add it if not. The good news is field names are tokens which
 // makes parsing simpler.
-Set fieldNames = new HashSet<>();
+LinkedHashSet fieldNames = new LinkedHashSet<>();
 
 for (String varyHeader : varyHeaders) {
 StringReader input = new StringReader(varyHeader);
@@ -97,10 +97,12 @@ public class ResponseUtil {
 // Replace existing header(s) to ensure any invalid values are removed
 fieldNames.add(name);
 StringBuilder varyHeader = new StringBuilder();
-varyHeader.append(name);
-for (String fieldName : fieldNames) {
+Iterator iter = fieldNames.iterator();
+// There must be at least one value as one is added just above
+varyHeader.append(iter.next());
+while (iter.hasNext()) {
 varyHeader.append(',');
-varyHeader.append(fieldName);
+varyHeader.append(iter.next());
 }
 adapter.setHeader(VARY_HEADER, varyHeader.toString());
 }
diff --git a/test/org/apache/tomcat/util/http/TestResponseUtil.java 
b/test/org/apache/tomcat/util/http/TestResponseUtil.java
index 826cac8..4c760e0 100644
--- a/test/org/apache/tomcat/util/http/TestResponseUtil.java
+++ b/test/org/apache/tomcat/util/http/TestResponseUtil.java
@@ -16,8 +16,8 @@
  */
 package org.apache.tomcat.util.http;
 
-import java.util.HashSet;
-import java.util.Set;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -31,7 +31,7 @@ public class TestResponseUtil {
 TesterResponse response = new TesterResponse();
 response.getCoyoteResponse();
 response.addHeader("vary", "host");
-Set expected = new HashSet<>();
+List expected = new ArrayList<>();
 expected.add("*");
 doTestAddVaryFieldName(response, "*", expected);
 }
@@ -42,7 +42,7 @@ public class TestResponseUtil {
 TesterResponse response = new TesterResponse();
 response.getCoyoteResponse();
 response.addHeader("vary", "*");
-Set expected = new HashSet<>();
+List expected = new ArrayList<>();
 expected.add("*");
 doTestAddVaryFieldName(response, "*", expected);
 }
@@ -52,7 +52,7 @@ public class TestResponseUtil {
 public void testAddAllWithNone() {
 TesterResponse response = new TesterResponse();
 response.getCoyoteResponse();
-Set expected = new HashSet<>();
+List expected = new ArrayList<>();
 expected.add("*");
 doTestAddVaryFieldName(response, "*", expected);
 }
@@ -63,9 +63,9 @@ public class TestResponseUtil {
 TesterResponse response = new TesterResponse();
 response.getCoyoteResponse();
 response.addHeader("vary", "foo, bar");
-Set expected = new HashSet<>();
-expected.add("bar");
+List expected = new ArrayList<>();
 expected.add("foo");
+expected.add("bar");
 expected.add("too");
 doTestAddVaryFieldName(response, "too", expected);
 }
@@ -76,7 +76,7 @@ public class TestResponseUtil {
 TesterResponse response = new TesterResponse();
 response.getCoyoteResponse();
 response.add

[tomcat] branch 9.0.x updated: Ensure values are not duplicated when manipulating the vary header

2020-12-02 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 a4e061e  Ensure values are not duplicated when manipulating the vary 
header
a4e061e is described below

commit a4e061e8364ac3413082532d84431e6c896a6127
Author: Mark Thomas 
AuthorDate: Wed Dec 2 18:51:26 2020 +

Ensure values are not duplicated when manipulating the vary header
---
 java/org/apache/tomcat/util/http/ResponseUtil.java | 14 +++---
 .../apache/tomcat/util/http/TestResponseUtil.java  | 50 +++---
 webapps/docs/changelog.xml |  4 ++
 3 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/java/org/apache/tomcat/util/http/ResponseUtil.java 
b/java/org/apache/tomcat/util/http/ResponseUtil.java
index 295e7b7..cdc6ceb 100644
--- a/java/org/apache/tomcat/util/http/ResponseUtil.java
+++ b/java/org/apache/tomcat/util/http/ResponseUtil.java
@@ -21,9 +21,9 @@ import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Enumeration;
-import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
 import java.util.List;
-import java.util.Set;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -76,7 +76,7 @@ public class ResponseUtil {
 // the existing values, check if the new value is already present and
 // then add it if not. The good news is field names are tokens which
 // makes parsing simpler.
-Set fieldNames = new HashSet<>();
+LinkedHashSet fieldNames = new LinkedHashSet<>();
 
 for (String varyHeader : varyHeaders) {
 StringReader input = new StringReader(varyHeader);
@@ -97,10 +97,12 @@ public class ResponseUtil {
 // Replace existing header(s) to ensure any invalid values are removed
 fieldNames.add(name);
 StringBuilder varyHeader = new StringBuilder();
-varyHeader.append(name);
-for (String fieldName : fieldNames) {
+Iterator iter = fieldNames.iterator();
+// There must be at least one value as one is added just above
+varyHeader.append(iter.next());
+while (iter.hasNext()) {
 varyHeader.append(',');
-varyHeader.append(fieldName);
+varyHeader.append(iter.next());
 }
 adapter.setHeader(VARY_HEADER, varyHeader.toString());
 }
diff --git a/test/org/apache/tomcat/util/http/TestResponseUtil.java 
b/test/org/apache/tomcat/util/http/TestResponseUtil.java
index 826cac8..4c760e0 100644
--- a/test/org/apache/tomcat/util/http/TestResponseUtil.java
+++ b/test/org/apache/tomcat/util/http/TestResponseUtil.java
@@ -16,8 +16,8 @@
  */
 package org.apache.tomcat.util.http;
 
-import java.util.HashSet;
-import java.util.Set;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -31,7 +31,7 @@ public class TestResponseUtil {
 TesterResponse response = new TesterResponse();
 response.getCoyoteResponse();
 response.addHeader("vary", "host");
-Set expected = new HashSet<>();
+List expected = new ArrayList<>();
 expected.add("*");
 doTestAddVaryFieldName(response, "*", expected);
 }
@@ -42,7 +42,7 @@ public class TestResponseUtil {
 TesterResponse response = new TesterResponse();
 response.getCoyoteResponse();
 response.addHeader("vary", "*");
-Set expected = new HashSet<>();
+List expected = new ArrayList<>();
 expected.add("*");
 doTestAddVaryFieldName(response, "*", expected);
 }
@@ -52,7 +52,7 @@ public class TestResponseUtil {
 public void testAddAllWithNone() {
 TesterResponse response = new TesterResponse();
 response.getCoyoteResponse();
-Set expected = new HashSet<>();
+List expected = new ArrayList<>();
 expected.add("*");
 doTestAddVaryFieldName(response, "*", expected);
 }
@@ -63,9 +63,9 @@ public class TestResponseUtil {
 TesterResponse response = new TesterResponse();
 response.getCoyoteResponse();
 response.addHeader("vary", "foo, bar");
-Set expected = new HashSet<>();
-expected.add("bar");
+List expected = new ArrayList<>();
 expected.add("foo");
+expected.add("bar");
 expected.add("too");
 doTestAddVaryFieldName(response, "too", expected);
 }
@@ -76,7 +76,7 @@ public class TestResponseUtil {
 TesterResponse response = new TesterResponse();
 response.getCoyoteResponse();
 response.add

[tomcat] branch master updated: Ensure values are not duplicated when manipulating the vary header

2020-12-02 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new a9aa71e  Ensure values are not duplicated when manipulating the vary 
header
a9aa71e is described below

commit a9aa71ec61aca7b5e750bde1042c1bbd5d10c7ac
Author: Mark Thomas 
AuthorDate: Wed Dec 2 18:51:26 2020 +

Ensure values are not duplicated when manipulating the vary header
---
 java/org/apache/tomcat/util/http/ResponseUtil.java | 14 +++---
 .../apache/tomcat/util/http/TestResponseUtil.java  | 50 +++---
 webapps/docs/changelog.xml |  4 ++
 3 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/java/org/apache/tomcat/util/http/ResponseUtil.java 
b/java/org/apache/tomcat/util/http/ResponseUtil.java
index c0cee24..a39359e 100644
--- a/java/org/apache/tomcat/util/http/ResponseUtil.java
+++ b/java/org/apache/tomcat/util/http/ResponseUtil.java
@@ -21,9 +21,9 @@ import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Enumeration;
-import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
 import java.util.List;
-import java.util.Set;
 
 import jakarta.servlet.http.HttpServletResponse;
 
@@ -76,7 +76,7 @@ public class ResponseUtil {
 // the existing values, check if the new value is already present and
 // then add it if not. The good news is field names are tokens which
 // makes parsing simpler.
-Set fieldNames = new HashSet<>();
+LinkedHashSet fieldNames = new LinkedHashSet<>();
 
 for (String varyHeader : varyHeaders) {
 StringReader input = new StringReader(varyHeader);
@@ -97,10 +97,12 @@ public class ResponseUtil {
 // Replace existing header(s) to ensure any invalid values are removed
 fieldNames.add(name);
 StringBuilder varyHeader = new StringBuilder();
-varyHeader.append(name);
-for (String fieldName : fieldNames) {
+Iterator iter = fieldNames.iterator();
+// There must be at least one value as one is added just above
+varyHeader.append(iter.next());
+while (iter.hasNext()) {
 varyHeader.append(',');
-varyHeader.append(fieldName);
+varyHeader.append(iter.next());
 }
 adapter.setHeader(VARY_HEADER, varyHeader.toString());
 }
diff --git a/test/org/apache/tomcat/util/http/TestResponseUtil.java 
b/test/org/apache/tomcat/util/http/TestResponseUtil.java
index 826cac8..4c760e0 100644
--- a/test/org/apache/tomcat/util/http/TestResponseUtil.java
+++ b/test/org/apache/tomcat/util/http/TestResponseUtil.java
@@ -16,8 +16,8 @@
  */
 package org.apache.tomcat.util.http;
 
-import java.util.HashSet;
-import java.util.Set;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -31,7 +31,7 @@ public class TestResponseUtil {
 TesterResponse response = new TesterResponse();
 response.getCoyoteResponse();
 response.addHeader("vary", "host");
-Set expected = new HashSet<>();
+List expected = new ArrayList<>();
 expected.add("*");
 doTestAddVaryFieldName(response, "*", expected);
 }
@@ -42,7 +42,7 @@ public class TestResponseUtil {
 TesterResponse response = new TesterResponse();
 response.getCoyoteResponse();
 response.addHeader("vary", "*");
-Set expected = new HashSet<>();
+List expected = new ArrayList<>();
 expected.add("*");
 doTestAddVaryFieldName(response, "*", expected);
 }
@@ -52,7 +52,7 @@ public class TestResponseUtil {
 public void testAddAllWithNone() {
 TesterResponse response = new TesterResponse();
 response.getCoyoteResponse();
-Set expected = new HashSet<>();
+List expected = new ArrayList<>();
 expected.add("*");
 doTestAddVaryFieldName(response, "*", expected);
 }
@@ -63,9 +63,9 @@ public class TestResponseUtil {
 TesterResponse response = new TesterResponse();
 response.getCoyoteResponse();
 response.addHeader("vary", "foo, bar");
-Set expected = new HashSet<>();
-expected.add("bar");
+List expected = new ArrayList<>();
 expected.add("foo");
+expected.add("bar");
 expected.add("too");
 doTestAddVaryFieldName(response, "too", expected);
 }
@@ -76,7 +76,7 @@ public class TestResponseUtil {
 TesterResponse response = new TesterResponse();
 response.getCoyoteResponse();
 re

[tomcat] branch 7.0.x updated: Fix BZ-64951 - Correct potential fd leak when WebSocket connections fail

2020-12-02 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 0f3c0fb  Fix BZ-64951 - Correct potential fd leak when WebSocket 
connections fail
0f3c0fb is described below

commit 0f3c0fbd1c29588463b1c8fddaaea66bd7f0d06c
Author: Mark Thomas 
AuthorDate: Wed Dec 2 17:27:21 2020 +

Fix BZ-64951 - Correct potential fd leak when WebSocket connections fail

https://bz.apache.org/bugzilla/show_bug.cgi?id=64951
Patch provided by Maurizio Adami
# Conflicts:
#   java/org/apache/tomcat/websocket/WsWebSocketContainer.java
---
 .../tomcat/websocket/WsWebSocketContainer.java | 50 +++---
 webapps/docs/changelog.xml |  9 
 2 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/java/org/apache/tomcat/websocket/WsWebSocketContainer.java 
b/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
index a59296c..087cd04 100644
--- a/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
+++ b/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
@@ -342,13 +342,13 @@ public class WsWebSocketContainer
 boolean success = false;
 List extensionsAgreed = new ArrayList();
 Transformation transformation = null;
-
-// Open the connection
-Future fConnect = socketChannel.connect(sa);
 AsyncChannelWrapper channel = null;
 
-if (proxyConnect != null) {
-try {
+try {
+// Open the connection
+Future fConnect = socketChannel.connect(sa);
+
+if (proxyConnect != null) {
 fConnect.get(timeout, TimeUnit.MILLISECONDS);
 // Proxy CONNECT is clear text
 channel = new AsyncChannelWrapperNonSecure(socketChannel);
@@ -359,28 +359,20 @@ public class WsWebSocketContainer
 "wsWebSocketContainer.proxyConnectFail", 
selectedProxy,
 Integer.toString(httpResponse.getStatus(;
 }
-} catch (Exception e) {
-if (channel != null) {
-channel.close();
-}
-throw new DeploymentException(
-
sm.getString("wsWebSocketContainer.httpRequestFailed"), e);
 }
-}
 
-if (secure) {
-// Regardless of whether a non-secure wrapper was created for a
-// proxy CONNECT, need to use TLS from this point on so wrap the
-// original AsynchronousSocketChannel
-SSLEngine sslEngine = createSSLEngine(userProperties, host, port);
-channel = new AsyncChannelWrapperSecure(socketChannel, sslEngine);
-} else if (channel == null) {
-// Only need to wrap as this point if it wasn't wrapped to process 
a
-// proxy CONNECT
-channel = new AsyncChannelWrapperNonSecure(socketChannel);
-}
+if (secure) {
+// Regardless of whether a non-secure wrapper was created for a
+// proxy CONNECT, need to use TLS from this point on so wrap 
the
+// original AsynchronousSocketChannel
+SSLEngine sslEngine = createSSLEngine(userProperties, host, 
port);
+channel = new AsyncChannelWrapperSecure(socketChannel, 
sslEngine);
+} else if (channel == null) {
+// Only need to wrap as this point if it wasn't wrapped to 
process a
+// proxy CONNECT
+channel = new AsyncChannelWrapperNonSecure(socketChannel);
+}
 
-try {
 fConnect.get(timeout, TimeUnit.MILLISECONDS);
 
 Future fHandshake = channel.handshake();
@@ -537,7 +529,15 @@ public class WsWebSocketContainer
 throw new 
DeploymentException(sm.getString("wsWebSocketContainer.httpRequestFailed", 
path), e);
 } finally {
 if (!success) {
-channel.close();
+if (channel != null) {
+channel.close();
+} else {
+try {
+socketChannel.close();
+} catch (IOException ioe) {
+// Ignore
+}
+}
 }
 }
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0dd2bd3..18b6eff 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -129,6 +129,15 @@
   
 
   
+  
+
+  
+64951: Fix a potential file descriptor leak when WebSocket
+connections are attempted and fail. Patch provided by Maurizio Adami.
+(markt)
+  
+
+  
   
 
   


-

[tomcat] branch 8.5.x updated: Fix BZ-64951 - Correct potential fd leak when WebSocket connections fail

2020-12-02 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 a2dbd0a  Fix BZ-64951 - Correct potential fd leak when WebSocket 
connections fail
a2dbd0a is described below

commit a2dbd0a67d42577941d3ac784f85699059563ffd
Author: Mark Thomas 
AuthorDate: Wed Dec 2 17:27:21 2020 +

Fix BZ-64951 - Correct potential fd leak when WebSocket connections fail

https://bz.apache.org/bugzilla/show_bug.cgi?id=64951
Patch provided by Maurizio Adami
---
 .../tomcat/websocket/WsWebSocketContainer.java | 51 +++---
 webapps/docs/changelog.xml |  9 
 2 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/java/org/apache/tomcat/websocket/WsWebSocketContainer.java 
b/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
index b724b75..dcde690 100644
--- a/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
+++ b/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
@@ -304,13 +304,13 @@ public class WsWebSocketContainer implements 
WebSocketContainer, BackgroundProce
 boolean success = false;
 List extensionsAgreed = new ArrayList<>();
 Transformation transformation = null;
-
-// Open the connection
-Future fConnect = socketChannel.connect(sa);
 AsyncChannelWrapper channel = null;
 
-if (proxyConnect != null) {
-try {
+try {
+// Open the connection
+Future fConnect = socketChannel.connect(sa);
+
+if (proxyConnect != null) {
 fConnect.get(timeout, TimeUnit.MILLISECONDS);
 // Proxy CONNECT is clear text
 channel = new AsyncChannelWrapperNonSecure(socketChannel);
@@ -321,29 +321,20 @@ public class WsWebSocketContainer implements 
WebSocketContainer, BackgroundProce
 "wsWebSocketContainer.proxyConnectFail", 
selectedProxy,
 Integer.toString(httpResponse.getStatus(;
 }
-} catch (TimeoutException | InterruptedException | 
ExecutionException |
-EOFException e) {
-if (channel != null) {
-channel.close();
-}
-throw new DeploymentException(
-
sm.getString("wsWebSocketContainer.httpRequestFailed"), e);
 }
-}
 
-if (secure) {
-// Regardless of whether a non-secure wrapper was created for a
-// proxy CONNECT, need to use TLS from this point on so wrap the
-// original AsynchronousSocketChannel
-SSLEngine sslEngine = createSSLEngine(userProperties, host, port);
-channel = new AsyncChannelWrapperSecure(socketChannel, sslEngine);
-} else if (channel == null) {
-// Only need to wrap as this point if it wasn't wrapped to process 
a
-// proxy CONNECT
-channel = new AsyncChannelWrapperNonSecure(socketChannel);
-}
+if (secure) {
+// Regardless of whether a non-secure wrapper was created for a
+// proxy CONNECT, need to use TLS from this point on so wrap 
the
+// original AsynchronousSocketChannel
+SSLEngine sslEngine = createSSLEngine(userProperties, host, 
port);
+channel = new AsyncChannelWrapperSecure(socketChannel, 
sslEngine);
+} else if (channel == null) {
+// Only need to wrap as this point if it wasn't wrapped to 
process a
+// proxy CONNECT
+channel = new AsyncChannelWrapperNonSecure(socketChannel);
+}
 
-try {
 fConnect.get(timeout, TimeUnit.MILLISECONDS);
 
 Future fHandshake = channel.handshake();
@@ -499,7 +490,15 @@ public class WsWebSocketContainer implements 
WebSocketContainer, BackgroundProce
 throw new 
DeploymentException(sm.getString("wsWebSocketContainer.httpRequestFailed", 
path), e);
 } finally {
 if (!success) {
-channel.close();
+if (channel != null) {
+channel.close();
+} else {
+try {
+socketChannel.close();
+} catch (IOException ioe) {
+// Ignore
+}
+}
 }
 }
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e5eb7f6..2bd17f1 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -140,6 +140,15 @@
   
 
   
+  
+
+  
+64951: Fix a potential file descriptor leak when WebSocket
+connections are attempted 

[tomcat] branch 9.0.x updated: Fix BZ-64951 - Correct potential fd leak when WebSocket connections fail

2020-12-02 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 9da6126  Fix BZ-64951 - Correct potential fd leak when WebSocket 
connections fail
9da6126 is described below

commit 9da6126e84099974de3e109e4f0eba68314b24c2
Author: Mark Thomas 
AuthorDate: Wed Dec 2 17:27:21 2020 +

Fix BZ-64951 - Correct potential fd leak when WebSocket connections fail

https://bz.apache.org/bugzilla/show_bug.cgi?id=64951
Patch provided by Maurizio Adami
---
 .../tomcat/websocket/WsWebSocketContainer.java | 51 +++---
 webapps/docs/changelog.xml |  9 
 2 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/java/org/apache/tomcat/websocket/WsWebSocketContainer.java 
b/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
index 0db496f..4bc8f6a 100644
--- a/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
+++ b/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
@@ -304,13 +304,13 @@ public class WsWebSocketContainer implements 
WebSocketContainer, BackgroundProce
 boolean success = false;
 List extensionsAgreed = new ArrayList<>();
 Transformation transformation = null;
-
-// Open the connection
-Future fConnect = socketChannel.connect(sa);
 AsyncChannelWrapper channel = null;
 
-if (proxyConnect != null) {
-try {
+try {
+// Open the connection
+Future fConnect = socketChannel.connect(sa);
+
+if (proxyConnect != null) {
 fConnect.get(timeout, TimeUnit.MILLISECONDS);
 // Proxy CONNECT is clear text
 channel = new AsyncChannelWrapperNonSecure(socketChannel);
@@ -321,29 +321,20 @@ public class WsWebSocketContainer implements 
WebSocketContainer, BackgroundProce
 "wsWebSocketContainer.proxyConnectFail", 
selectedProxy,
 Integer.toString(httpResponse.getStatus(;
 }
-} catch (TimeoutException | InterruptedException | 
ExecutionException |
-EOFException e) {
-if (channel != null) {
-channel.close();
-}
-throw new DeploymentException(
-
sm.getString("wsWebSocketContainer.httpRequestFailed"), e);
 }
-}
 
-if (secure) {
-// Regardless of whether a non-secure wrapper was created for a
-// proxy CONNECT, need to use TLS from this point on so wrap the
-// original AsynchronousSocketChannel
-SSLEngine sslEngine = createSSLEngine(userProperties, host, port);
-channel = new AsyncChannelWrapperSecure(socketChannel, sslEngine);
-} else if (channel == null) {
-// Only need to wrap as this point if it wasn't wrapped to process 
a
-// proxy CONNECT
-channel = new AsyncChannelWrapperNonSecure(socketChannel);
-}
+if (secure) {
+// Regardless of whether a non-secure wrapper was created for a
+// proxy CONNECT, need to use TLS from this point on so wrap 
the
+// original AsynchronousSocketChannel
+SSLEngine sslEngine = createSSLEngine(userProperties, host, 
port);
+channel = new AsyncChannelWrapperSecure(socketChannel, 
sslEngine);
+} else if (channel == null) {
+// Only need to wrap as this point if it wasn't wrapped to 
process a
+// proxy CONNECT
+channel = new AsyncChannelWrapperNonSecure(socketChannel);
+}
 
-try {
 fConnect.get(timeout, TimeUnit.MILLISECONDS);
 
 Future fHandshake = channel.handshake();
@@ -499,7 +490,15 @@ public class WsWebSocketContainer implements 
WebSocketContainer, BackgroundProce
 throw new 
DeploymentException(sm.getString("wsWebSocketContainer.httpRequestFailed", 
path), e);
 } finally {
 if (!success) {
-channel.close();
+if (channel != null) {
+channel.close();
+} else {
+try {
+socketChannel.close();
+} catch (IOException ioe) {
+// Ignore
+}
+}
 }
 }
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4f3821a..0f2d87b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -147,6 +147,15 @@
   
 
   
+  
+
+  
+64951: Fix a potential file descriptor leak when WebSocket
+connections are attempted 

[tomcat] branch master updated: Fix BZ-64951 - Correct potential fd leak when WebSocket connections fail

2020-12-02 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new 01ad27c  Fix BZ-64951 - Correct potential fd leak when WebSocket 
connections fail
01ad27c is described below

commit 01ad27c568594f32ab178983d97e53b8b3b25d25
Author: Mark Thomas 
AuthorDate: Wed Dec 2 17:27:21 2020 +

Fix BZ-64951 - Correct potential fd leak when WebSocket connections fail

https://bz.apache.org/bugzilla/show_bug.cgi?id=64951
Patch provided by Maurizio Adami
---
 .../tomcat/websocket/WsWebSocketContainer.java | 51 +++---
 webapps/docs/changelog.xml |  9 
 2 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/java/org/apache/tomcat/websocket/WsWebSocketContainer.java 
b/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
index 28d0543..e6dc4b3 100644
--- a/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
+++ b/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
@@ -305,13 +305,13 @@ public class WsWebSocketContainer implements 
WebSocketContainer, BackgroundProce
 boolean success = false;
 List extensionsAgreed = new ArrayList<>();
 Transformation transformation = null;
-
-// Open the connection
-Future fConnect = socketChannel.connect(sa);
 AsyncChannelWrapper channel = null;
 
-if (proxyConnect != null) {
-try {
+try {
+// Open the connection
+Future fConnect = socketChannel.connect(sa);
+
+if (proxyConnect != null) {
 fConnect.get(timeout, TimeUnit.MILLISECONDS);
 // Proxy CONNECT is clear text
 channel = new AsyncChannelWrapperNonSecure(socketChannel);
@@ -322,29 +322,20 @@ public class WsWebSocketContainer implements 
WebSocketContainer, BackgroundProce
 "wsWebSocketContainer.proxyConnectFail", 
selectedProxy,
 Integer.toString(httpResponse.getStatus(;
 }
-} catch (TimeoutException | InterruptedException | 
ExecutionException |
-EOFException e) {
-if (channel != null) {
-channel.close();
-}
-throw new DeploymentException(
-
sm.getString("wsWebSocketContainer.httpRequestFailed"), e);
 }
-}
 
-if (secure) {
-// Regardless of whether a non-secure wrapper was created for a
-// proxy CONNECT, need to use TLS from this point on so wrap the
-// original AsynchronousSocketChannel
-SSLEngine sslEngine = createSSLEngine(userProperties, host, port);
-channel = new AsyncChannelWrapperSecure(socketChannel, sslEngine);
-} else if (channel == null) {
-// Only need to wrap as this point if it wasn't wrapped to process 
a
-// proxy CONNECT
-channel = new AsyncChannelWrapperNonSecure(socketChannel);
-}
+if (secure) {
+// Regardless of whether a non-secure wrapper was created for a
+// proxy CONNECT, need to use TLS from this point on so wrap 
the
+// original AsynchronousSocketChannel
+SSLEngine sslEngine = createSSLEngine(userProperties, host, 
port);
+channel = new AsyncChannelWrapperSecure(socketChannel, 
sslEngine);
+} else if (channel == null) {
+// Only need to wrap as this point if it wasn't wrapped to 
process a
+// proxy CONNECT
+channel = new AsyncChannelWrapperNonSecure(socketChannel);
+}
 
-try {
 fConnect.get(timeout, TimeUnit.MILLISECONDS);
 
 Future fHandshake = channel.handshake();
@@ -500,7 +491,15 @@ public class WsWebSocketContainer implements 
WebSocketContainer, BackgroundProce
 throw new 
DeploymentException(sm.getString("wsWebSocketContainer.httpRequestFailed", 
path), e);
 } finally {
 if (!success) {
-channel.close();
+if (channel != null) {
+channel.close();
+} else {
+try {
+socketChannel.close();
+} catch (IOException ioe) {
+// Ignore
+}
+}
 }
 }
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3424058..1e4cf3a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -151,6 +151,15 @@
   
 
   
+  
+
+  
+64951: Fix a potential file descriptor leak when WebSocket
+connections are attempted 

[tomcat] branch master updated: Fix IDE warning

2020-12-02 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new b2714ba  Fix IDE warning
b2714ba is described below

commit b2714bab61358678fdfa16ec364baa808925c17b
Author: Mark Thomas 
AuthorDate: Wed Dec 2 14:21:04 2020 +

Fix IDE warning
---
 java/jakarta/servlet/http/Cookie.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/jakarta/servlet/http/Cookie.java 
b/java/jakarta/servlet/http/Cookie.java
index 1d8e7de..48a621b 100644
--- a/java/jakarta/servlet/http/Cookie.java
+++ b/java/jakarta/servlet/http/Cookie.java
@@ -74,7 +74,7 @@ public class Cookie implements Cloneable, Serializable {
 } else {
 strictServletCompliance = AccessController.doPrivileged(
 (PrivilegedAction) () -> 
Boolean.valueOf(System.getProperty(
-"org.apache.catalina.STRICT_SERVLET_COMPLIANCE")));
+
"org.apache.catalina.STRICT_SERVLET_COMPLIANCE"))).booleanValue();
 propStrictNaming = AccessController.doPrivileged(
 (PrivilegedAction) () -> System.getProperty(
 
"org.apache.tomcat.util.http.ServerCookie.STRICT_NAMING"));


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



[tomcat-jakartaee-migration] branch master updated: One more diff with release:prepare

2020-12-01 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git


The following commit(s) were added to refs/heads/master by this push:
 new 780a940  One more diff with release:prepare
780a940 is described below

commit 780a9405bf976b0337e795a10c31372ed5832cc9
Author: Mark Thomas 
AuthorDate: Tue Dec 1 16:56:25 2020 +

One more diff with release:prepare
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a74206d..9ac2429 100644
--- a/pom.xml
+++ b/pom.xml
@@ -162,7 +162,7 @@
   
   
 
-
+
   
 
   


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



[tomcat-jakartaee-migration] branch master updated: Minimise diff with release:prepare

2020-12-01 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git


The following commit(s) were added to refs/heads/master by this push:
 new 8a7568c  Minimise diff with release:prepare
8a7568c is described below

commit 8a7568c427c4aa4dda1dfe788fd1b7546b38d424
Author: Mark Thomas 
AuthorDate: Tue Dec 1 16:54:17 2020 +

Minimise diff with release:prepare
---
 pom.xml | 21 ++---
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 15dea66..a74206d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,8 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
   4.0.0
  
   
@@ -115,7 +114,7 @@
   cobertura-maven-plugin
   2.7
   
-
+
 
   html
   xml
@@ -138,10 +137,10 @@
 
 
   
-
+
 
   
-
+
   
 
 
@@ -154,16 +153,16 @@
 -->
 
   
-
-
+
+
   
   
-
-
+
+
   
   
-
-
+
+
   
 
   


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



[tomcat-jakartaee-migration] branch master updated: Add scm definition

2020-12-01 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git


The following commit(s) were added to refs/heads/master by this push:
 new fda85c2  Add scm definition
fda85c2 is described below

commit fda85c25ecc3326f24e3566411a7d96e4602fa3d
Author: Mark Thomas 
AuthorDate: Tue Dec 1 16:49:43 2020 +

Add scm definition
---
 pom.xml | 20 ++--
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7cf9554..15dea66 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,6 +63,8 @@
   
 8
 8
+
+src
   
 
   
@@ -92,6 +94,12 @@
 
   
 
+  
+
scm:git:https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git
+
scm:git:https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git
+
https://gitbox.apache.org/repos/asf?p=tomcat-jakartaee-migration.git
+  
+
   
 
   
@@ -212,12 +220,6 @@
  -->
 maven-assembly-plugin
 3.2.0
-
-  
-src/assembly/bin.xml
-src/assembly/src.xml
-  
-
 
   
 make-assembly
@@ -225,6 +227,12 @@
 
   single
 
+
+  
+src/assembly/bin.xml
+src/assembly/src.xml
+  
+
   
 
   


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



[tomcat-jakartaee-migration] branch master updated: Increment version to 0.1.0-SNAPSHOT in preparation for a 0.1 release

2020-12-01 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git


The following commit(s) were added to refs/heads/master by this push:
 new fd0a785  Increment version to 0.1.0-SNAPSHOT in preparation for a 0.1 
release
fd0a785 is described below

commit fd0a7858779fcdfc942457082bfd293b34c5c4a5
Author: Mark Thomas 
AuthorDate: Tue Dec 1 16:30:39 2020 +

Increment version to 0.1.0-SNAPSHOT in preparation for a 0.1 release
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7845271..7cf9554 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 
   org.apache.tomcat
   jakartaee-migration
-  0.0.2
+  0.1.0-SNAPSHOT
  
   
 This tool is a work in progress.


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



[tomcat-jakartaee-migration] branch master updated: Update JUnit

2020-12-01 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git


The following commit(s) were added to refs/heads/master by this push:
 new 9a3e8a7  Update JUnit
9a3e8a7 is described below

commit 9a3e8a76fdcb2d459d335e151446cf71df13
Author: Mark Thomas 
AuthorDate: Tue Dec 1 16:21:44 2020 +

Update JUnit
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5a177e5..7845271 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,7 +87,7 @@
 
   junit
   junit
-  4.13
+  4.13.1
   test
 
   


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



[tomcat-jakartaee-migration] 02/04: Add src distro. Generate bin and src distro when building.

2020-12-01 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git

commit fd3284f2b7bc303174aed40556cf72acbfe16318
Author: Mark Thomas 
AuthorDate: Tue Dec 1 16:07:56 2020 +

Add src distro. Generate bin and src distro when building.
---
 pom.xml  | 10 ++
 src/assembly/src.xml | 39 +++
 2 files changed, 49 insertions(+)

diff --git a/pom.xml b/pom.xml
index 70f6096..6109b28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -189,8 +189,18 @@
 
   
 src/assembly/bin.xml
+src/assembly/src.xml
   
 
+
+  
+make-assembly
+package
+
+  single
+
+  
+
   
   
 maven-shade-plugin
diff --git a/src/assembly/src.xml b/src/assembly/src.xml
new file mode 100644
index 000..2c66d86
--- /dev/null
+++ b/src/assembly/src.xml
@@ -0,0 +1,39 @@
+
+http://maven.apache.org/ASSEMBLY/2.0.0;
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 
http://maven.apache.org/xsd/assembly-2.0.0.xsd;>
+  src
+  
+tar.gz
+zip
+  
+  
+
+  
+LICENSE*
+NOTICE*
+pom.xml
+README*
+mvnw*
+  
+
+
+  src
+
+  
+


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



[tomcat-jakartaee-migration] 01/04: Add ALv2 header and schema. Simplify.

2020-12-01 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git

commit c4dc0cad8da462321f321f189be6cac47ef6217f
Author: Mark Thomas 
AuthorDate: Tue Dec 1 16:07:33 2020 +

Add ALv2 header and schema. Simplify.
---
 src/assembly/bin.xml | 18 --
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/assembly/bin.xml b/src/assembly/bin.xml
index 9ce5462..b59c192 100644
--- a/src/assembly/bin.xml
+++ b/src/assembly/bin.xml
@@ -1,3 +1,19 @@
+
 http://maven.apache.org/ASSEMBLY/2.0.0;
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
   xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 
http://maven.apache.org/xsd/assembly-2.0.0.xsd;>
@@ -8,8 +24,6 @@
   
   
 
-  ${project.basedir}
-  
   
 README*
 LICENSE*


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



[tomcat-jakartaee-migration] 04/04: Add Javadoc jar

2020-12-01 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git

commit 621db72875777b2575f765a0a1b16b8e6b5c0c22
Author: Mark Thomas 
AuthorDate: Tue Dec 1 16:18:45 2020 +

Add Javadoc jar
---
 pom.xml | 12 
 1 file changed, 12 insertions(+)

diff --git a/pom.xml b/pom.xml
index aae118e..5a177e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -195,6 +195,18 @@
 
   
   
+org.apache.maven.plugins
+maven-javadoc-plugin
+
+  
+attach-javadocs
+
+  jar
+
+  
+
+  
+  
 


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



[tomcat-jakartaee-migration] 03/04: Add generation of a sources JAR.

2020-12-01 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git

commit 5dadb63961504044c2e029857f79e04cadf0c6bc
Author: Mark Thomas 
AuthorDate: Tue Dec 1 16:10:44 2020 +

Add generation of a sources JAR.
---
 pom.xml | 14 ++
 1 file changed, 14 insertions(+)

diff --git a/pom.xml b/pom.xml
index 6109b28..aae118e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -181,6 +181,20 @@
 
   
   
+org.apache.maven.plugins
+maven-source-plugin
+3.2.0
+
+  
+attach-sources
+verify
+
+  jar-no-fork
+
+  
+
+  
+  
 


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



[tomcat-jakartaee-migration] branch master updated (c52b23c -> 621db72)

2020-12-01 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch master
in repository 
https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git.


from c52b23c  Update BCEL to 6.5.0
 new c4dc0ca  Add ALv2 header and schema. Simplify.
 new fd3284f  Add src distro. Generate bin and src distro when building.
 new 5dadb63  Add generation of a sources JAR.
 new 621db72  Add Javadoc jar

The 4 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:
 pom.xml  | 36 
 src/assembly/bin.xml | 18 --
 src/assembly/src.xml | 39 +++
 3 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 src/assembly/src.xml


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



[tomcat-jakartaee-migration] branch master updated: Update BCEL to 6.5.0

2020-12-01 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git


The following commit(s) were added to refs/heads/master by this push:
 new c52b23c  Update BCEL to 6.5.0
c52b23c is described below

commit c52b23c49f97173ea78e8bcbaab85d7eb5eefe94
Author: Mark Thomas 
AuthorDate: Tue Dec 1 14:54:02 2020 +

Update BCEL to 6.5.0
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 804ba7d..70f6096 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,7 @@
 
   org.apache.bcel
   bcel
-  6.4.1
+  6.5.0
 
 
   commons-io


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



[tomcat] branch master updated: First pass at deprecation in org.apache.tomcat.jni

2020-12-01 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new 9406b85  First pass at deprecation in org.apache.tomcat.jni
9406b85 is described below

commit 9406b8501abd6caf507f10aecbcdcc2fca110f81
Author: Mark Thomas 
AuthorDate: Tue Dec 1 12:56:46 2020 +

First pass at deprecation in org.apache.tomcat.jni

The intention is to deprecate everything that is not used by the
NIO/NIO2 OpenSSL support. There may still be individual methods within
the remaining classes that are not used.
---
 java/org/apache/tomcat/jni/Address.java|  5 +++
 java/org/apache/tomcat/jni/Directory.java  |  5 +++
 java/org/apache/tomcat/jni/File.java   |  5 +++
 java/org/apache/tomcat/jni/FileInfo.java   |  5 +++
 java/org/apache/tomcat/jni/Global.java |  5 +++
 java/org/apache/tomcat/jni/Local.java  |  5 +++
 java/org/apache/tomcat/jni/Lock.java   |  5 +++
 java/org/apache/tomcat/jni/Mmap.java   |  5 +++
 java/org/apache/tomcat/jni/Multicast.java  |  5 +++
 java/org/apache/tomcat/jni/OS.java |  5 +++
 java/org/apache/tomcat/jni/Poll.java   |  5 +++
 java/org/apache/tomcat/jni/PoolCallback.java   |  5 +++
 java/org/apache/tomcat/jni/Proc.java   |  5 +++
 java/org/apache/tomcat/jni/ProcErrorCallback.java  |  5 +++
 java/org/apache/tomcat/jni/Procattr.java   |  5 +++
 java/org/apache/tomcat/jni/Registry.java   |  5 +++
 java/org/apache/tomcat/jni/SSLSocket.java  |  5 +++
 java/org/apache/tomcat/jni/Shm.java|  5 +++
 java/org/apache/tomcat/jni/Sockaddr.java   |  5 +++
 java/org/apache/tomcat/jni/Socket.java |  5 +++
 java/org/apache/tomcat/jni/Status.java |  5 +++
 java/org/apache/tomcat/jni/Stdlib.java |  5 +++
 java/org/apache/tomcat/jni/Thread.java |  5 +++
 java/org/apache/tomcat/jni/Time.java   |  5 +++
 java/org/apache/tomcat/jni/User.java   |  5 +++
 test/org/apache/tomcat/jni/TestFile.java   |  7 +++-
 test/org/apache/tomcat/jni/TestSocketServer.java   |  5 +++
 .../jni/TestSocketServerAnyLocalAddress.java   |  5 +++
 .../apache/tomcat/util/net/TestXxxEndpoint.java| 45 ++
 29 files changed, 169 insertions(+), 18 deletions(-)

diff --git a/java/org/apache/tomcat/jni/Address.java 
b/java/org/apache/tomcat/jni/Address.java
index 2310367..cabaabc 100644
--- a/java/org/apache/tomcat/jni/Address.java
+++ b/java/org/apache/tomcat/jni/Address.java
@@ -19,7 +19,12 @@ package org.apache.tomcat.jni;
 /** Address
  *
  * @author Mladen Turk
+ *
+ * @deprecated  The scope of the APR/Native Library will be reduced in Tomcat
+ *  10.1.x onwards to only those components required to provide
+ *  OpenSSL integration with the NIO and NIO2 connectors.
  */
+@Deprecated
 public class Address {
 
 public static final String APR_ANYADDR = "0.0.0.0";
diff --git a/java/org/apache/tomcat/jni/Directory.java 
b/java/org/apache/tomcat/jni/Directory.java
index 8a94972..8eb6087 100644
--- a/java/org/apache/tomcat/jni/Directory.java
+++ b/java/org/apache/tomcat/jni/Directory.java
@@ -20,7 +20,12 @@ package org.apache.tomcat.jni;
 /** Directory
  *
  * @author Mladen Turk
+ *
+ * @deprecated  The scope of the APR/Native Library will be reduced in Tomcat
+ *  10.1.x onwards to only those components required to provide
+ *  OpenSSL integration with the NIO and NIO2 connectors.
  */
+@Deprecated
 public class Directory {
 
 /**
diff --git a/java/org/apache/tomcat/jni/File.java 
b/java/org/apache/tomcat/jni/File.java
index 4ae5523..9128b62 100644
--- a/java/org/apache/tomcat/jni/File.java
+++ b/java/org/apache/tomcat/jni/File.java
@@ -22,7 +22,12 @@ import java.nio.ByteBuffer;
 /** File
  *
  * @author Mladen Turk
+ *
+ * @deprecated  The scope of the APR/Native Library will be reduced in Tomcat
+ *  10.1.x onwards to only those components required to provide
+ *  OpenSSL integration with the NIO and NIO2 connectors.
  */
+@Deprecated
 public class File {
 
 /** Open the file for reading */
diff --git a/java/org/apache/tomcat/jni/FileInfo.java 
b/java/org/apache/tomcat/jni/FileInfo.java
index 9fb6bd3..9eeba1a 100644
--- a/java/org/apache/tomcat/jni/FileInfo.java
+++ b/java/org/apache/tomcat/jni/FileInfo.java
@@ -20,7 +20,12 @@ package org.apache.tomcat.jni;
 /** Fileinfo
  *
  * @author Mladen Turk
+ *
+ * @deprecated  The scope of the APR/Native Library will be reduced in Tomcat
+ *  10.1.x onwards to only those components required to provide
+ *  OpenSSL integration with the NIO and NIO2 connectors.
  */
+@Deprecated
 public clas

[tomcat] branch master updated: Deprecate the APR/Native AJP and HTTP connectors

2020-12-01 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new 72323cb  Deprecate the APR/Native AJP and HTTP connectors
72323cb is described below

commit 72323cb76307698b66b0253a34bfbb4a9ea034fe
Author: Mark Thomas 
AuthorDate: Tue Dec 1 10:27:16 2020 +

Deprecate the APR/Native AJP and HTTP connectors

Removal is planned for 10.1.x
---
 conf/server.xml| 23 ++
 java/org/apache/coyote/ajp/AjpAprProtocol.java |  4 
 .../apache/coyote/http11/Http11AprProtocol.java|  4 
 java/org/apache/tomcat/util/net/AprEndpoint.java   |  4 
 java/org/apache/tomcat/util/net/AprSSLSupport.java |  4 
 webapps/docs/aio.xml   |  5 ++---
 webapps/docs/apr.xml   |  3 +++
 webapps/docs/changelog.xml |  4 
 webapps/docs/config/ajp.xml| 10 --
 webapps/docs/config/http.xml   | 10 --
 webapps/docs/index.xml |  3 +--
 webapps/docs/ssl-howto.xml | 12 +--
 12 files changed, 50 insertions(+), 36 deletions(-)

diff --git a/conf/server.xml b/conf/server.xml
index 91bd415..dd4a73b 100644
--- a/conf/server.xml
+++ b/conf/server.xml
@@ -61,9 +61,8 @@
 
 
 
 
 -->
-
-
 
 
 
 ]]>


-
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 BZ 56890 - Clarification of ServletContext.getRealPath(String)

2020-11-30 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 a3ec494  Fix BZ 56890 - Clarification of 
ServletContext.getRealPath(String)
a3ec494 is described below

commit a3ec49490a0b8c6cdee38f66eeca7041d9f57180
Author: Mark Thomas 
AuthorDate: Mon Nov 30 13:35:59 2020 +

Fix BZ 56890 - Clarification of ServletContext.getRealPath(String)

https://bz.apache.org/bugzilla/show_bug.cgi?id=56890
If the provided path doesn't start with "/", process the method call as
if "/" was appended to the beginning of the provided path.
---
 java/org/apache/catalina/core/ApplicationContext.java | 16 ++--
 webapps/docs/changelog.xml|  8 
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/catalina/core/ApplicationContext.java 
b/java/org/apache/catalina/core/ApplicationContext.java
index d109c5a..4511e87 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -526,7 +526,7 @@ public class ApplicationContext implements ServletContext {
 @Override
 public URL getResource(String path) throws MalformedURLException {
 
-String validatedPath = validateResourcePath(path, false);
+String validatedPath = validateResourcePath(path, 
!GET_RESOURCE_REQUIRE_SLASH);
 
 if (validatedPath == null) {
 throw new MalformedURLException(
@@ -545,7 +545,7 @@ public class ApplicationContext implements ServletContext {
 @Override
 public InputStream getResourceAsStream(String path) {
 
-String validatedPath = validateResourcePath(path, false);
+String validatedPath = validateResourcePath(path, 
!GET_RESOURCE_REQUIRE_SLASH);
 
 if (validatedPath == null) {
 return null;
@@ -564,20 +564,16 @@ public class ApplicationContext implements ServletContext 
{
  * Returns null if the input path is not valid or a path that will be
  * acceptable to resources.getResource().
  */
-private String validateResourcePath(String path, boolean allowEmptyPath) {
+private String validateResourcePath(String path, boolean 
addMissingInitialSlash) {
 if (path == null) {
 return null;
 }
 
-if (path.length() == 0 && allowEmptyPath) {
-return path;
-}
-
 if (!path.startsWith("/")) {
-if (GET_RESOURCE_REQUIRE_SLASH) {
-return null;
-} else {
+if (addMissingInitialSlash) {
 return "/" + path;
+} else {
+return null;
 }
 }
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5915cea..92bd352 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -113,6 +113,14 @@
     than always returning a value for the proxy. (markt)
   
   
+56890: Align the behaviour of
+ServletContext.getRealPath(String path) with the recent
+clarification from the Servlet specification project. If the path
+parameter does not start with / then Tomcat processes the
+call as if / is appended to the beginning of the
+provided path. (markt)
+  
+  
 64921: Ensure that the 
LoadBalancerDrainingValve
 uses the correct setting for the secure attribute for any session
 cookies it creates. Based on a pull request by Andreas Kurth. (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: Fix BZ 56890 - Clarification of ServletContext.getRealPath(String)

2020-11-30 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 a48767b  Fix BZ 56890 - Clarification of 
ServletContext.getRealPath(String)
a48767b is described below

commit a48767b4e8c513b819fb5fa13505c15922969813
Author: Mark Thomas 
AuthorDate: Mon Nov 30 13:35:59 2020 +

Fix BZ 56890 - Clarification of ServletContext.getRealPath(String)

https://bz.apache.org/bugzilla/show_bug.cgi?id=56890
If the provided path doesn't start with "/", process the method call as
if "/" was appended to the beginning of the provided path.
---
 java/org/apache/catalina/core/ApplicationContext.java | 16 ++--
 webapps/docs/changelog.xml|  8 
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/catalina/core/ApplicationContext.java 
b/java/org/apache/catalina/core/ApplicationContext.java
index 2bc9a48..697b956 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -526,7 +526,7 @@ public class ApplicationContext implements ServletContext {
 @Override
 public URL getResource(String path) throws MalformedURLException {
 
-String validatedPath = validateResourcePath(path, false);
+String validatedPath = validateResourcePath(path, 
!GET_RESOURCE_REQUIRE_SLASH);
 
 if (validatedPath == null) {
 throw new MalformedURLException(
@@ -545,7 +545,7 @@ public class ApplicationContext implements ServletContext {
 @Override
 public InputStream getResourceAsStream(String path) {
 
-String validatedPath = validateResourcePath(path, false);
+String validatedPath = validateResourcePath(path, 
!GET_RESOURCE_REQUIRE_SLASH);
 
 if (validatedPath == null) {
 return null;
@@ -564,20 +564,16 @@ public class ApplicationContext implements ServletContext 
{
  * Returns null if the input path is not valid or a path that will be
  * acceptable to resources.getResource().
  */
-private String validateResourcePath(String path, boolean allowEmptyPath) {
+private String validateResourcePath(String path, boolean 
addMissingInitialSlash) {
 if (path == null) {
 return null;
 }
 
-if (path.length() == 0 && allowEmptyPath) {
-return path;
-}
-
 if (!path.startsWith("/")) {
-if (GET_RESOURCE_REQUIRE_SLASH) {
-return null;
-} else {
+if (addMissingInitialSlash) {
 return "/" + path;
+} else {
+return null;
 }
 }
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8991250..f95de76 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -112,6 +112,14 @@
 the return value of ServletRequest.getRemoteAddr() rather
     than always returning a value for the proxy. (markt)
   
+  
+56890: Align the behaviour of
+ServletContext.getRealPath(String path) with the recent
+clarification from the Servlet specification project. If the path
+parameter does not start with / then Tomcat processes the
+call as if / is appended to the beginning of the
+provided path. (markt)
+  
   
 64080: Enhance the graceful shutdown feature. Includes a new
 option for StandardService,


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



[tomcat] branch master updated (5da6295 -> 37f8bf5)

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

markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from 5da6295  Fix BZ 94944 - correct bytesSent when compression is enabled
 add 37f8bf5  Fix BZ 56890 - Clarification of 
ServletContext.getRealPath(String)

No new revisions were added by this update.

Summary of changes:
 java/org/apache/catalina/core/ApplicationContext.java | 16 ++--
 webapps/docs/changelog.xml|  8 
 2 files changed, 14 insertions(+), 10 deletions(-)


-
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 BZ 94944 - correct bytesSent when compression is enabled

2020-11-30 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 187c371  Fix BZ 94944 - correct bytesSent when compression is enabled
187c371 is described below

commit 187c3713b8b59abf7a4944a57ac55b0bacef2097
Author: Mark Thomas 
AuthorDate: Mon Nov 30 13:08:21 2020 +

Fix BZ 94944 - correct bytesSent when compression is enabled
---
 java/org/apache/coyote/http11/filters/GzipOutputFilter.java | 1 +
 webapps/docs/changelog.xml  | 8 
 2 files changed, 9 insertions(+)

diff --git a/java/org/apache/coyote/http11/filters/GzipOutputFilter.java 
b/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
index 2f34d15..e691795 100644
--- a/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
+++ b/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
@@ -84,6 +84,7 @@ public class GzipOutputFilter implements OutputFilter {
 int len = chunk.remaining();
 if (chunk.hasArray()) {
 compressionStream.write(chunk.array(), chunk.arrayOffset() + 
chunk.position(), len);
+chunk.position(chunk.position() + len);
 } else {
 byte[] bytes = new byte[len];
 chunk.put(bytes);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0ecf177..5915cea 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -119,6 +119,14 @@
   
 
   
+  
+
+  
+64944: Ensure that the bytesSent metric is correctly updated
+when compression is enabled. (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: Fix BZ 94944 - correct bytesSent when compression is enabled

2020-11-30 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 2995fa7  Fix BZ 94944 - correct bytesSent when compression is enabled
2995fa7 is described below

commit 2995fa7d6485e5fe6a654c8d0e1e68d4e2f71b3b
Author: Mark Thomas 
AuthorDate: Mon Nov 30 13:08:21 2020 +

Fix BZ 94944 - correct bytesSent when compression is enabled
---
 java/org/apache/coyote/http11/filters/GzipOutputFilter.java | 1 +
 webapps/docs/changelog.xml  | 8 
 2 files changed, 9 insertions(+)

diff --git a/java/org/apache/coyote/http11/filters/GzipOutputFilter.java 
b/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
index 18d18a3..9ef4afa 100644
--- a/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
+++ b/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
@@ -67,6 +67,7 @@ public class GzipOutputFilter implements OutputFilter {
 int len = chunk.remaining();
 if (chunk.hasArray()) {
 compressionStream.write(chunk.array(), chunk.arrayOffset() + 
chunk.position(), len);
+chunk.position(chunk.position() + len);
 } else {
 byte[] bytes = new byte[len];
 chunk.put(bytes);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 746ee3e..8991250 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -126,6 +126,14 @@
   
 
   
+  
+
+  
+64944: Ensure that the bytesSent metric is correctly updated
+when compression is enabled. (markt)
+  
+
+  
   
 
   


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



[tomcat] branch master updated: Fix BZ 94944 - correct bytesSent when compression is enabled

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 5da6295  Fix BZ 94944 - correct bytesSent when compression is enabled
5da6295 is described below

commit 5da629578186c1d233c943c31dab02b293d25350
Author: Mark Thomas 
AuthorDate: Mon Nov 30 13:08:21 2020 +

Fix BZ 94944 - correct bytesSent when compression is enabled
---
 java/org/apache/coyote/http11/filters/GzipOutputFilter.java | 1 +
 webapps/docs/changelog.xml  | 8 
 2 files changed, 9 insertions(+)

diff --git a/java/org/apache/coyote/http11/filters/GzipOutputFilter.java 
b/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
index 18d18a3..9ef4afa 100644
--- a/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
+++ b/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
@@ -67,6 +67,7 @@ public class GzipOutputFilter implements OutputFilter {
 int len = chunk.remaining();
 if (chunk.hasArray()) {
 compressionStream.write(chunk.array(), chunk.arrayOffset() + 
chunk.position(), len);
+chunk.position(chunk.position() + len);
 } else {
 byte[] bytes = new byte[len];
 chunk.put(bytes);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d675f2c..8eb4895 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -126,6 +126,14 @@
   
 
   
+  
+
+  
+64944: Ensure that the bytesSent metric is correctly updated
+when compression is enabled. (markt)
+  
+
+  
   
 
   


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



[tomcat] branch 7.0.x updated: Fix test broken by BZ 56181

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

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 26492bc  Fix test broken by BZ 56181
26492bc is described below

commit 26492bc1dedbf6a4bd1b1b58863d55935baa5b40
Author: Mark Thomas 
AuthorDate: Thu Nov 26 21:10:54 2020 +

Fix test broken by BZ 56181
---
 test/org/apache/catalina/valves/TestRemoteIpValve.java | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/test/org/apache/catalina/valves/TestRemoteIpValve.java 
b/test/org/apache/catalina/valves/TestRemoteIpValve.java
index 557396c..4026139 100644
--- a/test/org/apache/catalina/valves/TestRemoteIpValve.java
+++ b/test/org/apache/catalina/valves/TestRemoteIpValve.java
@@ -28,6 +28,7 @@ import org.junit.Test;
 
 import org.apache.catalina.AccessLog;
 import org.apache.catalina.Globals;
+import org.apache.catalina.connector.Connector;
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
 
@@ -92,6 +93,11 @@ public class TestRemoteIpValve {
 }
 
 public static class MockRequest extends Request {
+
+public MockRequest() {
+setConnector(new Connector());
+}
+
 @Override
 public void setAttribute(String name, Object value) {
 getCoyoteRequest().getAttributes().put(name, value);


-
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 test broken by BZ 56181

2020-11-26 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 c44121b  Fix test broken by BZ 56181
c44121b is described below

commit c44121bb981bf2d75458549b24526a6a9e35969e
Author: Mark Thomas 
AuthorDate: Thu Nov 26 21:10:54 2020 +

Fix test broken by BZ 56181
---
 test/org/apache/catalina/valves/TestRemoteIpValve.java | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/test/org/apache/catalina/valves/TestRemoteIpValve.java 
b/test/org/apache/catalina/valves/TestRemoteIpValve.java
index c1240ad..ae5783c 100644
--- a/test/org/apache/catalina/valves/TestRemoteIpValve.java
+++ b/test/org/apache/catalina/valves/TestRemoteIpValve.java
@@ -28,6 +28,7 @@ import org.junit.Test;
 
 import org.apache.catalina.AccessLog;
 import org.apache.catalina.Globals;
+import org.apache.catalina.connector.Connector;
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
 
@@ -92,6 +93,11 @@ public class TestRemoteIpValve {
 }
 
 public static class MockRequest extends Request {
+
+public MockRequest() {
+setConnector(new Connector());
+}
+
 @Override
 public void setAttribute(String name, Object value) {
 getCoyoteRequest().getAttributes().put(name, value);


-
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 test broken by BZ 56181

2020-11-26 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 2232ca8  Fix test broken by BZ 56181
2232ca8 is described below

commit 2232ca8569174d1a3f0d850d3e66be7d388b2f2a
Author: Mark Thomas 
AuthorDate: Thu Nov 26 21:10:54 2020 +

Fix test broken by BZ 56181
---
 test/org/apache/catalina/valves/TestRemoteIpValve.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/org/apache/catalina/valves/TestRemoteIpValve.java 
b/test/org/apache/catalina/valves/TestRemoteIpValve.java
index a792552..1c7b24a 100644
--- a/test/org/apache/catalina/valves/TestRemoteIpValve.java
+++ b/test/org/apache/catalina/valves/TestRemoteIpValve.java
@@ -28,6 +28,7 @@ import org.junit.Test;
 
 import org.apache.catalina.AccessLog;
 import org.apache.catalina.Globals;
+import org.apache.catalina.connector.Connector;
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
 
@@ -94,7 +95,7 @@ public class TestRemoteIpValve {
 public static class MockRequest extends Request {
 
 public MockRequest() {
-super(null);
+super(new Connector());
 }
 
 @Override


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



[tomcat] branch master updated: Fix test broken by BZ 56181

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

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


The following commit(s) were added to refs/heads/master by this push:
 new abab1a4  Fix test broken by BZ 56181
abab1a4 is described below

commit abab1a48e0d4bab8a1508a88aa09cf72d2e20e7d
Author: Mark Thomas 
AuthorDate: Thu Nov 26 21:10:54 2020 +

Fix test broken by BZ 56181
---
 test/org/apache/catalina/valves/TestRemoteIpValve.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/org/apache/catalina/valves/TestRemoteIpValve.java 
b/test/org/apache/catalina/valves/TestRemoteIpValve.java
index 286a18c..e95b30b 100644
--- a/test/org/apache/catalina/valves/TestRemoteIpValve.java
+++ b/test/org/apache/catalina/valves/TestRemoteIpValve.java
@@ -28,6 +28,7 @@ import org.junit.Test;
 
 import org.apache.catalina.AccessLog;
 import org.apache.catalina.Globals;
+import org.apache.catalina.connector.Connector;
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
 
@@ -94,7 +95,7 @@ public class TestRemoteIpValve {
 public static class MockRequest extends Request {
 
 public MockRequest() {
-super(null);
+super(new Connector());
 }
 
 @Override


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



[tomcat] branch 7.0.x updated: Fix BZ 56181 - return correct remoteHost with RemoteIP[Valve|Filter]

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

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 2e832af  Fix BZ 56181 - return correct remoteHost with 
RemoteIP[Valve|Filter]
2e832af is described below

commit 2e832afd3ba43f7f09d6a58e0d583e140c94b617
Author: Mark Thomas 
AuthorDate: Thu Nov 26 18:57:25 2020 +

Fix BZ 56181 - return correct remoteHost with RemoteIP[Valve|Filter]

https://bz.apache.org/bugzilla/show_bug.cgi?id=56181
---
 .../catalina/filters/LocalStrings.properties   |  1 +
 .../apache/catalina/filters/RemoteIpFilter.java| 42 +-
 .../apache/catalina/valves/LocalStrings.properties |  2 +-
 .../catalina/valves/LocalStrings_es.properties |  1 -
 java/org/apache/catalina/valves/RemoteIpValve.java | 19 +-
 webapps/docs/changelog.xml | 10 ++
 webapps/docs/config/filter.xml |  6 
 7 files changed, 77 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/filters/LocalStrings.properties 
b/java/org/apache/catalina/filters/LocalStrings.properties
index 2e9f564..5877b76 100644
--- a/java/org/apache/catalina/filters/LocalStrings.properties
+++ b/java/org/apache/catalina/filters/LocalStrings.properties
@@ -58,6 +58,7 @@ remoteCidrFilter.noRemoteIp=Client does not have an IP 
address. Request denied.
 remoteIpFilter.invalidHostHeader=Invalid value [{0}] found for Host in HTTP 
header [{1}]
 remoteIpFilter.invalidHostWithPort=Host value [{0}] in HTTP header [{1}] 
included a port number which will be ignored
 remoteIpFilter.invalidNumber=Illegal number for parameter [{0}]: [{1}]
+remoteIpFilter.invalidRemoteAddress=Unable to determine the remote host 
because the reported remote address [{0}] is not valid
 
 requestFilter.deny=Denied request for [{0}] based on property [{1}]
 
diff --git a/java/org/apache/catalina/filters/RemoteIpFilter.java 
b/java/org/apache/catalina/filters/RemoteIpFilter.java
index 188176d..ed04087 100644
--- a/java/org/apache/catalina/filters/RemoteIpFilter.java
+++ b/java/org/apache/catalina/filters/RemoteIpFilter.java
@@ -17,6 +17,8 @@
 package org.apache.catalina.filters;
 
 import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -160,6 +162,13 @@ import org.apache.tomcat.util.res.StringManager;
  * integer
  * 443
  * 
+ * 
+ * enableLookups
+ * Should a DNS lookup be performed to provide a host name when calling 
{@link ServletRequest#getRemoteHost()}
+ * N/A
+ * boolean
+ * false
+ * 
  * 
  * 
  * Regular expression vs. IP address blocks: 
mod_remoteip allows to use address blocks (e.g.
@@ -676,6 +685,8 @@ public class RemoteIpFilter implements Filter {
 
 protected static final String TRUSTED_PROXIES_PARAMETER = "trustedProxies";
 
+protected static final String ENABLE_LOOKUPS_PARAMETER = "enableLookups";
+
 /**
  * Convert a given comma delimited list of regular expressions into an 
array of String
  *
@@ -765,6 +776,8 @@ public class RemoteIpFilter implements Filter {
  */
 private Pattern trustedProxies = null;
 
+private boolean enableLookups;
+
 @Override
 public void destroy() {
 // NOOP
@@ -820,7 +833,22 @@ public class RemoteIpFilter implements Filter {
 if (remoteIp != null) {
 
 xRequest.setRemoteAddr(remoteIp);
-xRequest.setRemoteHost(remoteIp);
+if (getEnableLookups()) {
+// This isn't a lazy lookup but that would be a little more
+// invasive - mainly in XForwardedRequest - and if
+// enableLookups is true is seems reasonable that the
+// hostname will be required so look it up here.
+try {
+InetAddress inetAddress = 
InetAddress.getByName(remoteIp);
+// We know we need a DNS look up so use 
getCanonicalHostName()
+
xRequest.setRemoteHost(inetAddress.getCanonicalHostName());
+} catch (UnknownHostException e) {
+
log.debug(sm.getString("remoteIpFilter.invalidRemoteAddress", remoteIp), e);
+xRequest.setRemoteHost(remoteIp);
+}
+} else {
+xRequest.setRemoteHost(remoteIp);
+}
 
 if (proxiesHeaderValue.size() == 0) {
 xRequest.removeHeader(proxiesHeader);
@@ -1010,6 +1038,10 @@ public class RemoteIpFilter implements Filter {
 return trustedProxies;
 }
 
+public boolean getEnableLookups() {
+return enableLookups;
+}
+
 @Override
 public void init(Fil

[tomcat] branch 8.5.x updated: Fix BZ 56181 - return correct remoteHost with RemoteIP[Valve|Filter]

2020-11-26 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 f5500fd  Fix BZ 56181 - return correct remoteHost with 
RemoteIP[Valve|Filter]
f5500fd is described below

commit f5500fd980f4d8c7b5593dd77b5896346dd9d626
Author: Mark Thomas 
AuthorDate: Thu Nov 26 18:57:25 2020 +

Fix BZ 56181 - return correct remoteHost with RemoteIP[Valve|Filter]

https://bz.apache.org/bugzilla/show_bug.cgi?id=56181
---
 .../catalina/filters/LocalStrings.properties   |  1 +
 .../apache/catalina/filters/RemoteIpFilter.java| 42 +-
 .../apache/catalina/valves/LocalStrings.properties |  1 +
 java/org/apache/catalina/valves/RemoteIpValve.java | 19 +-
 webapps/docs/changelog.xml |  6 
 webapps/docs/config/filter.xml |  6 
 6 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/filters/LocalStrings.properties 
b/java/org/apache/catalina/filters/LocalStrings.properties
index 2e9f564..5877b76 100644
--- a/java/org/apache/catalina/filters/LocalStrings.properties
+++ b/java/org/apache/catalina/filters/LocalStrings.properties
@@ -58,6 +58,7 @@ remoteCidrFilter.noRemoteIp=Client does not have an IP 
address. Request denied.
 remoteIpFilter.invalidHostHeader=Invalid value [{0}] found for Host in HTTP 
header [{1}]
 remoteIpFilter.invalidHostWithPort=Host value [{0}] in HTTP header [{1}] 
included a port number which will be ignored
 remoteIpFilter.invalidNumber=Illegal number for parameter [{0}]: [{1}]
+remoteIpFilter.invalidRemoteAddress=Unable to determine the remote host 
because the reported remote address [{0}] is not valid
 
 requestFilter.deny=Denied request for [{0}] based on property [{1}]
 
diff --git a/java/org/apache/catalina/filters/RemoteIpFilter.java 
b/java/org/apache/catalina/filters/RemoteIpFilter.java
index bb59282..fffba9d 100644
--- a/java/org/apache/catalina/filters/RemoteIpFilter.java
+++ b/java/org/apache/catalina/filters/RemoteIpFilter.java
@@ -17,6 +17,8 @@
 package org.apache.catalina.filters;
 
 import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -162,6 +164,13 @@ import org.apache.tomcat.util.res.StringManager;
  * integer
  * 443
  * 
+ * 
+ * enableLookups
+ * Should a DNS lookup be performed to provide a host name when calling 
{@link ServletRequest#getRemoteHost()}
+ * N/A
+ * boolean
+ * false
+ * 
  * 
  * 
  * Regular expression vs. IP address blocks: 
mod_remoteip allows to use address blocks (e.g.
@@ -678,6 +687,8 @@ public class RemoteIpFilter implements Filter {
 
 protected static final String TRUSTED_PROXIES_PARAMETER = "trustedProxies";
 
+protected static final String ENABLE_LOOKUPS_PARAMETER = "enableLookups";
+
 /**
  * Convert a given comma delimited list of regular expressions into an 
array of String
  *
@@ -770,6 +781,8 @@ public class RemoteIpFilter implements Filter {
  */
 private Pattern trustedProxies = null;
 
+private boolean enableLookups;
+
 @Override
 public void destroy() {
 // NOOP
@@ -825,7 +838,22 @@ public class RemoteIpFilter implements Filter {
 if (remoteIp != null) {
 
 xRequest.setRemoteAddr(remoteIp);
-xRequest.setRemoteHost(remoteIp);
+if (getEnableLookups()) {
+// This isn't a lazy lookup but that would be a little more
+// invasive - mainly in XForwardedRequest - and if
+// enableLookups is true is seems reasonable that the
+// hostname will be required so look it up here.
+try {
+InetAddress inetAddress = 
InetAddress.getByName(remoteIp);
+// We know we need a DNS look up so use 
getCanonicalHostName()
+
xRequest.setRemoteHost(inetAddress.getCanonicalHostName());
+} catch (UnknownHostException e) {
+
log.debug(sm.getString("remoteIpFilter.invalidRemoteAddress", remoteIp), e);
+xRequest.setRemoteHost(remoteIp);
+}
+} else {
+xRequest.setRemoteHost(remoteIp);
+}
 
 if (proxiesHeaderValue.size() == 0) {
 xRequest.removeHeader(proxiesHeader);
@@ -1015,6 +1043,10 @@ public class RemoteIpFilter implements Filter {
 return trustedProxies;
 }
 
+public boolean getEnableLookups() {
+return enableLookups;
+}
+
 @Override
 public void init(FilterConfig filterConfig) throws ServletException {
 if 

[tomcat] branch 9.0.x updated: Fix BZ 56181 - return correct remoteHost with RemoteIP[Valve|Filter]

2020-11-26 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 524e2cc  Fix BZ 56181 - return correct remoteHost with 
RemoteIP[Valve|Filter]
524e2cc is described below

commit 524e2ccd3fdf3ffb2830a43c414691bcbcb5f234
Author: Mark Thomas 
AuthorDate: Thu Nov 26 18:57:25 2020 +

Fix BZ 56181 - return correct remoteHost with RemoteIP[Valve|Filter]

https://bz.apache.org/bugzilla/show_bug.cgi?id=56181
---
 .../catalina/filters/LocalStrings.properties   |  1 +
 .../apache/catalina/filters/RemoteIpFilter.java| 41 +-
 .../apache/catalina/valves/LocalStrings.properties |  1 +
 java/org/apache/catalina/valves/RemoteIpValve.java | 19 +-
 webapps/docs/changelog.xml |  6 
 webapps/docs/config/filter.xml |  6 
 6 files changed, 72 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/filters/LocalStrings.properties 
b/java/org/apache/catalina/filters/LocalStrings.properties
index 2e9f564..5877b76 100644
--- a/java/org/apache/catalina/filters/LocalStrings.properties
+++ b/java/org/apache/catalina/filters/LocalStrings.properties
@@ -58,6 +58,7 @@ remoteCidrFilter.noRemoteIp=Client does not have an IP 
address. Request denied.
 remoteIpFilter.invalidHostHeader=Invalid value [{0}] found for Host in HTTP 
header [{1}]
 remoteIpFilter.invalidHostWithPort=Host value [{0}] in HTTP header [{1}] 
included a port number which will be ignored
 remoteIpFilter.invalidNumber=Illegal number for parameter [{0}]: [{1}]
+remoteIpFilter.invalidRemoteAddress=Unable to determine the remote host 
because the reported remote address [{0}] is not valid
 
 requestFilter.deny=Denied request for [{0}] based on property [{1}]
 
diff --git a/java/org/apache/catalina/filters/RemoteIpFilter.java 
b/java/org/apache/catalina/filters/RemoteIpFilter.java
index e8a42da..72ea1e2 100644
--- a/java/org/apache/catalina/filters/RemoteIpFilter.java
+++ b/java/org/apache/catalina/filters/RemoteIpFilter.java
@@ -18,6 +18,8 @@ package org.apache.catalina.filters;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -166,6 +168,13 @@ import org.apache.tomcat.util.res.StringManager;
  * integer
  * 443
  * 
+ * 
+ * enableLookups
+ * Should a DNS lookup be performed to provide a host name when calling 
{@link ServletRequest#getRemoteHost()}
+ * N/A
+ * boolean
+ * false
+ * 
  * 
  * 
  * Regular expression vs. IP address blocks: 
mod_remoteip allows to use address blocks (e.g.
@@ -681,6 +690,8 @@ public class RemoteIpFilter extends GenericFilter {
 
 protected static final String TRUSTED_PROXIES_PARAMETER = "trustedProxies";
 
+protected static final String ENABLE_LOOKUPS_PARAMETER = "enableLookups";
+
 /**
  * Convert a given comma delimited list of regular expressions into an 
array of String
  *
@@ -773,6 +784,8 @@ public class RemoteIpFilter extends GenericFilter {
  */
 private Pattern trustedProxies = null;
 
+private boolean enableLookups;
+
 public void doFilter(HttpServletRequest request, HttpServletResponse 
response, FilterChain chain) throws IOException, ServletException {
 
 boolean isInternal = internalProxies != null &&
@@ -823,7 +836,22 @@ public class RemoteIpFilter extends GenericFilter {
 if (remoteIp != null) {
 
 xRequest.setRemoteAddr(remoteIp);
-xRequest.setRemoteHost(remoteIp);
+if (getEnableLookups()) {
+// This isn't a lazy lookup but that would be a little more
+// invasive - mainly in XForwardedRequest - and if
+// enableLookups is true is seems reasonable that the
+// hostname will be required so look it up here.
+try {
+InetAddress inetAddress = 
InetAddress.getByName(remoteIp);
+// We know we need a DNS look up so use 
getCanonicalHostName()
+
xRequest.setRemoteHost(inetAddress.getCanonicalHostName());
+} catch (UnknownHostException e) {
+
log.debug(sm.getString("remoteIpFilter.invalidRemoteAddress", remoteIp), e);
+xRequest.setRemoteHost(remoteIp);
+}
+} else {
+xRequest.setRemoteHost(remoteIp);
+}
 
 if (proxiesHeaderValue.size() == 0) {
 xRequest.removeHeader(proxiesHeader);
@@ -1013,6 +1041,10 @@ public class RemoteIpFilter extends GenericFilter {
 return truste

[tomcat] branch master updated: Fix BZ 56181 - return correct remoteHost with RemoteIP[Valve|Filter]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 479a6a9  Fix BZ 56181 - return correct remoteHost with 
RemoteIP[Valve|Filter]
479a6a9 is described below

commit 479a6a932181ee76d316dfec3bfeeaf39c0a2a6d
Author: Mark Thomas 
AuthorDate: Thu Nov 26 18:57:25 2020 +

Fix BZ 56181 - return correct remoteHost with RemoteIP[Valve|Filter]

https://bz.apache.org/bugzilla/show_bug.cgi?id=56181
---
 .../catalina/filters/LocalStrings.properties   |  1 +
 .../apache/catalina/filters/RemoteIpFilter.java| 41 +-
 .../apache/catalina/valves/LocalStrings.properties |  1 +
 java/org/apache/catalina/valves/RemoteIpValve.java | 19 +-
 webapps/docs/changelog.xml |  6 
 webapps/docs/config/filter.xml |  6 
 6 files changed, 72 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/filters/LocalStrings.properties 
b/java/org/apache/catalina/filters/LocalStrings.properties
index 2e9f564..5877b76 100644
--- a/java/org/apache/catalina/filters/LocalStrings.properties
+++ b/java/org/apache/catalina/filters/LocalStrings.properties
@@ -58,6 +58,7 @@ remoteCidrFilter.noRemoteIp=Client does not have an IP 
address. Request denied.
 remoteIpFilter.invalidHostHeader=Invalid value [{0}] found for Host in HTTP 
header [{1}]
 remoteIpFilter.invalidHostWithPort=Host value [{0}] in HTTP header [{1}] 
included a port number which will be ignored
 remoteIpFilter.invalidNumber=Illegal number for parameter [{0}]: [{1}]
+remoteIpFilter.invalidRemoteAddress=Unable to determine the remote host 
because the reported remote address [{0}] is not valid
 
 requestFilter.deny=Denied request for [{0}] based on property [{1}]
 
diff --git a/java/org/apache/catalina/filters/RemoteIpFilter.java 
b/java/org/apache/catalina/filters/RemoteIpFilter.java
index e37859b..e20faee 100644
--- a/java/org/apache/catalina/filters/RemoteIpFilter.java
+++ b/java/org/apache/catalina/filters/RemoteIpFilter.java
@@ -18,6 +18,8 @@ package org.apache.catalina.filters;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -166,6 +168,13 @@ import org.apache.tomcat.util.res.StringManager;
  * integer
  * 443
  * 
+ * 
+ * enableLookups
+ * Should a DNS lookup be performed to provide a host name when calling 
{@link ServletRequest#getRemoteHost()}
+ * N/A
+ * boolean
+ * false
+ * 
  * 
  * 
  * Regular expression vs. IP address blocks: 
mod_remoteip allows to use address blocks (e.g.
@@ -681,6 +690,8 @@ public class RemoteIpFilter extends GenericFilter {
 
 protected static final String TRUSTED_PROXIES_PARAMETER = "trustedProxies";
 
+protected static final String ENABLE_LOOKUPS_PARAMETER = "enableLookups";
+
 /**
  * Convert a given comma delimited list of regular expressions into an 
array of String
  *
@@ -773,6 +784,8 @@ public class RemoteIpFilter extends GenericFilter {
  */
 private Pattern trustedProxies = null;
 
+private boolean enableLookups;
+
 public void doFilter(HttpServletRequest request, HttpServletResponse 
response, FilterChain chain) throws IOException, ServletException {
 
 boolean isInternal = internalProxies != null &&
@@ -823,7 +836,22 @@ public class RemoteIpFilter extends GenericFilter {
 if (remoteIp != null) {
 
 xRequest.setRemoteAddr(remoteIp);
-xRequest.setRemoteHost(remoteIp);
+if (getEnableLookups()) {
+// This isn't a lazy lookup but that would be a little more
+// invasive - mainly in XForwardedRequest - and if
+// enableLookups is true is seems reasonable that the
+// hostname will be required so look it up here.
+try {
+InetAddress inetAddress = 
InetAddress.getByName(remoteIp);
+// We know we need a DNS look up so use 
getCanonicalHostName()
+
xRequest.setRemoteHost(inetAddress.getCanonicalHostName());
+} catch (UnknownHostException e) {
+
log.debug(sm.getString("remoteIpFilter.invalidRemoteAddress", remoteIp), e);
+xRequest.setRemoteHost(remoteIp);
+}
+} else {
+xRequest.setRemoteHost(remoteIp);
+}
 
 if (proxiesHeaderValue.size() == 0) {
 xRequest.removeHeader(proxiesHeader);
@@ -1013,6 +1041,10 @@ public class RemoteIpFilter extends GenericFilter {
 return truste

[tomcat] 01/02: Update to Maven Ant Resolver Tasks 1.3.0

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

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

commit 5bb694178b8df9e0f0dce987f43dd5e3d3e11823
Author: Mark Thomas 
AuthorDate: Wed Nov 25 20:31:35 2020 +

Update to Maven Ant Resolver Tasks 1.3.0
---
 res/maven/mvn.properties.default | 2 +-
 webapps/docs/changelog.xml   | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 1888d5b..6eda85f 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -61,7 +61,7 @@ tomcat.pom.path=../../res/maven
 base.path=${user.home}/tomcat-build-libs
 
 # - Maven Ant Tasks -
-maven-resolver-ant-tasks.version=1.2.0
+maven-resolver-ant-tasks.version=1.3.0
 
maven-resolver-ant-tasks.home=${base.path}/maven-resolver-ant-tasks-${maven-resolver-ant-tasks.version}
 
maven-resolver-ant-tasks.loc=https://repo1.maven.org/maven2/org/apache/maven/resolver/maven-resolver-ant-tasks/${maven-resolver-ant-tasks.version}/maven-resolver-ant-tasks-${maven-resolver-ant-tasks.version}-uber.jar
 
maven-resolver-ant-tasks.jar=${maven-resolver-ant-tasks.home}/maven-resolver-ant-tasks-${maven-resolver-ant-tasks.version}-uber.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d4c5bb9..f7c5ec3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -135,6 +135,9 @@
 64931: Implement validation of changelog.xml
 file at build time. (kkolinko)
   
+  
+Update to Maven Ant Resolver Tasks 1.3.0. (markt)
+  
 
   
 


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



[tomcat] 02/02: Provide SHA-256 and SHA-512 hashes for releases via Maven

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

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

commit 5a406fb6af6e47b35e1f089bf9cc3641c74a0233
Author: Mark Thomas 
AuthorDate: Wed Nov 25 20:32:01 2020 +

Provide SHA-256 and SHA-512 hashes for releases via Maven
---
 res/maven/mvn-pub.xml  | 1 +
 webapps/docs/changelog.xml | 4 
 2 files changed, 5 insertions(+)

diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml
index 9fd938b..d14e68f 100644
--- a/res/maven/mvn-pub.xml
+++ b/res/maven/mvn-pub.xml
@@ -23,6 +23,7 @@
   
   
   
+  
 
   
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f7c5ec3..58a5f98 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -138,6 +138,10 @@
   
 Update to Maven Ant Resolver Tasks 1.3.0. (markt)
   
+  
+62695: Provide SHA-256 and SHA-512 checksums for files
+published via Maven. (markt)
+  
 
   
 


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



[tomcat] branch 7.0.x updated (dadf3ad -> 5a406fb)

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

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


from dadf3ad  Update Tomcat 7.0.107 release date
 new 5bb6941  Update to Maven Ant Resolver Tasks 1.3.0
 new 5a406fb  Provide SHA-256 and SHA-512 hashes for releases via Maven

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:
 res/maven/mvn-pub.xml| 1 +
 res/maven/mvn.properties.default | 2 +-
 webapps/docs/changelog.xml   | 7 +++
 3 files changed, 9 insertions(+), 1 deletion(-)


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



[tomcat] 01/02: Update to Maven Ant Resolver Tasks 1.3.0

2020-11-26 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

commit c1ac63a3fad1db985e553d8e01f5a2eeb0f6fc3c
Author: Mark Thomas 
AuthorDate: Wed Nov 25 20:31:35 2020 +

Update to Maven Ant Resolver Tasks 1.3.0
---
 res/maven/mvn.properties.default | 2 +-
 webapps/docs/changelog.xml   | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index e98efe5..3615f18 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -61,7 +61,7 @@ tomcat.pom.path=../../res/maven
 base.path=${user.home}/tomcat-build-libs
 
 # - Maven Ant Tasks -
-maven-resolver-ant-tasks.version=1.2.0
+maven-resolver-ant-tasks.version=1.3.0
 
maven-resolver-ant-tasks.home=${base.path}/maven-resolver-ant-tasks-${maven-resolver-ant-tasks.version}
 
maven-resolver-ant-tasks.loc=https://repo1.maven.org/maven2/org/apache/maven/resolver/maven-resolver-ant-tasks/${maven-resolver-ant-tasks.version}/maven-resolver-ant-tasks-${maven-resolver-ant-tasks.version}-uber.jar
 
maven-resolver-ant-tasks.jar=${maven-resolver-ant-tasks.home}/maven-resolver-ant-tasks-${maven-resolver-ant-tasks.version}-uber.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 591adbe..a01d742 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -129,6 +129,9 @@
 64931: Implement validation of changelog.xml
 file at build time. (kkolinko)
   
+  
+Update to Maven Ant Resolver Tasks 1.3.0. (markt)
+  
 
   
 


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



[tomcat] 02/02: Provide SHA-256 and SHA-512 hashes for releases via Maven

2020-11-26 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

commit 0b32b01e5fb7abb477f30bfd13327d76ef97e766
Author: Mark Thomas 
AuthorDate: Wed Nov 25 20:32:01 2020 +

Provide SHA-256 and SHA-512 hashes for releases via Maven
---
 res/maven/mvn-pub.xml  | 1 +
 webapps/docs/changelog.xml | 4 
 2 files changed, 5 insertions(+)

diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml
index 17d64a9..16b67a8 100644
--- a/res/maven/mvn-pub.xml
+++ b/res/maven/mvn-pub.xml
@@ -23,6 +23,7 @@
   
   
   
+  
 
   
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a01d742..9bcaca5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -132,6 +132,10 @@
   
 Update to Maven Ant Resolver Tasks 1.3.0. (markt)
   
+  
+62695: Provide SHA-256 and SHA-512 checksums for files
+published via Maven. (markt)
+  
 
   
 


-
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 (987be34 -> 0b32b01)

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

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


from 987be34  Fix regression in async Servlet examples
 new c1ac63a  Update to Maven Ant Resolver Tasks 1.3.0
 new 0b32b01  Provide SHA-256 and SHA-512 hashes for releases via Maven

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:
 res/maven/mvn-pub.xml| 1 +
 res/maven/mvn.properties.default | 2 +-
 webapps/docs/changelog.xml   | 7 +++
 3 files changed, 9 insertions(+), 1 deletion(-)


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



[tomcat] 02/02: Provide SHA-256 and SHA-512 hashes for releases via Maven

2020-11-26 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

commit 39fa9e55ce8a71abdb196c2241cff027924ce374
Author: Mark Thomas 
AuthorDate: Wed Nov 25 20:32:01 2020 +

Provide SHA-256 and SHA-512 hashes for releases via Maven
---
 res/maven/mvn-pub.xml  | 1 +
 webapps/docs/changelog.xml | 4 
 2 files changed, 5 insertions(+)

diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml
index 76b786c..06dd829 100644
--- a/res/maven/mvn-pub.xml
+++ b/res/maven/mvn-pub.xml
@@ -23,6 +23,7 @@
   
   
   
+  
 
   
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7c3eb30..c115443 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -145,6 +145,10 @@
   
 Update to Maven Ant Resolver Tasks 1.3.0. (markt)
   
+  
+62695: Provide SHA-256 and SHA-512 checksums for files
+published via Maven. (markt)
+  
 
   
 


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



[tomcat] 01/02: Update to Maven Ant Resolver Tasks 1.3.0

2020-11-26 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

commit 1b8a3e31400ae6e25d237315467dc4c47e40cdfe
Author: Mark Thomas 
AuthorDate: Wed Nov 25 20:31:35 2020 +

Update to Maven Ant Resolver Tasks 1.3.0
---
 res/maven/mvn.properties.default | 2 +-
 webapps/docs/changelog.xml   | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index b87c5df..e2176fd 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -59,7 +59,7 @@ tomcat.pom.path=../../res/maven
 base.path=${user.home}/tomcat-build-libs
 
 # - Maven Ant Tasks -
-maven-resolver-ant-tasks.version=1.2.0
+maven-resolver-ant-tasks.version=1.3.0
 
maven-resolver-ant-tasks.home=${base.path}/maven-resolver-ant-tasks-${maven-resolver-ant-tasks.version}
 
maven-resolver-ant-tasks.loc=https://repo1.maven.org/maven2/org/apache/maven/resolver/maven-resolver-ant-tasks/${maven-resolver-ant-tasks.version}/maven-resolver-ant-tasks-${maven-resolver-ant-tasks.version}-uber.jar
 
maven-resolver-ant-tasks.jar=${maven-resolver-ant-tasks.home}/maven-resolver-ant-tasks-${maven-resolver-ant-tasks.version}-uber.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cb963b6..7c3eb30 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -142,6 +142,9 @@
 64931: Implement validation of changelog.xml
 file at build time. (kkolinko)
   
+  
+Update to Maven Ant Resolver Tasks 1.3.0. (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 (b1133ad -> 39fa9e5)

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

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


from b1133ad  Fix BZ 64080 - graceful close
 new 1b8a3e3  Update to Maven Ant Resolver Tasks 1.3.0
 new 39fa9e5  Provide SHA-256 and SHA-512 hashes for releases via Maven

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:
 res/maven/mvn-pub.xml| 1 +
 res/maven/mvn.properties.default | 2 +-
 webapps/docs/changelog.xml   | 7 +++
 3 files changed, 9 insertions(+), 1 deletion(-)


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



[tomcat] branch master updated (a1cbdab -> 997ea27)

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

markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from a1cbdab  Fix BZ 64080 - graceful close
 new 02b9683  Update to Maven Ant Resolver Tasks 1.3.0
 new 997ea27  Provide SHA-256 and SHA-512 hashes for releases via Maven

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:
 res/maven/mvn-pub.xml| 1 +
 res/maven/mvn.properties.default | 2 +-
 webapps/docs/changelog.xml   | 7 +++
 3 files changed, 9 insertions(+), 1 deletion(-)


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



[tomcat] 02/02: Provide SHA-256 and SHA-512 hashes for releases via Maven

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

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

commit 997ea27b77fe08db2bc19bdb8b15ddbde9662675
Author: Mark Thomas 
AuthorDate: Wed Nov 25 20:32:01 2020 +

Provide SHA-256 and SHA-512 hashes for releases via Maven
---
 res/maven/mvn-pub.xml  | 1 +
 webapps/docs/changelog.xml | 4 
 2 files changed, 5 insertions(+)

diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml
index 4ab26f7..99ffb9e 100644
--- a/res/maven/mvn-pub.xml
+++ b/res/maven/mvn-pub.xml
@@ -23,6 +23,7 @@
   
   
   
+  
 
   
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7595c2d..3743633 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -145,6 +145,10 @@
   
 Update to Maven Ant Resolver Tasks 1.3.0. (markt)
   
+  
+62695: Provide SHA-256 and SHA-512 checksums for files
+published via Maven. (markt)
+  
 
   
 


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



[tomcat] 01/02: Update to Maven Ant Resolver Tasks 1.3.0

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

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

commit 02b968334d3d3029fbe543d9f5291a150bec5bc0
Author: Mark Thomas 
AuthorDate: Wed Nov 25 20:31:35 2020 +

Update to Maven Ant Resolver Tasks 1.3.0
---
 res/maven/mvn.properties.default | 2 +-
 webapps/docs/changelog.xml   | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 2c756e3..e00e7e2 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -59,7 +59,7 @@ tomcat.pom.path=../../res/maven
 base.path=${user.home}/tomcat-build-libs
 
 # - Maven Ant Tasks -
-maven-resolver-ant-tasks.version=1.2.0
+maven-resolver-ant-tasks.version=1.3.0
 
maven-resolver-ant-tasks.home=${base.path}/maven-resolver-ant-tasks-${maven-resolver-ant-tasks.version}
 
maven-resolver-ant-tasks.loc=https://repo1.maven.org/maven2/org/apache/maven/resolver/maven-resolver-ant-tasks/${maven-resolver-ant-tasks.version}/maven-resolver-ant-tasks-${maven-resolver-ant-tasks.version}-uber.jar
 
maven-resolver-ant-tasks.jar=${maven-resolver-ant-tasks.home}/maven-resolver-ant-tasks-${maven-resolver-ant-tasks.version}-uber.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5603d10..7595c2d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -142,6 +142,9 @@
 64931: Implement validation of changelog.xml
 file at build time. (kkolinko)
   
+  
+Update to Maven Ant Resolver Tasks 1.3.0. (markt)
+  
 
   
 


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



[tomcat] branch master updated: Fix BZ 64080 - graceful close

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

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


The following commit(s) were added to refs/heads/master by this push:
 new a1cbdab  Fix BZ 64080 - graceful close
a1cbdab is described below

commit a1cbdab44b243515a5e8a9fec3c6fa1ac9ba254a
Author: Mark Thomas 
AuthorDate: Thu Nov 19 11:06:55 2020 +

Fix BZ 64080 - graceful close

https://bz.apache.org/bugzilla/show_bug.cgi?id=64080
---
 java/org/apache/catalina/core/StandardService.java | 35 --
 java/org/apache/coyote/AbstractProtocol.java   |  8 
 java/org/apache/coyote/LocalStrings.properties |  1 +
 java/org/apache/coyote/ProtocolHandler.java| 13 +
 .../apache/tomcat/util/net/AbstractEndpoint.java   | 56 +-
 webapps/docs/changelog.xml |  7 +++
 webapps/docs/config/service.xml| 10 
 7 files changed, 123 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/catalina/core/StandardService.java 
b/java/org/apache/catalina/core/StandardService.java
index 05965ca..5597cb0 100644
--- a/java/org/apache/catalina/core/StandardService.java
+++ b/java/org/apache/catalina/core/StandardService.java
@@ -105,8 +105,21 @@ public class StandardService extends LifecycleMBeanBase 
implements Service {
 protected final MapperListener mapperListener = new MapperListener(this);
 
 
+private long gracefulStopAwaitMillis = 0;
+
+
 // - Properties
 
+public long getGracefulStopAwaitMillis() {
+return gracefulStopAwaitMillis;
+}
+
+
+public void setGracefulStopAwaitMillis(long gracefulStopAwaitMillis) {
+this.gracefulStopAwaitMillis = gracefulStopAwaitMillis;
+}
+
+
 @Override
 public Mapper getMapper() {
 return mapper;
@@ -453,21 +466,33 @@ public class StandardService extends LifecycleMBeanBase 
implements Service {
 @Override
 protected void stopInternal() throws LifecycleException {
 
-// Pause connectors first
 synchronized (connectorsLock) {
+// Initiate a graceful stop for each connector
+// This will only work if the bindOnInit==false which is not the
+// default.
 for (Connector connector: connectors) {
-connector.pause();
-// Close server socket if bound on start
-// Note: test is in AbstractEndpoint
 connector.getProtocolHandler().closeServerSocketGraceful();
 }
+
+// Wait for the graceful shutdown to complete
+long waitMillis = gracefulStopAwaitMillis;
+if (waitMillis > 0) {
+for (Connector connector: connectors) {
+waitMillis = 
connector.getProtocolHandler().awaitConnectionsClose(waitMillis);
+}
+}
+
+// Pause the connectors
+for (Connector connector: connectors) {
+connector.pause();
+}
 }
 
 if(log.isInfoEnabled())
 log.info(sm.getString("standardService.stop.name", this.name));
 setState(LifecycleState.STOPPING);
 
-// Stop our defined Container second
+// Stop our defined Container once the Connectors are all paused
 if (engine != null) {
 synchronized (engine) {
 engine.stop();
diff --git a/java/org/apache/coyote/AbstractProtocol.java 
b/java/org/apache/coyote/AbstractProtocol.java
index e6fbaed..921d78b 100644
--- a/java/org/apache/coyote/AbstractProtocol.java
+++ b/java/org/apache/coyote/AbstractProtocol.java
@@ -711,6 +711,14 @@ public abstract class AbstractProtocol implements 
ProtocolHandler,
 }
 
 
+@Override
+public long awaitConnectionsClose(long waitMillis) {
+getLog().info(sm.getString("abstractProtocol.closeConnectionsAwait",
+Long.valueOf(waitMillis), getName()));
+return endpoint.awaitConnectionsClose(waitMillis);
+}
+
+
 private void logPortOffset() {
 if (getPort() != getPortWithOffset()) {
 getLog().info(sm.getString("abstractProtocolHandler.portOffset", 
getName(),
diff --git a/java/org/apache/coyote/LocalStrings.properties 
b/java/org/apache/coyote/LocalStrings.properties
index 3009a36..595cfb2 100644
--- a/java/org/apache/coyote/LocalStrings.properties
+++ b/java/org/apache/coyote/LocalStrings.properties
@@ -34,6 +34,7 @@ abstractProcessor.pushrequest.notsupported=Server push 
requests are not supporte
 abstractProcessor.setErrorState=Error state [{0}] reported while processing 
request
 abstractProcessor.socket.ssl=Exception getting SSL attributes
 
+abstractProtocol.closeConnectionsAwait=Waiting [{0}] milliseconds for existing 
connections to [{1}] to complete and close.
 abstractProtocol

[tomcat] branch 9.0.x updated: Fix BZ 64080 - graceful close

2020-11-25 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 b1133ad  Fix BZ 64080 - graceful close
b1133ad is described below

commit b1133ada73a48b738793de1827ae4ca9735babb3
Author: Mark Thomas 
AuthorDate: Thu Nov 19 11:06:55 2020 +

Fix BZ 64080 - graceful close

https://bz.apache.org/bugzilla/show_bug.cgi?id=64080
---
 java/org/apache/catalina/core/StandardService.java | 35 --
 java/org/apache/coyote/AbstractProtocol.java   |  8 
 java/org/apache/coyote/LocalStrings.properties |  1 +
 java/org/apache/coyote/ProtocolHandler.java| 13 +
 .../apache/tomcat/util/net/AbstractEndpoint.java   | 56 +-
 webapps/docs/changelog.xml |  7 +++
 webapps/docs/config/service.xml| 10 
 7 files changed, 123 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/catalina/core/StandardService.java 
b/java/org/apache/catalina/core/StandardService.java
index 05965ca..5597cb0 100644
--- a/java/org/apache/catalina/core/StandardService.java
+++ b/java/org/apache/catalina/core/StandardService.java
@@ -105,8 +105,21 @@ public class StandardService extends LifecycleMBeanBase 
implements Service {
 protected final MapperListener mapperListener = new MapperListener(this);
 
 
+private long gracefulStopAwaitMillis = 0;
+
+
 // - Properties
 
+public long getGracefulStopAwaitMillis() {
+return gracefulStopAwaitMillis;
+}
+
+
+public void setGracefulStopAwaitMillis(long gracefulStopAwaitMillis) {
+this.gracefulStopAwaitMillis = gracefulStopAwaitMillis;
+}
+
+
 @Override
 public Mapper getMapper() {
 return mapper;
@@ -453,21 +466,33 @@ public class StandardService extends LifecycleMBeanBase 
implements Service {
 @Override
 protected void stopInternal() throws LifecycleException {
 
-// Pause connectors first
 synchronized (connectorsLock) {
+// Initiate a graceful stop for each connector
+// This will only work if the bindOnInit==false which is not the
+// default.
 for (Connector connector: connectors) {
-connector.pause();
-// Close server socket if bound on start
-// Note: test is in AbstractEndpoint
 connector.getProtocolHandler().closeServerSocketGraceful();
 }
+
+// Wait for the graceful shutdown to complete
+long waitMillis = gracefulStopAwaitMillis;
+if (waitMillis > 0) {
+for (Connector connector: connectors) {
+waitMillis = 
connector.getProtocolHandler().awaitConnectionsClose(waitMillis);
+}
+}
+
+// Pause the connectors
+for (Connector connector: connectors) {
+connector.pause();
+}
 }
 
 if(log.isInfoEnabled())
 log.info(sm.getString("standardService.stop.name", this.name));
 setState(LifecycleState.STOPPING);
 
-// Stop our defined Container second
+// Stop our defined Container once the Connectors are all paused
 if (engine != null) {
 synchronized (engine) {
 engine.stop();
diff --git a/java/org/apache/coyote/AbstractProtocol.java 
b/java/org/apache/coyote/AbstractProtocol.java
index c226b72..089a07c 100644
--- a/java/org/apache/coyote/AbstractProtocol.java
+++ b/java/org/apache/coyote/AbstractProtocol.java
@@ -734,6 +734,14 @@ public abstract class AbstractProtocol implements 
ProtocolHandler,
 }
 
 
+@Override
+public long awaitConnectionsClose(long waitMillis) {
+getLog().info(sm.getString("abstractProtocol.closeConnectionsAwait",
+Long.valueOf(waitMillis), getName()));
+return endpoint.awaitConnectionsClose(waitMillis);
+}
+
+
 private void logPortOffset() {
 if (getPort() != getPortWithOffset()) {
 getLog().info(sm.getString("abstractProtocolHandler.portOffset", 
getName(),
diff --git a/java/org/apache/coyote/LocalStrings.properties 
b/java/org/apache/coyote/LocalStrings.properties
index 3009a36..595cfb2 100644
--- a/java/org/apache/coyote/LocalStrings.properties
+++ b/java/org/apache/coyote/LocalStrings.properties
@@ -34,6 +34,7 @@ abstractProcessor.pushrequest.notsupported=Server push 
requests are not supporte
 abstractProcessor.setErrorState=Error state [{0}] reported while processing 
request
 abstractProcessor.socket.ssl=Exception getting SSL attributes
 
+abstractProtocol.closeConnectionsAwait=Waiting [{0}] milliseconds for existing 
connections to [{1}] to complete and close.
 abstractProtocol

[tomcat] branch 9.0.x updated: Remove unnecessary code

2020-11-23 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 f056baa  Remove unnecessary code
f056baa is described below

commit f056baa97638fca97cd5f19161fe4e6aea54eacf
Author: Mark Thomas 
AuthorDate: Mon Nov 23 15:44:26 2020 +

Remove unnecessary code
---
 java/org/apache/tomcat/util/net/NioEndpoint.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java 
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 7cdb8f3..159d55b 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -606,9 +606,7 @@ public class NioEndpoint extends 
AbstractJsseEndpoint
 int interestOps = pe.getInterestOps();
 if (sc == null) {
 log.warn(sm.getString("endpoint.nio.nullSocketChannel"));
-if (socketWrapper != null) {
-socketWrapper.close();
-}
+socketWrapper.close();
 } else if (interestOps == OP_REGISTER) {
 try {
 sc.register(getSelector(), SelectionKey.OP_READ, 
socketWrapper);


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



[tomcat] branch master updated: Remove unnecessary code

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 4049a74  Remove unnecessary code
4049a74 is described below

commit 4049a74f0e8556b1a230858a71f2217539c674a5
Author: Mark Thomas 
AuthorDate: Mon Nov 23 15:44:26 2020 +

Remove unnecessary code
---
 java/org/apache/tomcat/util/net/NioEndpoint.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java 
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 2af6dce..ab2766b 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -546,9 +546,7 @@ public class NioEndpoint extends 
AbstractJsseEndpoint
 int interestOps = pe.getInterestOps();
 if (sc == null) {
 log.warn(sm.getString("endpoint.nio.nullSocketChannel"));
-if (socketWrapper != null) {
-socketWrapper.close();
-}
+socketWrapper.close();
 } else if (interestOps == OP_REGISTER) {
 try {
 sc.register(getSelector(), SelectionKey.OP_READ, 
socketWrapper);


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



[tomcat] branch 7.0.x updated: Fix regression in async Servlet examples

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

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new e35e4c0  Fix regression in async Servlet examples
e35e4c0 is described below

commit e35e4c0ef1045d755902a2406216b8ee46e31e0f
Author: Mark Thomas 
AuthorDate: Mon Nov 23 14:04:49 2020 +

Fix regression in async Servlet examples
---
 webapps/docs/changelog.xml   | 10 ++
 webapps/examples/WEB-INF/web.xml |  1 +
 2 files changed, 11 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e505878..9ed811a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -119,6 +119,16 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Correct a regression in the addition of the HTTP header security filter
+to the examples web application that prevented the Servlet examples 
that
+depend on the asynchronous API from functioning correctly.
+    (kkolinko/markt)
+  
+
+  
   
 
   
diff --git a/webapps/examples/WEB-INF/web.xml b/webapps/examples/WEB-INF/web.xml
index 07f7590..669e85d 100644
--- a/webapps/examples/WEB-INF/web.xml
+++ b/webapps/examples/WEB-INF/web.xml
@@ -83,6 +83,7 @@
 
 HTTP header security filter
 
org.apache.catalina.filters.HttpHeaderSecurityFilter
+true
 
 hstsEnabled
 false


-
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 regression in async Servlet examples

2020-11-23 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 987be34  Fix regression in async Servlet examples
987be34 is described below

commit 987be341885e50906d956cf369138b72c05ccf9b
Author: Mark Thomas 
AuthorDate: Mon Nov 23 14:04:49 2020 +

Fix regression in async Servlet examples
---
 webapps/docs/changelog.xml   | 10 ++
 webapps/examples/WEB-INF/web.xml |  1 +
 2 files changed, 11 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 443c857..591adbe 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -113,6 +113,16 @@
   
 
   
+  
+
+  
+Correct a regression in the addition of the HTTP header security filter
+to the examples web application that prevented the Servlet examples 
that
+depend on the asynchronous API from functioning correctly.
+(kkolinko/markt)
+  
+
+  
   
 
   
diff --git a/webapps/examples/WEB-INF/web.xml b/webapps/examples/WEB-INF/web.xml
index f294e2b..1a823a5 100644
--- a/webapps/examples/WEB-INF/web.xml
+++ b/webapps/examples/WEB-INF/web.xml
@@ -84,6 +84,7 @@
 
 HTTP header security filter
 
org.apache.catalina.filters.HttpHeaderSecurityFilter
+true
 
 hstsEnabled
 false


-
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 regression in async Servlet examples

2020-11-23 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 83a4aa7  Fix regression in async Servlet examples
83a4aa7 is described below

commit 83a4aa7695098b158807a85ab8ce48424b9133ae
Author: Mark Thomas 
AuthorDate: Mon Nov 23 14:04:49 2020 +

Fix regression in async Servlet examples
---
 webapps/docs/changelog.xml   | 10 ++
 webapps/examples/WEB-INF/web.xml |  1 +
 2 files changed, 11 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1555f20..398046c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -113,6 +113,16 @@
   
 
   
+  
+
+  
+Correct a regression in the addition of the HTTP header security filter
+to the examples web application that prevented the Servlet examples 
that
+depend on the asynchronous API from functioning correctly.
+(kkolinko/markt)
+  
+
+  
   
 
   
diff --git a/webapps/examples/WEB-INF/web.xml b/webapps/examples/WEB-INF/web.xml
index 9e73861..0ad59b1 100644
--- a/webapps/examples/WEB-INF/web.xml
+++ b/webapps/examples/WEB-INF/web.xml
@@ -71,6 +71,7 @@
 
 HTTP header security filter
 
org.apache.catalina.filters.HttpHeaderSecurityFilter
+true
 
 hstsEnabled
 false


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



[tomcat] branch master updated: Fix regression in async Servlet examples

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 0b5d5c9  Fix regression in async Servlet examples
0b5d5c9 is described below

commit 0b5d5c91bafd3f61938917490ab531474dbb778a
Author: Mark Thomas 
AuthorDate: Mon Nov 23 14:04:49 2020 +

Fix regression in async Servlet examples
---
 webapps/docs/changelog.xml   | 10 ++
 webapps/examples/WEB-INF/web.xml |  1 +
 2 files changed, 11 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3ad87f3..225 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -113,6 +113,16 @@
   
 
   
+  
+
+  
+Correct a regression in the addition of the HTTP header security filter
+to the examples web application that prevented the Servlet examples 
that
+depend on the asynchronous API from functioning correctly.
+(kkolinko/markt)
+  
+
+  
   
 
   
diff --git a/webapps/examples/WEB-INF/web.xml b/webapps/examples/WEB-INF/web.xml
index fcb4625..2686d54 100644
--- a/webapps/examples/WEB-INF/web.xml
+++ b/webapps/examples/WEB-INF/web.xml
@@ -71,6 +71,7 @@
 
 HTTP header security filter
 
org.apache.catalina.filters.HttpHeaderSecurityFilter
+true
 
 hstsEnabled
 false


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



[tomcat] branch master updated: Managed to delete this. Sorry for the noise

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 8bb2553  Managed to delete this. Sorry for the noise
8bb2553 is described below

commit 8bb2553866cff2cfbfdb556ffcacd9a326c0a92b
Author: Mark Thomas 
AuthorDate: Thu Nov 19 17:06:08 2020 +

Managed to delete this. Sorry for the noise
---
 java/org/apache/tomcat/util/net/Nio2Endpoint.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java 
b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
index 957a55c..0cd5d13 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -413,6 +413,7 @@ public class Nio2Endpoint extends 
AbstractJsseEndpoint

[tomcat] branch 9.0.x updated: Follow-up to e863f54 for NIO2

2020-11-19 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 e7b8d96  Follow-up to e863f54 for NIO2
e7b8d96 is described below

commit e7b8d96009eb3fc10aee4d8c6e3339b6493301cb
Author: Mark Thomas 
AuthorDate: Thu Nov 19 17:02:03 2020 +

Follow-up to e863f54 for NIO2
---
 java/org/apache/tomcat/util/net/Nio2Endpoint.java | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java 
b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
index 18ead41..e45761e 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -419,8 +419,13 @@ public class Nio2Endpoint extends 
AbstractJsseEndpoint

[tomcat] branch 9.0.x updated: Managed to delete this. Sorry for the noise

2020-11-19 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 5bbe35c  Managed to delete this. Sorry for the noise
5bbe35c is described below

commit 5bbe35c7039f3f78862ee334f2abf06b600e95dd
Author: Mark Thomas 
AuthorDate: Thu Nov 19 17:06:08 2020 +

Managed to delete this. Sorry for the noise
---
 java/org/apache/tomcat/util/net/Nio2Endpoint.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java 
b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
index e45761e..02e8c16 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -425,6 +425,7 @@ public class Nio2Endpoint extends 
AbstractJsseEndpoint

[tomcat] branch master updated: Follow-up to e863f54 for NIO2

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

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


The following commit(s) were added to refs/heads/master by this push:
 new f46cf05  Follow-up to e863f54 for NIO2
f46cf05 is described below

commit f46cf05337bae707f567145d757269b75219c81b
Author: Mark Thomas 
AuthorDate: Thu Nov 19 17:02:03 2020 +

Follow-up to e863f54 for NIO2
---
 java/org/apache/tomcat/util/net/Nio2Endpoint.java | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java 
b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
index 5741498..957a55c 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -407,8 +407,13 @@ public class Nio2Endpoint extends 
AbstractJsseEndpoint

[tomcat] branch 8.5.x updated: Fix BZ 64921. LoadBalancerDrainingValve sets correct cookie secure attr

2020-11-19 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 375e35c  Fix BZ 64921. LoadBalancerDrainingValve sets correct cookie 
secure attr
375e35c is described below

commit 375e35c11d0b52ad9be1e888ec410196a819c0c9
Author: Mark Thomas 
AuthorDate: Thu Nov 19 14:49:05 2020 +

Fix BZ 64921. LoadBalancerDrainingValve sets correct cookie secure attr

https://bz.apache.org/bugzilla/show_bug.cgi?id=64921
Based on a pull request by Andreas Kurth
---
 .../catalina/valves/LoadBalancerDrainingValve.java |  4 
 .../catalina/valves/TestLoadBalancerDrainingValve.java | 18 --
 webapps/docs/changelog.xml |  9 +
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java 
b/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
index 002013b..d2bf9d4 100644
--- a/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
+++ b/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
@@ -19,6 +19,7 @@ package org.apache.catalina.valves;
 import java.io.IOException;
 
 import javax.servlet.ServletException;
+import javax.servlet.SessionCookieConfig;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletResponse;
 
@@ -222,6 +223,9 @@ public class LoadBalancerDrainingValve extends ValveBase {
 
sessionCookie.setPath(SessionConfig.getSessionCookiePath(request.getContext()));
 sessionCookie.setMaxAge(0); // Delete
 sessionCookie.setValue(""); // Purge the cookie's value
+// Replicate logic used to set secure attribute for session 
cookies
+SessionCookieConfig sessionCookieConfig = 
request.getContext().getServletContext().getSessionCookieConfig();
+sessionCookie.setSecure(request.isSecure() || 
sessionCookieConfig.isSecure());
 response.addCookie(sessionCookie);
 }
 
diff --git a/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java 
b/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
index 9f32f11..a7b710c 100644
--- a/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
+++ b/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
@@ -55,8 +55,12 @@ public class TestLoadBalancerDrainingValve {
 Boolean expectInvokeNext = 
Boolean.valueOf("ACT".equals(jkActivation) || enableIgnore.booleanValue() ||
 validSessionId.booleanValue());
 for (String queryString : queryStrings) {
-parameterSets.add(new Object[] { jkActivation, 
validSessionId, expectInvokeNext,
-enableIgnore, queryString});
+for (Boolean secureRequest : booleans) {
+for (Boolean secureSessionConfig : booleans) {
+parameterSets.add(new Object[] { 
jkActivation, validSessionId, expectInvokeNext,
+enableIgnore, queryString, 
secureRequest, secureSessionConfig});
+}
+}
 }
 }
 }
@@ -80,6 +84,13 @@ public class TestLoadBalancerDrainingValve {
 @Parameter(4)
 public String queryString;
 
+@Parameter(5)
+public Boolean secureRequest;
+
+@Parameter(6)
+public boolean secureSessionConfig;
+
+
 @Test
 public void runValve() throws Exception {
 IMocksControl control = EasyMock.createControl();
@@ -95,6 +106,7 @@ public class TestLoadBalancerDrainingValve {
 cookieConfig.setDomain("example.com");
 cookieConfig.setName(sessionCookieName);
 cookieConfig.setPath("/");
+cookieConfig.setSecure(secureSessionConfig);
 
 // Valve.init requires all of this stuff
 EasyMock.expect(ctx.getMBeanKeyProperties()).andStubReturn("");
@@ -137,6 +149,8 @@ public class TestLoadBalancerDrainingValve {
 expectedCookie.setPath(cookieConfig.getPath());
 expectedCookie.setMaxAge(0);
 
+
EasyMock.expect(Boolean.valueOf(request.isSecure())).andReturn(secureRequest);
+
 // These two lines just mean 
EasyMock.expect(response.addCookie) but for a void method
 response.addCookie(expectedCookie);
 
EasyMock.expect(ctx.getSessionCookieName()).andReturn(sessionCookieName); // 
Indirect call
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0983f71..443c857 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/do

[tomcat] branch 9.0.x updated: Fix BZ 64921. LoadBalancerDrainingValve sets correct cookie secure attr

2020-11-19 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 9c659dd  Fix BZ 64921. LoadBalancerDrainingValve sets correct cookie 
secure attr
9c659dd is described below

commit 9c659dd2ae3b617517539e647ca7fd1ab03276fe
Author: Mark Thomas 
AuthorDate: Thu Nov 19 14:49:05 2020 +

Fix BZ 64921. LoadBalancerDrainingValve sets correct cookie secure attr

https://bz.apache.org/bugzilla/show_bug.cgi?id=64921
Based on a pull request by Andreas Kurth
---
 .../catalina/valves/LoadBalancerDrainingValve.java |  4 
 .../catalina/valves/TestLoadBalancerDrainingValve.java | 18 --
 webapps/docs/changelog.xml |  9 +
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java 
b/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
index 002013b..d2bf9d4 100644
--- a/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
+++ b/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
@@ -19,6 +19,7 @@ package org.apache.catalina.valves;
 import java.io.IOException;
 
 import javax.servlet.ServletException;
+import javax.servlet.SessionCookieConfig;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletResponse;
 
@@ -222,6 +223,9 @@ public class LoadBalancerDrainingValve extends ValveBase {
 
sessionCookie.setPath(SessionConfig.getSessionCookiePath(request.getContext()));
 sessionCookie.setMaxAge(0); // Delete
 sessionCookie.setValue(""); // Purge the cookie's value
+// Replicate logic used to set secure attribute for session 
cookies
+SessionCookieConfig sessionCookieConfig = 
request.getContext().getServletContext().getSessionCookieConfig();
+sessionCookie.setSecure(request.isSecure() || 
sessionCookieConfig.isSecure());
 response.addCookie(sessionCookie);
 }
 
diff --git a/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java 
b/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
index 9f32f11..a7b710c 100644
--- a/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
+++ b/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
@@ -55,8 +55,12 @@ public class TestLoadBalancerDrainingValve {
 Boolean expectInvokeNext = 
Boolean.valueOf("ACT".equals(jkActivation) || enableIgnore.booleanValue() ||
 validSessionId.booleanValue());
 for (String queryString : queryStrings) {
-parameterSets.add(new Object[] { jkActivation, 
validSessionId, expectInvokeNext,
-enableIgnore, queryString});
+for (Boolean secureRequest : booleans) {
+for (Boolean secureSessionConfig : booleans) {
+parameterSets.add(new Object[] { 
jkActivation, validSessionId, expectInvokeNext,
+enableIgnore, queryString, 
secureRequest, secureSessionConfig});
+}
+}
 }
 }
 }
@@ -80,6 +84,13 @@ public class TestLoadBalancerDrainingValve {
 @Parameter(4)
 public String queryString;
 
+@Parameter(5)
+public Boolean secureRequest;
+
+@Parameter(6)
+public boolean secureSessionConfig;
+
+
 @Test
 public void runValve() throws Exception {
 IMocksControl control = EasyMock.createControl();
@@ -95,6 +106,7 @@ public class TestLoadBalancerDrainingValve {
 cookieConfig.setDomain("example.com");
 cookieConfig.setName(sessionCookieName);
 cookieConfig.setPath("/");
+cookieConfig.setSecure(secureSessionConfig);
 
 // Valve.init requires all of this stuff
 EasyMock.expect(ctx.getMBeanKeyProperties()).andStubReturn("");
@@ -137,6 +149,8 @@ public class TestLoadBalancerDrainingValve {
 expectedCookie.setPath(cookieConfig.getPath());
 expectedCookie.setMaxAge(0);
 
+
EasyMock.expect(Boolean.valueOf(request.isSecure())).andReturn(secureRequest);
+
 // These two lines just mean 
EasyMock.expect(response.addCookie) but for a void method
 response.addCookie(expectedCookie);
 
EasyMock.expect(ctx.getSessionCookieName()).andReturn(sessionCookieName); // 
Indirect call
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5857785..1555f20 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/do

[tomcat] branch master updated: Fix BZ 64921. LoadBalancerDrainingValve sets correct cookie secure attr

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

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


The following commit(s) were added to refs/heads/master by this push:
 new fe8472d  Fix BZ 64921. LoadBalancerDrainingValve sets correct cookie 
secure attr
fe8472d is described below

commit fe8472d62b11a027d0fc1ec10c8849fc4ef639a9
Author: Mark Thomas 
AuthorDate: Thu Nov 19 14:49:05 2020 +

Fix BZ 64921. LoadBalancerDrainingValve sets correct cookie secure attr

https://bz.apache.org/bugzilla/show_bug.cgi?id=64921
Based on a pull request by Andreas Kurth
---
 .../catalina/valves/LoadBalancerDrainingValve.java |  4 
 .../catalina/valves/TestLoadBalancerDrainingValve.java | 18 --
 webapps/docs/changelog.xml |  9 +
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java 
b/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
index 1d6b8be..7ef9386 100644
--- a/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
+++ b/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
@@ -19,6 +19,7 @@ package org.apache.catalina.valves;
 import java.io.IOException;
 
 import jakarta.servlet.ServletException;
+import jakarta.servlet.SessionCookieConfig;
 import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletResponse;
 
@@ -222,6 +223,9 @@ public class LoadBalancerDrainingValve extends ValveBase {
 
sessionCookie.setPath(SessionConfig.getSessionCookiePath(request.getContext()));
 sessionCookie.setMaxAge(0); // Delete
 sessionCookie.setValue(""); // Purge the cookie's value
+// Replicate logic used to set secure attribute for session 
cookies
+SessionCookieConfig sessionCookieConfig = 
request.getContext().getServletContext().getSessionCookieConfig();
+sessionCookie.setSecure(request.isSecure() || 
sessionCookieConfig.isSecure());
 response.addCookie(sessionCookie);
 }
 
diff --git a/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java 
b/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
index a45d274..7c670bc 100644
--- a/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
+++ b/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
@@ -55,8 +55,12 @@ public class TestLoadBalancerDrainingValve {
 Boolean expectInvokeNext = 
Boolean.valueOf("ACT".equals(jkActivation) || enableIgnore.booleanValue() ||
 validSessionId.booleanValue());
 for (String queryString : queryStrings) {
-parameterSets.add(new Object[] { jkActivation, 
validSessionId, expectInvokeNext,
-enableIgnore, queryString});
+for (Boolean secureRequest : booleans) {
+for (Boolean secureSessionConfig : booleans) {
+parameterSets.add(new Object[] { 
jkActivation, validSessionId, expectInvokeNext,
+enableIgnore, queryString, 
secureRequest, secureSessionConfig});
+}
+}
 }
 }
 }
@@ -80,6 +84,13 @@ public class TestLoadBalancerDrainingValve {
 @Parameter(4)
 public String queryString;
 
+@Parameter(5)
+public Boolean secureRequest;
+
+@Parameter(6)
+public boolean secureSessionConfig;
+
+
 @Test
 public void runValve() throws Exception {
 IMocksControl control = EasyMock.createControl();
@@ -95,6 +106,7 @@ public class TestLoadBalancerDrainingValve {
 cookieConfig.setDomain("example.com");
 cookieConfig.setName(sessionCookieName);
 cookieConfig.setPath("/");
+cookieConfig.setSecure(secureSessionConfig);
 
 // Valve.init requires all of this stuff
 EasyMock.expect(ctx.getMBeanKeyProperties()).andStubReturn("");
@@ -137,6 +149,8 @@ public class TestLoadBalancerDrainingValve {
 expectedCookie.setPath(cookieConfig.getPath());
 expectedCookie.setMaxAge(0);
 
+
EasyMock.expect(Boolean.valueOf(request.isSecure())).andReturn(secureRequest);
+
 // These two lines just mean 
EasyMock.expect(response.addCookie) but for a void method
 response.addCookie(expectedCookie);
 
EasyMock.expect(ctx.getSessionCookieName()).andReturn(sessionCookieName); // 
Indirect call
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8d615bc..3ad87f3 100644
--- a/webapps/docs/changelog.xml

[tomcat] branch 8.5.x updated: Parameterise test for LoadBalancerDrainingValve

2020-11-19 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 b2f4440  Parameterise test for LoadBalancerDrainingValve
b2f4440 is described below

commit b2f444052c9f6acc5de7027fb6594a30b6072e22
Author: Mark Thomas 
AuthorDate: Thu Nov 19 14:37:02 2020 +

Parameterise test for LoadBalancerDrainingValve
---
 .../valves/TestLoadBalancerDrainingValve.java  | 266 +++--
 1 file changed, 136 insertions(+), 130 deletions(-)

diff --git a/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java 
b/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
index 0c5694c..9f32f11 100644
--- a/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
+++ b/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
@@ -16,6 +16,7 @@
 package org.apache.catalina.valves;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 import javax.servlet.ServletContext;
@@ -23,6 +24,10 @@ import javax.servlet.SessionCookieConfig;
 import javax.servlet.http.Cookie;
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
 
 import org.apache.catalina.Context;
 import org.apache.catalina.Valve;
@@ -32,28 +37,143 @@ import org.apache.catalina.core.StandardPipeline;
 import org.easymock.EasyMock;
 import org.easymock.IMocksControl;
 
+@RunWith(Parameterized.class)
 public class TestLoadBalancerDrainingValve {
 
-static class MockResponse extends Response {
-private List cookies;
-@Override
-public boolean isCommitted() {
-return false;
+@Parameters(name = "{index}: activation[{0}], validSessionID[{1}], 
expectInvokeNext[{2}], enableIgnore[{3}], " +
+"queryString[{4}]")
+public static Collection parameters() {
+
+String[] jkActivations = new String[] { "ACT", "DIS" };
+Boolean[] booleans = new Boolean[] { Boolean.TRUE, Boolean.FALSE };
+String[] queryStrings = new String[] { null, "foo=bar" };
+
+List parameterSets = new ArrayList<>();
+for (String jkActivation : jkActivations) {
+for (Boolean validSessionId : booleans) {
+for (Boolean enableIgnore : booleans) {
+Boolean expectInvokeNext = 
Boolean.valueOf("ACT".equals(jkActivation) || enableIgnore.booleanValue() ||
+validSessionId.booleanValue());
+for (String queryString : queryStrings) {
+parameterSets.add(new Object[] { jkActivation, 
validSessionId, expectInvokeNext,
+enableIgnore, queryString});
+}
+}
+}
+}
+return parameterSets;
+}
+
+
+@Parameter(0)
+public String jkActivation;
+
+@Parameter(1)
+public boolean validSessionId;
+
+@Parameter(2)
+public boolean expectInvokeNext;
+
+@Parameter(3)
+public boolean enableIgnore;
+
+@Parameter(4)
+public String queryString;
+
+@Test
+public void runValve() throws Exception {
+IMocksControl control = EasyMock.createControl();
+ServletContext servletContext = 
control.createMock(ServletContext.class);
+Context ctx = control.createMock(Context.class);
+Request request = control.createMock(Request.class);
+Response response = control.createMock(Response.class);
+
+String sessionCookieName = "JSESSIONID";
+String sessionId = "cafebabe";
+String requestURI = "/test/path";
+SessionCookieConfig cookieConfig = new CookieConfig();
+cookieConfig.setDomain("example.com");
+cookieConfig.setName(sessionCookieName);
+cookieConfig.setPath("/");
+
+// Valve.init requires all of this stuff
+EasyMock.expect(ctx.getMBeanKeyProperties()).andStubReturn("");
+EasyMock.expect(ctx.getName()).andStubReturn("");
+EasyMock.expect(ctx.getPipeline()).andStubReturn(new 
StandardPipeline());
+EasyMock.expect(ctx.getDomain()).andStubReturn("foo");
+
EasyMock.expect(ctx.getLogger()).andStubReturn(org.apache.juli.logging.LogFactory.getLog(LoadBalancerDrainingValve.class));
+EasyMock.expect(ctx.getServletContext()).andStubReturn(servletContext);
+
+// Set up the actual test
+
EasyMock.expect(request.getAttribute(LoadBalancerDrainingValve.ATTRIBUTE_KEY_JK_LB_ACTIVATION)).andStubReturn(jkActivation);
+
EasyMock.expect(

[tomcat] branch 9.0.x updated: Parameterise test for LoadBalancerDrainingValve

2020-11-19 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 6e68b62  Parameterise test for LoadBalancerDrainingValve
6e68b62 is described below

commit 6e68b62cd11e2ecdd0658f9ed7bdd34eabf218bd
Author: Mark Thomas 
AuthorDate: Thu Nov 19 14:37:02 2020 +

Parameterise test for LoadBalancerDrainingValve
---
 .../valves/TestLoadBalancerDrainingValve.java  | 266 +++--
 1 file changed, 136 insertions(+), 130 deletions(-)

diff --git a/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java 
b/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
index 0c5694c..9f32f11 100644
--- a/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
+++ b/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
@@ -16,6 +16,7 @@
 package org.apache.catalina.valves;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 import javax.servlet.ServletContext;
@@ -23,6 +24,10 @@ import javax.servlet.SessionCookieConfig;
 import javax.servlet.http.Cookie;
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
 
 import org.apache.catalina.Context;
 import org.apache.catalina.Valve;
@@ -32,28 +37,143 @@ import org.apache.catalina.core.StandardPipeline;
 import org.easymock.EasyMock;
 import org.easymock.IMocksControl;
 
+@RunWith(Parameterized.class)
 public class TestLoadBalancerDrainingValve {
 
-static class MockResponse extends Response {
-private List cookies;
-@Override
-public boolean isCommitted() {
-return false;
+@Parameters(name = "{index}: activation[{0}], validSessionID[{1}], 
expectInvokeNext[{2}], enableIgnore[{3}], " +
+"queryString[{4}]")
+public static Collection parameters() {
+
+String[] jkActivations = new String[] { "ACT", "DIS" };
+Boolean[] booleans = new Boolean[] { Boolean.TRUE, Boolean.FALSE };
+String[] queryStrings = new String[] { null, "foo=bar" };
+
+List parameterSets = new ArrayList<>();
+for (String jkActivation : jkActivations) {
+for (Boolean validSessionId : booleans) {
+for (Boolean enableIgnore : booleans) {
+Boolean expectInvokeNext = 
Boolean.valueOf("ACT".equals(jkActivation) || enableIgnore.booleanValue() ||
+validSessionId.booleanValue());
+for (String queryString : queryStrings) {
+parameterSets.add(new Object[] { jkActivation, 
validSessionId, expectInvokeNext,
+enableIgnore, queryString});
+}
+}
+}
+}
+return parameterSets;
+}
+
+
+@Parameter(0)
+public String jkActivation;
+
+@Parameter(1)
+public boolean validSessionId;
+
+@Parameter(2)
+public boolean expectInvokeNext;
+
+@Parameter(3)
+public boolean enableIgnore;
+
+@Parameter(4)
+public String queryString;
+
+@Test
+public void runValve() throws Exception {
+IMocksControl control = EasyMock.createControl();
+ServletContext servletContext = 
control.createMock(ServletContext.class);
+Context ctx = control.createMock(Context.class);
+Request request = control.createMock(Request.class);
+Response response = control.createMock(Response.class);
+
+String sessionCookieName = "JSESSIONID";
+String sessionId = "cafebabe";
+String requestURI = "/test/path";
+SessionCookieConfig cookieConfig = new CookieConfig();
+cookieConfig.setDomain("example.com");
+cookieConfig.setName(sessionCookieName);
+cookieConfig.setPath("/");
+
+// Valve.init requires all of this stuff
+EasyMock.expect(ctx.getMBeanKeyProperties()).andStubReturn("");
+EasyMock.expect(ctx.getName()).andStubReturn("");
+EasyMock.expect(ctx.getPipeline()).andStubReturn(new 
StandardPipeline());
+EasyMock.expect(ctx.getDomain()).andStubReturn("foo");
+
EasyMock.expect(ctx.getLogger()).andStubReturn(org.apache.juli.logging.LogFactory.getLog(LoadBalancerDrainingValve.class));
+EasyMock.expect(ctx.getServletContext()).andStubReturn(servletContext);
+
+// Set up the actual test
+
EasyMock.expect(request.getAttribute(LoadBalancerDrainingValve.ATTRIBUTE_KEY_JK_LB_ACTIVATION)).andStubReturn(jkActivation);
+
EasyMock.expect(

[tomcat] branch master updated: Parameterise test for LoadBalancerDrainingValve

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

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


The following commit(s) were added to refs/heads/master by this push:
 new d1a23ea  Parameterise test for LoadBalancerDrainingValve
d1a23ea is described below

commit d1a23ea387acae51b75776f67726f176342f9329
Author: Mark Thomas 
AuthorDate: Thu Nov 19 14:37:02 2020 +

Parameterise test for LoadBalancerDrainingValve
---
 .../valves/TestLoadBalancerDrainingValve.java  | 266 +++--
 1 file changed, 136 insertions(+), 130 deletions(-)

diff --git a/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java 
b/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
index 4557953..a45d274 100644
--- a/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
+++ b/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
@@ -16,6 +16,7 @@
 package org.apache.catalina.valves;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 import jakarta.servlet.ServletContext;
@@ -23,6 +24,10 @@ import jakarta.servlet.SessionCookieConfig;
 import jakarta.servlet.http.Cookie;
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
 
 import org.apache.catalina.Context;
 import org.apache.catalina.Valve;
@@ -32,28 +37,143 @@ import org.apache.catalina.core.StandardPipeline;
 import org.easymock.EasyMock;
 import org.easymock.IMocksControl;
 
+@RunWith(Parameterized.class)
 public class TestLoadBalancerDrainingValve {
 
-static class MockResponse extends Response {
-private List cookies;
-@Override
-public boolean isCommitted() {
-return false;
+@Parameters(name = "{index}: activation[{0}], validSessionID[{1}], 
expectInvokeNext[{2}], enableIgnore[{3}], " +
+"queryString[{4}]")
+public static Collection parameters() {
+
+String[] jkActivations = new String[] { "ACT", "DIS" };
+Boolean[] booleans = new Boolean[] { Boolean.TRUE, Boolean.FALSE };
+String[] queryStrings = new String[] { null, "foo=bar" };
+
+List parameterSets = new ArrayList<>();
+for (String jkActivation : jkActivations) {
+for (Boolean validSessionId : booleans) {
+for (Boolean enableIgnore : booleans) {
+Boolean expectInvokeNext = 
Boolean.valueOf("ACT".equals(jkActivation) || enableIgnore.booleanValue() ||
+validSessionId.booleanValue());
+for (String queryString : queryStrings) {
+parameterSets.add(new Object[] { jkActivation, 
validSessionId, expectInvokeNext,
+enableIgnore, queryString});
+}
+}
+}
+}
+return parameterSets;
+}
+
+
+@Parameter(0)
+public String jkActivation;
+
+@Parameter(1)
+public boolean validSessionId;
+
+@Parameter(2)
+public boolean expectInvokeNext;
+
+@Parameter(3)
+public boolean enableIgnore;
+
+@Parameter(4)
+public String queryString;
+
+@Test
+public void runValve() throws Exception {
+IMocksControl control = EasyMock.createControl();
+ServletContext servletContext = 
control.createMock(ServletContext.class);
+Context ctx = control.createMock(Context.class);
+Request request = control.createMock(Request.class);
+Response response = control.createMock(Response.class);
+
+String sessionCookieName = "JSESSIONID";
+String sessionId = "cafebabe";
+String requestURI = "/test/path";
+SessionCookieConfig cookieConfig = new CookieConfig();
+cookieConfig.setDomain("example.com");
+cookieConfig.setName(sessionCookieName);
+cookieConfig.setPath("/");
+
+// Valve.init requires all of this stuff
+EasyMock.expect(ctx.getMBeanKeyProperties()).andStubReturn("");
+EasyMock.expect(ctx.getName()).andStubReturn("");
+EasyMock.expect(ctx.getPipeline()).andStubReturn(new 
StandardPipeline());
+EasyMock.expect(ctx.getDomain()).andStubReturn("foo");
+
EasyMock.expect(ctx.getLogger()).andStubReturn(org.apache.juli.logging.LogFactory.getLog(LoadBalancerDrainingValve.class));
+EasyMock.expect(ctx.getServletContext()).andStubReturn(servletContext);
+
+// Set up the actual test
+
EasyMock.expect(request.getAttribute(LoadBalancerDrainingValve.ATTRIBUTE_KEY_JK_LB_ACTIVATION)).andStubReturn(jkActivation);
+
EasyMo

[tomcat] branch 8.5.x updated: Add release date for 8.5.60

2020-11-19 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 eecc8c8  Add release date for 8.5.60
eecc8c8 is described below

commit eecc8c864a8da3371184a01eeab32d8c2d2a6146
Author: Mark Thomas 
AuthorDate: Thu Nov 19 11:14:22 2020 +

Add release date for 8.5.60
---
 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 efadd26..0983f71 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



[tomcat] branch 9.0.x updated: Add release date for 9.0.40

2020-11-19 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 52b76c2  Add release date for 9.0.40
52b76c2 is described below

commit 52b76c2f44716d90c25033932e21aec5f16a5611
Author: Mark Thomas 
AuthorDate: Thu Nov 19 11:13:34 2020 +

Add release date for 9.0.40
---
 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 2d62b47..5857785 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -119,7 +119,7 @@
 
   
 
-
+
   
 
   


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



[tomcat] branch master updated (3f3150f -> a330f8e)

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

markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from 3f3150f  Followup for bug 64931 - Declare additional elements used in 
other versions of Tomcat.
 add a330f8e  Add release date for 10.0.0-M10

No new revisions were added by this update.

Summary of changes:
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


-
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 release date for 9.0.40

2020-11-19 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 52b76c2  Add release date for 9.0.40
52b76c2 is described below

commit 52b76c2f44716d90c25033932e21aec5f16a5611
Author: Mark Thomas 
AuthorDate: Thu Nov 19 11:13:34 2020 +

Add release date for 9.0.40
---
 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 2d62b47..5857785 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -119,7 +119,7 @@
 
   
 
-
+
   
 
   


-
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 release date for 8.5.60

2020-11-19 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 eecc8c8  Add release date for 8.5.60
eecc8c8 is described below

commit eecc8c864a8da3371184a01eeab32d8c2d2a6146
Author: Mark Thomas 
AuthorDate: Thu Nov 19 11:14:22 2020 +

Add release date for 8.5.60
---
 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 efadd26..0983f71 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



[tomcat] branch master updated (3f3150f -> a330f8e)

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

markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from 3f3150f  Followup for bug 64931 - Declare additional elements used in 
other versions of Tomcat.
 add a330f8e  Add release date for 10.0.0-M10

No new revisions were added by this update.

Summary of changes:
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


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



  1   2   3   4   5   6   7   8   9   10   >