[tomcat] branch 8.5.x updated: Increment version number for next development cycle

[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 faf9d47  Increment version number for next development cycle
faf9d47 is described below

commit faf9d47462efa4759fd4a266ca39fed580b8977a
Author: Mark Thomas 
AuthorDate: Tue May 5 23:40:34 2020 +0100

Increment version number 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 f53c4f1..a4b71fc 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=8
 version.minor=5
-version.build=55
+version.build=56
 version.patch=0
 version.suffix=-dev
 
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 14bed64..5898a318 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.55
+maven.asf.release.deploy.version=8.5.56
 
 #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 ce402cf..ae3375d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -44,7 +44,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 master updated: Increment version number for next development cycle

[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 019c5e3  Increment version number for next development cycle
019c5e3 is described below

commit 019c5e339fec13df3437e0d51bb8c31ed1f83ddf
Author: Mark Thomas 
AuthorDate: Tue May 5 22:59:49 2020 +0100

Increment version number 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 d550071..85bb862 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=-M5-dev
+version.suffix=-M6-dev
 
 # - Source control flags -
 git.branch=master
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 11d0087..fd13591 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-M5
+maven.asf.release.deploy.version=10.0.0-M6
 
 #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 c47f1f4..ab76d56 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -44,7 +44,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 number for next dev cycle

[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 2d67e65  Increment version number for next dev cycle
2d67e65 is described below

commit 2d67e6537abf6e62dafb2295860c5e6443cbae56
Author: Mark Thomas 
AuthorDate: Tue May 5 23:01:00 2020 +0100

Increment version number for next dev 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 54ef861..4555662 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=9
 version.minor=0
-version.build=35
+version.build=36
 version.patch=0
 version.suffix=-dev
 
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 38b9d08..7a33008 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.35
+maven.asf.release.deploy.version=9.0.36
 
 #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 3cb4b57..93744d0 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -44,7 +44,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

[VOTE] Release Apache Tomcat 8.5.55

[Mark Thomas]

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

The major changes compared to the 8.5.54 release are:

- Improve the handling of requests that use an expectation. Do not
  disable keep-alive where the response has a non-2xx status code
  but the request body has been fully read.

- Change default value separator for property replacement to ":-"
  due to possible conflicts. The syntax is now "${name:-default}".

- Update the packaged version of the Tomcat Native Library to 1.2.24.

Along with lots of other bug fixes and improvements.

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

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.55/

The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1267/

The tag is:
https://github.com/apache/tomcat/tree/8.5.55
c8a57e4a2db8e5af314bae48123fb5990da5b7a5

The proposed 8.5.55 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 8.5.55

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

Nexus: Staging Completed

[Nexus Repository Manager]

Message from: https://repository.apache.orgDeployer properties:"userAgent" = "maven-artifact/2.2.1 (Java 1.7.0_80; Windows 8.1 6.3)""userId" = "markt""ip" = "86.135.90.21"Details:The following artifacts have been staged/org/apache/tomcat/tomcat-i18n-de/8.5.55/tomcat-i18n-de-8.5.55.jar(SHA1: 78031df19e91800753b3a73fa6ca696aceeef2ce)/org/apache/tomcat/tomcat-i18n-de/8.5.55/tomcat-i18n-de-8.5.55.pom(SHA1: 2428881eaf650e35be6861453238e69007d16ce8)/org/apache/tomcat/tomcat-i18n-de/8.5.55/tomcat-i18n-de-8.5.55.jar.asc(SHA1: 544d555ecc79a5440a034616aa562f703b41126a)/org/apache/tomcat/tomcat-i18n-de/8.5.55/tomcat-i18n-de-8.5.55.pom.asc(SHA1: 4b927f0beb206a1abe3e44cb0d67407a1d2c9703)/org/apache/tomcat/tomcat-jni/8.5.55/tomcat-jni-8.5.55-sources.jar.asc(SHA1: 844a4d6b4878e84b2f17cc1de035bcd781bb1857)/org/apache/tomcat/tomcat-jni/8.5.55/tomcat-jni-8.5.55.pom(SHA1: 025710afac23800d42c9e375eab497657a90c173)/org/apache/tomcat/tomcat-jni/8.5.55/tomcat-jni-8.5.55.jar.asc(SHA1: 80471dac1af633020ed4813589aaed055a8e9de6)/org/apache/tomcat/tomcat-jni/8.5.55/tomcat-jni-8.5.55.pom.asc(SHA1: 635fa2d8c361bae87ea5f7b2726ea1b9e07c3855)/org/apache/tomcat/tomcat-jni/8.5.55/tomcat-jni-8.5.55-sources.jar(SHA1: b728fb3fb54907c66f731dcd0d61efc0b4dc03ae)/org/apache/tomcat/tomcat-jni/8.5.55/tomcat-jni-8.5.55.jar(SHA1: a8ddbc2b74e3f411e2051a43e67ebf9c3d6ccecd)/org/apache/tomcat/tomcat-juli/8.5.55/tomcat-juli-8.5.55-sources.jar.asc(SHA1: d0c9f88f6a37fa636e89dc53b8e8783424d311ba)/org/apache/tomcat/tomcat-juli/8.5.55/tomcat-juli-8.5.55.jar(SHA1: 3efd98706df760aaf4ff4155c29185230e1ee063)/org/apache/tomcat/tomcat-juli/8.5.55/tomcat-juli-8.5.55.pom(SHA1: c1e35b3217ff8bb15af021eae6fb2981e2a68a3e)/org/apache/tomcat/tomcat-juli/8.5.55/tomcat-juli-8.5.55-sources.jar(SHA1: f69d158337ba32730750ee7521133f66a5adf33e)/org/apache/tomcat/tomcat-juli/8.5.55/tomcat-juli-8.5.55.pom.asc(SHA1: 0e9fe1ee3c994f2e26bda7e4c64ee2719ca96bbf)/org/apache/tomcat/tomcat-juli/8.5.55/tomcat-juli-8.5.55.jar.asc(SHA1: d3c501981f5c9fba9647fb4356849d2f13ee1e5e)/org/apache/tomcat/tomcat-util/8.5.55/tomcat-util-8.5.55-sources.jar(SHA1: 8b34c207126c1c1a0fbcde6777cdba6ff3036db1)/org/apache/tomcat/tomcat-util/8.5.55/tomcat-util-8.5.55.pom(SHA1: d06a9adf197953ff8cfbd2685ca7740ed86320a4)/org/apache/tomcat/tomcat-util/8.5.55/tomcat-util-8.5.55.jar.asc(SHA1: 5b3bf8ffbff6fbf4f6aa387958a2f8248cb02f8f)/org/apache/tomcat/tomcat-util/8.5.55/tomcat-util-8.5.55.jar(SHA1: 762a8962eeb3c3f02e8338cf4ee53fba949cd1aa)/org/apache/tomcat/tomcat-util/8.5.55/tomcat-util-8.5.55.pom.asc(SHA1: 4c6b3df6393c4f549f28df54da5fd3d0cfb823ba)/org/apache/tomcat/tomcat-util/8.5.55/tomcat-util-8.5.55-sources.jar.asc(SHA1: 9d4342aaded5cbbb587d9a62008e8a566a148cda)/org/apache/tomcat/tomcat-catalina/8.5.55/tomcat-catalina-8.5.55.pom.asc(SHA1: b1537bce0a13c0fd4a32560936c145245100a42f)/org/apache/tomcat/tomcat-catalina/8.5.55/tomcat-catalina-8.5.55-sources.jar.asc(SHA1: 8fbc7b141fd0671cef264d6c99b3a7b360cd1537)/org/apache/tomcat/tomcat-catalina/8.5.55/tomcat-catalina-8.5.55.pom(SHA1: 20031fc08556c4bdfeb4468c9297b872c1d11846)/org/apache/tomcat/tomcat-catalina/8.5.55/tomcat-catalina-8.5.55-sources.jar(SHA1: eb8f93c7e191d8c0008799cab8543a25a9061fd1)/org/apache/tomcat/tomcat-catalina/8.5.55/tomcat-catalina-8.5.55.jar(SHA1: 8c8a16d519ee46d585ee73576fc0a296cdd60bee)/org/apache/tomcat/tomcat-catalina/8.5.55/tomcat-catalina-8.5.55.jar.asc(SHA1: 94fc6b40484c03171019b8c98d367228d8fffe3d)/org/apache/tomcat/tomcat-catalina-ws/8.5.55/tomcat-catalina-ws-8.5.55-sources.jar(SHA1: 0d14c731471ec9434fc628d7af0a7bd7b80f1d39)/org/apache/tomcat/tomcat-catalina-ws/8.5.55/tomcat-catalina-ws-8.5.55.jar.asc(SHA1: b506ad8bda57e85336afe1c18a6eacfc064ab59d)/org/apache/tomcat/tomcat-catalina-ws/8.5.55/tomcat-catalina-ws-8.5.55-sources.jar.asc(SHA1: 22bf15df90b3fbc6534950c6acd15b7e3dd60f50)/org/apache/tomcat/tomcat-catalina-ws/8.5.55/tomcat-catalina-ws-8.5.55.jar(SHA1: f11f8988944e912c77fc8a3312092116be3c156b)/org/apache/tomcat/tomcat-catalina-ws/8.5.55/tomcat-catalina-ws-8.5.55.pom.asc(SHA1: 95101df925082bcac66829b45b50046435aaf2cd)/org/apache/tomcat/tomcat-catalina-ws/8.5.55/tomcat-catalina-ws-8.5.55.pom(SHA1: 1a6b1d8f7d1e3443dbbb1ab1cbfdeab195f8c7d6)/org/apache/tomcat/tomcat-i18n-fr/8.5.55/tomcat-i18n-fr-8.5.55.pom.asc(SHA1: e33eb9c9b89bc95bf3d6e08e9bc09ea55874f12c)/org/apache/tomcat/tomcat-i18n-fr/8.5.55/tomcat-i18n-fr-8.5.55.jar(SHA1: fbbc6206e7dc8ca79910b0836c693d858ac1ff80)/org/apache/tomcat/tomcat-i18n-fr/8.5.55/tomcat-i18n-fr-8.5.55.pom(SHA1: 0d19d9e3f9e9bf2a1975ab5ed3f2af1c54be160c)/org/apache/tomcat/tomcat-i18n-fr/8.5.55/tomcat-i18n-fr-8.5.55.jar.asc(SHA1: 721fa3e3ff2685fc2a7f26ec6a3ccb65205566ee)/org/apache/tomcat/tomcat-jdbc/8.5.55/tomcat-jdbc-8.5.55.jar.asc(SHA1: 30d4acabfab79ac2407614ba38834cd992c00f9f)/org/apache/tomcat/tomcat-jdbc/8.5.55/tomcat-jdbc-8.5.55.jar(SHA1: f18e34ffb584f37a521d431c3b6988ab5631b03f)/org/apache/tomcat/tomcat-jdbc/8.5.55/tomcat-jdbc-8.5.55.pom.asc(SHA1: 

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

[markt]

Author: markt
Date: Tue May  5 22:25:49 2020
New Revision: 39298

Log:
Upload 8.5.55 for voting

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

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

Added: dev/tomcat/tomcat-8/v8.5.55/KEYS
==
--- dev/tomcat/tomcat-8/v8.5.55/KEYS (added)
+++ dev/tomcat/tomcat-8/v8.5.55/KEYS Tue May  5 22:25:49 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 
+
+mQGiBDtAWuURBADZ0KUEyUkSUiTA09e7tvEbX25STsjxrR+DNTainCls+XlkVOij
+gBv216lqge9tIsS0L6hCP4OQbFf/64qVtJssX4QXdyiZGb5wpmcj0Mz602Ew8r+N
+I0S5NvmogoYWW7BlP4r61jNxO5zrr03KaijM5r4ipJdLUxyOmM6P2jRPUwCg/5gm
+bpqiYl7pXX5FgDeB36tmD+UD/06iLqOnoiKO0vMbOk7URclhCObMNrHqxTxozMTS
+B9soYURbIeArei+plYo2n+1qB12ayybjhVu3uksXRdT9bEkyxMfslvLbIpDAG8Cz

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

[markt]

Added: dev/tomcat/tomcat-8/v8.5.55/src/apache-tomcat-8.5.55-src.zip.asc
==
--- dev/tomcat/tomcat-8/v8.5.55/src/apache-tomcat-8.5.55-src.zip.asc (added)
+++ dev/tomcat/tomcat-8/v8.5.55/src/apache-tomcat-8.5.55-src.zip.asc Tue May  5 
22:25:49 2020
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAl6x5p8ACgkQEMAcWi9g
+Wecf1BAA7iWN1OqlXAJJA0SPqD+8p5ssnz9q11Tuszk0PdX3zQDML88SK2aTeJcp
+DG8R8PMsIDbatSd6n7LqeCPM5k3rcA2IzP/wY7RuWkUQhOkA7OvXK6CyxlFAETAe
+nMo1Q3WwCsmSgDLQbSlFSg8c4wbaBFU6UDEn6mK2RNA1nq1pmeY33XvMg7wGs3WE
+lVKWIHIHkLRSTL/yPMSJlXgUr7gc9xDYhnJ1jN5ysjdtJ4ia7wLhyUy/OLyNveFk
+alwLN909f1SE9OdBuwoZ6Bem8ET8tuwFehce1+r0O6Qsqyq0m5ogr1qbDIfc+rzR
+l7EIGyVczJzlLxSgwv3ffFkcizusOI+yg25nohgnCdS7wYLeVZkQdxNPhxiBW7KK
+u1aCqhzHD0YVBBznL5CmtFX641/nCPfOnjZnb/LXikgltOUbiPEh+MZMrLSWy8qU
+NuKUz4qMGXvaq4GDCdA4cV08h8jcOrcykGeXycm7hMeQpjk+B3vovXTCO2fpz/nT
+H3ClC920Tm8CMpX5sD1Tb8Qqq269ByUrN2OtzxfXsauu7daZKmxHyOwTcnxAvnCb
+VQ90DwdybHOL/UZexjjbXmN9oNR5JbuAzGombhogGHKC8ILLDvfJnwJyz7QCpJKz
+uxAjpPQfrOt/CuOWDHIQAWDz0s+mmqcM63D96lWouMTd0d99eN8=
+=kO8m
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-8/v8.5.55/src/apache-tomcat-8.5.55-src.zip.sha512
==
--- dev/tomcat/tomcat-8/v8.5.55/src/apache-tomcat-8.5.55-src.zip.sha512 (added)
+++ dev/tomcat/tomcat-8/v8.5.55/src/apache-tomcat-8.5.55-src.zip.sha512 Tue May 
 5 22:25:49 2020
@@ -0,0 +1 @@
+7b9ec3b0d741a012a69314d202d0315a5d68caa4dae0517a2029af87008a94f70c1ce5b0f239a58bb5b501b746d401caf6b404b25291154ef91824e21a1254b7
 *apache-tomcat-8.5.55-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] tag 8.5.55 created (now c8a57e4)

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


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

 new c8a57e4  Tag 8.5.55

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



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

[tomcat] 01/01: Tag 8.5.55

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit c8a57e4a2db8e5af314bae48123fb5990da5b7a5
Author: Mark Thomas 
AuthorDate: Tue May 5 22:54:38 2020 +0100

Tag 8.5.55
---
 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 f53c4f1..f26e0be 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=8
 version.minor=5
 version.build=55
 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 ce402cf..1add8f4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -44,7 +44,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

[VOTE] Release Apache Tomcat 9.0.35

[Mark Thomas]

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

The major changes compared to the 9.0.34 release are:

- Improve the handling of requests that use an expectation. Do not
  disable keep-alive where the response has a non-2xx status code
  but the request body has been fully read.

- Change default value separator for property replacement to ":-"
  due to possible conflicts. The syntax is now "${name:-default}".

- Update the packaged version of the Tomcat Native Library to 1.2.24.

Along with lots of other bug fixes and improvements.

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

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.35/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1266/
The tag is:
https://github.com/apache/tomcat/tree/9.0.35
fc2c65d390444d75412855ad0de8b878018d02dc

The proposed 9.0.35 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 9.0.35

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

Nexus: Staging Completed

[Nexus Repository Manager]

Message from: https://repository.apache.orgDeployer properties:"userAgent" = "maven-artifact/2.2.1 (Java 1.8.0_252; Windows 10 10.0)""userId" = "markt""ip" = "86.135.90.21"Details:The following artifacts have been staged/org/apache/tomcat/tomcat-i18n-de/9.0.35/tomcat-i18n-de-9.0.35.pom(SHA1: cc37bb4bfff7a85f1908517f26d80cb830fbc457)/org/apache/tomcat/tomcat-i18n-de/9.0.35/tomcat-i18n-de-9.0.35.pom.asc(SHA1: 1287a1325e4882656e95523d077e520052a849d9)/org/apache/tomcat/tomcat-i18n-de/9.0.35/tomcat-i18n-de-9.0.35.jar(SHA1: b8a8e7832d6ca9a0c78de27bb3da53a5b47b5811)/org/apache/tomcat/tomcat-i18n-de/9.0.35/tomcat-i18n-de-9.0.35.jar.asc(SHA1: da5788bd91d449cae5e4b660666b75201ddf943a)/org/apache/tomcat/tomcat-jni/9.0.35/tomcat-jni-9.0.35.jar.asc(SHA1: aee64262a82db8139a9c0e020a132b3e36716b75)/org/apache/tomcat/tomcat-jni/9.0.35/tomcat-jni-9.0.35.jar(SHA1: fe770d55e3af7be529f0a350eb944f5fa92d75f0)/org/apache/tomcat/tomcat-jni/9.0.35/tomcat-jni-9.0.35-sources.jar(SHA1: 5e5da548270087121d34413c881136c895b6cc29)/org/apache/tomcat/tomcat-jni/9.0.35/tomcat-jni-9.0.35.pom.asc(SHA1: e8409671d273a8efd20127866ed3de5359eeef57)/org/apache/tomcat/tomcat-jni/9.0.35/tomcat-jni-9.0.35.pom(SHA1: 0b1c4d05e6175627e3a58e458df75112fe95f119)/org/apache/tomcat/tomcat-jni/9.0.35/tomcat-jni-9.0.35-sources.jar.asc(SHA1: 0ec34a55a40be4f7418df33ff2db8912b26713d2)/org/apache/tomcat/tomcat-juli/9.0.35/tomcat-juli-9.0.35-sources.jar.asc(SHA1: df1721734660b6da3ed28af64e49e1dd62e5d62d)/org/apache/tomcat/tomcat-juli/9.0.35/tomcat-juli-9.0.35.jar.asc(SHA1: a905141427001c44e2f6c5859ef1923137ef62a1)/org/apache/tomcat/tomcat-juli/9.0.35/tomcat-juli-9.0.35.pom(SHA1: 4c7c46b9053dafce2bb7b756ce2bdf063d7fd59c)/org/apache/tomcat/tomcat-juli/9.0.35/tomcat-juli-9.0.35.jar(SHA1: 7751de04f20529bd00639d9026dd3c2e78f51d89)/org/apache/tomcat/tomcat-juli/9.0.35/tomcat-juli-9.0.35.pom.asc(SHA1: a694c5af06f7ce8a6f3e928d480f315cf1d3cde8)/org/apache/tomcat/tomcat-juli/9.0.35/tomcat-juli-9.0.35-sources.jar(SHA1: a0685c3e72c050801dd5a421f6860f12963801b3)/org/apache/tomcat/tomcat-util/9.0.35/tomcat-util-9.0.35.jar.asc(SHA1: 8c234466c222d60298bb1312be57505a2d0c14d5)/org/apache/tomcat/tomcat-util/9.0.35/tomcat-util-9.0.35.jar(SHA1: 1d9a898bfe9e2d676d644454d60432fc34866896)/org/apache/tomcat/tomcat-util/9.0.35/tomcat-util-9.0.35-sources.jar(SHA1: 94efd09ea484b74c8ffc2cd07bc69442832c75c7)/org/apache/tomcat/tomcat-util/9.0.35/tomcat-util-9.0.35.pom.asc(SHA1: 98ffe8f9be41c179e769ec841466a7a1ee2327c6)/org/apache/tomcat/tomcat-util/9.0.35/tomcat-util-9.0.35-sources.jar.asc(SHA1: 973e3c3d0e633076d534ce3b3b4418a95d563a9c)/org/apache/tomcat/tomcat-util/9.0.35/tomcat-util-9.0.35.pom(SHA1: 240512ca3cacba99d0d7f848265677ac50922e24)/org/apache/tomcat/tomcat-catalina/9.0.35/tomcat-catalina-9.0.35.jar.asc(SHA1: e0ba41421c8eb4e17bade65f90f638a446f8a3e4)/org/apache/tomcat/tomcat-catalina/9.0.35/tomcat-catalina-9.0.35.jar(SHA1: 8bf1bfc98636ee308aa2dc2a0936c9b5e2182bc8)/org/apache/tomcat/tomcat-catalina/9.0.35/tomcat-catalina-9.0.35.pom(SHA1: c2eaa5699df0656f2cb7e801231595e14dfdd3ef)/org/apache/tomcat/tomcat-catalina/9.0.35/tomcat-catalina-9.0.35-sources.jar.asc(SHA1: 2e3f38cf5308a762048af7d57244ef7391c36163)/org/apache/tomcat/tomcat-catalina/9.0.35/tomcat-catalina-9.0.35-sources.jar(SHA1: 8757131750793972a4d205d58420b6809c18ae8b)/org/apache/tomcat/tomcat-catalina/9.0.35/tomcat-catalina-9.0.35.pom.asc(SHA1: 06ed0d568aa78b3f7d8076dab538bb35acc4f23e)/org/apache/tomcat/tomcat-i18n-fr/9.0.35/tomcat-i18n-fr-9.0.35.pom.asc(SHA1: 4581edd1b422334f091cc0820fa11725f5373539)/org/apache/tomcat/tomcat-i18n-fr/9.0.35/tomcat-i18n-fr-9.0.35.jar.asc(SHA1: 917efe4412b934052ace74fbbc28801f4f08cf51)/org/apache/tomcat/tomcat-i18n-fr/9.0.35/tomcat-i18n-fr-9.0.35.pom(SHA1: dfe85e742588a234b5af5aa3a07c47404f453ec1)/org/apache/tomcat/tomcat-i18n-fr/9.0.35/tomcat-i18n-fr-9.0.35.jar(SHA1: b5dcebed47b8210f73a36f4c26288af9ada3dbbb)/org/apache/tomcat/tomcat-i18n-cs/9.0.35/tomcat-i18n-cs-9.0.35.pom.asc(SHA1: 1a1059d0d2b6f1916d2611fcbf6d60e02460a1ab)/org/apache/tomcat/tomcat-i18n-cs/9.0.35/tomcat-i18n-cs-9.0.35.jar.asc(SHA1: d18402a77873bb5c9db4c2db5bd81c12612cc2c1)/org/apache/tomcat/tomcat-i18n-cs/9.0.35/tomcat-i18n-cs-9.0.35.jar(SHA1: 9cb3dcdc1aa46f8af01aafbdb7c706417602d074)/org/apache/tomcat/tomcat-i18n-cs/9.0.35/tomcat-i18n-cs-9.0.35.pom(SHA1: d094340248937dff6a510fa4c62b7eb6a3735335)/org/apache/tomcat/tomcat-jdbc/9.0.35/tomcat-jdbc-9.0.35.jar(SHA1: 172701520176053533a5c8a539a8a80af8008ba1)/org/apache/tomcat/tomcat-jdbc/9.0.35/tomcat-jdbc-9.0.35-sources.jar(SHA1: b1330e4daa30210076bf0ff5b75453840a07d9d1)/org/apache/tomcat/tomcat-jdbc/9.0.35/tomcat-jdbc-9.0.35.jar.asc(SHA1: 2ac49fd1eb05651a33239323d498b3d865904553)/org/apache/tomcat/tomcat-jdbc/9.0.35/tomcat-jdbc-9.0.35-sources.jar.asc(SHA1: 091841c7c945a106f6bf136eff067621c5a3279b)/org/apache/tomcat/tomcat-jdbc/9.0.35/tomcat-jdbc-9.0.35.pom(SHA1: 19e7459de0f839406744c4fc212be4cc82ebe25f)/org/apache/tomcat/tomcat-jdbc/9.0.35/tomcat-jdbc-9.0.35.pom.asc(SHA1: 

svn commit: r39296 - in /dev/tomcat/tomcat-9/v9.0.35: ./ bin/ bin/embed/ src/

[markt]

Author: markt
Date: Tue May  5 21:06:15 2020
New Revision: 39296

Log:
Upload 9.0.35 for voting

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

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

Added: dev/tomcat/tomcat-9/v9.0.35/KEYS
==
--- dev/tomcat/tomcat-9/v9.0.35/KEYS (added)
+++ dev/tomcat/tomcat-9/v9.0.35/KEYS Tue May  5 21:06:15 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 
+
+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

[tomcat] 01/01: Tag 9.0.35

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit fc2c65d390444d75412855ad0de8b878018d02dc
Author: Mark Thomas 
AuthorDate: Tue May 5 21:31:23 2020 +0100

Tag 9.0.35
---
 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 54ef861..11b675e 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=9
 version.minor=0
 version.build=35
 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 3cb4b57..6cecbb9 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -44,7 +44,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.35 created (now fc2c65d)

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


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

 new fc2c65d  Tag 9.0.35

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

[VOTE] Release Apache Tomcat 10.0.0-M5

[Mark Thomas]

The proposed Apache Tomcat 10.0.0-M5 release is now available for
voting.

Apache Tomcat 10.x implements Jakarta EE 9 and, as such, the primary
package for all the specification APIs has changed from javax.* to jakarta.*
Applications that run on Tomcat 9 will not run on Tomcat 10 without changes.

The major changes compared to 10.0.0-M4 are:

- Remove useAprConnector flag from AprLifecycleListener so that the
  only way to use the APR connectors is to set the full class name.

- Change default value separator for property replacement to ":-"
  due to possible conflicts. The syntax is now "${name:-default}".

- Update the packaged version of the Tomcat Native Library to 1.2.24.

Along with lots of other bug fixes and improvements.

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

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.0.0-M5/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1265/
The tag is:
https://github.com/apache/tomcat/tree/10.0.0-M5
b3a208c6d6d01c553178c5e718e750b0eb318151

The proposed 10.0.0-M5 release is:
[ ] Broken - do not release
[ ] Alpha  - go ahead and release as 10.0.0-M5

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

[Bug 64409] Usage of TLS is insecure

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64409

--- Comment #5 from Md Mahir Asef Kabir  ---
Hi all,

First of all thanks a lot for taking time to give your thoughtful answers.

I just have one thing to focus on - 

It shows in the installation documentation in RUNNING.txt file that, we need to
download a Java SE Runtime Environment (JRE), release version 8 or later in
order to run the application.

Thing is, for JDK 8 TLS will be TLSv1.2. According to this article here -
https://access.redhat.com/articles/2112261, TLSv1.2 is also not secure.

So I was wondering if that seems like a problem to you. A solution for that
would be to update the RUNNING.txt, to recommend users to run the application
in Java 11 or higher.

Just thought I should point it out in case it helps.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Nexus: Staging Completed

[Nexus Repository Manager]

Message from: https://repository.apache.orgDeployer properties:"userAgent" = "maven-artifact/2.2.1 (Java 1.8.0_252; Windows 10 10.0)""userId" = "markt""ip" = "86.135.90.21"Details:The following artifacts have been staged/org/apache/tomcat/tomcat-i18n-de/10.0.0-M5/tomcat-i18n-de-10.0.0-M5.pom(SHA1: ee4cac9dfd58e8c0be2caa4ba42dbd66ba5b2e67)/org/apache/tomcat/tomcat-i18n-de/10.0.0-M5/tomcat-i18n-de-10.0.0-M5.jar(SHA1: 06ee7d864e1c6afc73c6644b0a40cdba0f79250c)/org/apache/tomcat/tomcat-i18n-de/10.0.0-M5/tomcat-i18n-de-10.0.0-M5.pom.asc(SHA1: 75bb5033b9d18ce7fe0ebd55f5aad391cc62fdf5)/org/apache/tomcat/tomcat-i18n-de/10.0.0-M5/tomcat-i18n-de-10.0.0-M5.jar.asc(SHA1: 1946bd9d9776e85e878a411aba54f15d5898fb15)/org/apache/tomcat/tomcat-jni/10.0.0-M5/tomcat-jni-10.0.0-M5-sources.jar.asc(SHA1: 12fcdb1bbb5ad4dc5aae80d877f4c01713433413)/org/apache/tomcat/tomcat-jni/10.0.0-M5/tomcat-jni-10.0.0-M5.jar.asc(SHA1: c5096e05f723bb355c7731a85ea3e713855db3aa)/org/apache/tomcat/tomcat-jni/10.0.0-M5/tomcat-jni-10.0.0-M5.jar(SHA1: da9d7721446577d331ed0edd9856ddeab156a821)/org/apache/tomcat/tomcat-jni/10.0.0-M5/tomcat-jni-10.0.0-M5-sources.jar(SHA1: 74c0c6aca77f6f1ce6ae83ca2b1c8c1a99720857)/org/apache/tomcat/tomcat-jni/10.0.0-M5/tomcat-jni-10.0.0-M5.pom(SHA1: 2053f87ead81a90f7e9aa3f12d6e604701524862)/org/apache/tomcat/tomcat-jni/10.0.0-M5/tomcat-jni-10.0.0-M5.pom.asc(SHA1: e6a9f213c496c5ece76232bb53e8f83c43297ee4)/org/apache/tomcat/tomcat-juli/10.0.0-M5/tomcat-juli-10.0.0-M5.jar(SHA1: 570b6c29f341dc46bf9d8a39af575c1921d50bf8)/org/apache/tomcat/tomcat-juli/10.0.0-M5/tomcat-juli-10.0.0-M5.pom(SHA1: 8f3ef6ba9c023fead815b98d971877c71361ad70)/org/apache/tomcat/tomcat-juli/10.0.0-M5/tomcat-juli-10.0.0-M5-sources.jar.asc(SHA1: 857c3a70d1bb1be1dbe3b23c7f92b2c01d4f9c85)/org/apache/tomcat/tomcat-juli/10.0.0-M5/tomcat-juli-10.0.0-M5-sources.jar(SHA1: a5665b4173dc9f17812076f53086baf8aec74f96)/org/apache/tomcat/tomcat-juli/10.0.0-M5/tomcat-juli-10.0.0-M5.jar.asc(SHA1: dac46ee64f453a2ae75dbbc3ca29878c81475c60)/org/apache/tomcat/tomcat-juli/10.0.0-M5/tomcat-juli-10.0.0-M5.pom.asc(SHA1: f92c3e39e1b820c80ffb1c53dcfc31f609219dff)/org/apache/tomcat/tomcat-util/10.0.0-M5/tomcat-util-10.0.0-M5.jar(SHA1: b62d8f787d8239ec807e70ec6dc4d035053554e4)/org/apache/tomcat/tomcat-util/10.0.0-M5/tomcat-util-10.0.0-M5-sources.jar(SHA1: 65b2d7789b141843e374c1920715296a5205adff)/org/apache/tomcat/tomcat-util/10.0.0-M5/tomcat-util-10.0.0-M5-sources.jar.asc(SHA1: 0e3533f1c691bfad71bf41bbdca5d00ee2a895be)/org/apache/tomcat/tomcat-util/10.0.0-M5/tomcat-util-10.0.0-M5.pom.asc(SHA1: 2bff1c35987d95220560bd70db5cd234bc6e009c)/org/apache/tomcat/tomcat-util/10.0.0-M5/tomcat-util-10.0.0-M5.pom(SHA1: 29a361a94cd94d07ba579cb802ea802e111aa29a)/org/apache/tomcat/tomcat-util/10.0.0-M5/tomcat-util-10.0.0-M5.jar.asc(SHA1: cebe04c72a16b704cfd0a3b33db09db1cdfd43ee)/org/apache/tomcat/tomcat-catalina/10.0.0-M5/tomcat-catalina-10.0.0-M5.jar(SHA1: 83997d867ea54f5e555a0865957d975875c5aa2d)/org/apache/tomcat/tomcat-catalina/10.0.0-M5/tomcat-catalina-10.0.0-M5.jar.asc(SHA1: d0b9cb59460e341544c5d4107328fcbb850c01a1)/org/apache/tomcat/tomcat-catalina/10.0.0-M5/tomcat-catalina-10.0.0-M5-sources.jar(SHA1: 0865c03bf987af010c1e50cb18091a15c7fecdd8)/org/apache/tomcat/tomcat-catalina/10.0.0-M5/tomcat-catalina-10.0.0-M5.pom.asc(SHA1: 601ead2fead7945200042b1c478d868d56dd9188)/org/apache/tomcat/tomcat-catalina/10.0.0-M5/tomcat-catalina-10.0.0-M5.pom(SHA1: 78376ef2f18b2b5dd42df428b63abb047e5c7b0a)/org/apache/tomcat/tomcat-catalina/10.0.0-M5/tomcat-catalina-10.0.0-M5-sources.jar.asc(SHA1: be4fc9b37a89b71fdbf644d7d1e3b411e6639402)/org/apache/tomcat/tomcat-i18n-fr/10.0.0-M5/tomcat-i18n-fr-10.0.0-M5.pom(SHA1: 60a5c4d1f66195e3d840994c547678968b62b946)/org/apache/tomcat/tomcat-i18n-fr/10.0.0-M5/tomcat-i18n-fr-10.0.0-M5.pom.asc(SHA1: fede8a93253e8e6685dcab4d609fc9f1ff9e1db1)/org/apache/tomcat/tomcat-i18n-fr/10.0.0-M5/tomcat-i18n-fr-10.0.0-M5.jar(SHA1: e3c42bca6800a09c5ef6019d05a9d1d9b2e48ba8)/org/apache/tomcat/tomcat-i18n-fr/10.0.0-M5/tomcat-i18n-fr-10.0.0-M5.jar.asc(SHA1: 91c499c43213b7ac60ac064b490f4910eff5e46b)/org/apache/tomcat/tomcat-i18n-cs/10.0.0-M5/tomcat-i18n-cs-10.0.0-M5.jar(SHA1: 8623878e38a601d49bb4953fdc78c6c3a4c42c7b)/org/apache/tomcat/tomcat-i18n-cs/10.0.0-M5/tomcat-i18n-cs-10.0.0-M5.pom.asc(SHA1: 035eb9262fcd3ae9115e50d374c872e7b41a0e73)/org/apache/tomcat/tomcat-i18n-cs/10.0.0-M5/tomcat-i18n-cs-10.0.0-M5.jar.asc(SHA1: 148552fd86c11792d0cdd7922fe2d0a72b8eda32)/org/apache/tomcat/tomcat-i18n-cs/10.0.0-M5/tomcat-i18n-cs-10.0.0-M5.pom(SHA1: 1948db185c60aa3a8f4297a00aa326356a126c88)/org/apache/tomcat/tomcat-jdbc/10.0.0-M5/tomcat-jdbc-10.0.0-M5.jar(SHA1: 09250c6c3ec13421d626998104adea1a9917b6a7)/org/apache/tomcat/tomcat-jdbc/10.0.0-M5/tomcat-jdbc-10.0.0-M5.pom(SHA1: 7940a10cefb07a8a1e8b66eced94f06f5f35d9b8)/org/apache/tomcat/tomcat-jdbc/10.0.0-M5/tomcat-jdbc-10.0.0-M5-sources.jar.asc(SHA1: 

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

[markt]

Author: markt
Date: Tue May  5 18:58:55 2020
New Revision: 39295

Log:
Upload 10.0.0-M5 for voting

Added:
dev/tomcat/tomcat-10/v10.0.0-M5/
dev/tomcat/tomcat-10/v10.0.0-M5/KEYS
dev/tomcat/tomcat-10/v10.0.0-M5/README.html
dev/tomcat/tomcat-10/v10.0.0-M5/RELEASE-NOTES
dev/tomcat/tomcat-10/v10.0.0-M5/bin/
dev/tomcat/tomcat-10/v10.0.0-M5/bin/README.html
dev/tomcat/tomcat-10/v10.0.0-M5/bin/apache-tomcat-10.0.0-M5-deployer.tar.gz 
  (with props)

dev/tomcat/tomcat-10/v10.0.0-M5/bin/apache-tomcat-10.0.0-M5-deployer.tar.gz.asc

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

dev/tomcat/tomcat-10/v10.0.0-M5/bin/apache-tomcat-10.0.0-M5-deployer.zip.sha512
dev/tomcat/tomcat-10/v10.0.0-M5/bin/apache-tomcat-10.0.0-M5-fulldocs.tar.gz 
  (with props)

dev/tomcat/tomcat-10/v10.0.0-M5/bin/apache-tomcat-10.0.0-M5-fulldocs.tar.gz.asc

dev/tomcat/tomcat-10/v10.0.0-M5/bin/apache-tomcat-10.0.0-M5-fulldocs.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.0-M5/bin/apache-tomcat-10.0.0-M5-windows-x64.zip 
  (with props)

dev/tomcat/tomcat-10/v10.0.0-M5/bin/apache-tomcat-10.0.0-M5-windows-x64.zip.asc

dev/tomcat/tomcat-10/v10.0.0-M5/bin/apache-tomcat-10.0.0-M5-windows-x64.zip.sha512
dev/tomcat/tomcat-10/v10.0.0-M5/bin/apache-tomcat-10.0.0-M5-windows-x86.zip 
  (with props)

dev/tomcat/tomcat-10/v10.0.0-M5/bin/apache-tomcat-10.0.0-M5-windows-x86.zip.asc

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

dev/tomcat/tomcat-10/v10.0.0-M5/bin/embed/apache-tomcat-10.0.0-M5-embed.tar.gz  
 (with props)

dev/tomcat/tomcat-10/v10.0.0-M5/bin/embed/apache-tomcat-10.0.0-M5-embed.tar.gz.asc

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

dev/tomcat/tomcat-10/v10.0.0-M5/bin/embed/apache-tomcat-10.0.0-M5-embed.zip.asc

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

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

Added: dev/tomcat/tomcat-10/v10.0.0-M5/KEYS
==
--- dev/tomcat/tomcat-10/v10.0.0-M5/KEYS (added)
+++ dev/tomcat/tomcat-10/v10.0.0-M5/KEYS Tue May  5 18:58:55 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 
+
+mQGiBDtAWuURBADZ0KUEyUkSUiTA09e7tvEbX25STsjxrR+DNTainCls+XlkVOij
+gBv216lqge9tIsS0L6hCP4OQbFf/64qVtJssX4QXdyiZGb5wpmcj0Mz602Ew8r+N
+I0S5NvmogoYWW7BlP4r61jNxO5zrr03KaijM5r4ipJdLUxyOmM6P2jRPUwCg/5gm
+bpqiYl7pXX5FgDeB36tmD+UD/06iLqOnoiKO0vMbOk7URclhCObMNrHqxTxozMTS
+B9soYURbIeArei+plYo2n+1qB12ayybjhVu3uksXRdT9bEkyxMfslvLbIpDAG8Cz
+gNftTbKx/MVS7cQU0II8BKo2Akr+1FZah+sD4ovK8SfkMXUQUbTeefTntsAQKyyU
+9M9tA/9on9tBiHFl0qVJht6N4GiJ2G689v7rS2giLgKjetjiCduxBXEgvUSuyQID

[tomcat] 01/01: Tag 10.0.0-M5

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit b3a208c6d6d01c553178c5e718e750b0eb318151
Author: Mark Thomas 
AuthorDate: Tue May 5 18:07:34 2020 +0100

Tag 10.0.0-M5
---
 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 d550071..a70060c 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=-M5-dev
+version.suffix=-M5
 
 # - Source control flags -
 git.branch=master
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c47f1f4..31991cf 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -44,7 +44,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-M5 created (now b3a208c)

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


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

 new b3a208c  Tag 10.0.0-M5

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



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

buildbot success in on tomcat-7-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-7-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-7-trunk/builds/1699

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch 7.0.x] 53e30390943c18fca0c9e57dbcc14f1c623cfd06
Blamelist: Mark Thomas 

Build succeeded!

Sincerely,
 -The Buildbot




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

[Bug 64394] Windows Installer should offer an option to trust the certs in the Windows truststore

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64394

--- Comment #9 from Mark Thomas  ---
That is an application configuration issue, not a Tomcat configuration issue.

I'd expect applications to be able to use explicit configuration rather than
relying on system properties. Reliance on system properties can lead to
situations where different components need different, incompatible, system
properties.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 64394] Windows Installer should offer an option to trust the certs in the Windows truststore

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64394

--- Comment #8 from christoph.vonwitt...@bv.aok.de ---
Looks like specifiying the trustStoreType in the server.xml won't work in our
case.


i.e. when I set it in the server.xml in Confluence or Jira, I will get an error
when using LDAPs or sending mail.

When I set the Java Option -Djavax.net.ssl.trustStoreType=WINDOWS-ROOT for the
tomcat process it works fine.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated: Add ALv2 header and ensure all yaml files are checked

[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 a8fbaaf  Add ALv2 header and ensure all yaml files are checked
a8fbaaf is described below

commit a8fbaaf31bbc70d239726e853549fe439cc08e8d
Author: Mark Thomas 
AuthorDate: Tue May 5 16:08:31 2020 +0100

Add ALv2 header and ensure all yaml files are checked

Spotted via RAT report on ci.apache.org
I checked the yaml + ALv2 header with several on-line validators and all
reported it as valid.
---
 res/checkstyle/checkstyle.xml |  2 +-
 res/tomcat-maven/tomcat.yaml  | 15 +++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/res/checkstyle/checkstyle.xml b/res/checkstyle/checkstyle.xml
index c0d687c..6fb7231 100644
--- a/res/checkstyle/checkstyle.xml
+++ b/res/checkstyle/checkstyle.xml
@@ -31,7 +31,7 @@
   
 
 
-
+
   
 
   
diff --git a/res/tomcat-maven/tomcat.yaml b/res/tomcat-maven/tomcat.yaml
index 9f115eb..d15a7f3 100644
--- a/res/tomcat-maven/tomcat.yaml
+++ b/res/tomcat-maven/tomcat.yaml
@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 kind: Deployment
 apiVersion: extensions/v1beta1
 metadata:


-
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: Improve validation of storage location when using FileStore.

[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 53e3039  Improve validation of storage location when using FileStore.
53e3039 is described below

commit 53e30390943c18fca0c9e57dbcc14f1c623cfd06
Author: Mark Thomas 
AuthorDate: Tue May 5 15:50:15 2020 +0100

Improve validation of storage location when using FileStore.
---
 java/org/apache/catalina/session/FileStore.java   | 19 +--
 .../apache/catalina/session/LocalStrings.properties   |  1 +
 webapps/docs/changelog.xml|  3 +++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/session/FileStore.java 
b/java/org/apache/catalina/session/FileStore.java
index 4a51075..08a02c3 100644
--- a/java/org/apache/catalina/session/FileStore.java
+++ b/java/org/apache/catalina/session/FileStore.java
@@ -33,6 +33,8 @@ import org.apache.catalina.Context;
 import org.apache.catalina.Loader;
 import org.apache.catalina.Session;
 import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.res.StringManager;
 
 /**
  * Concrete implementation of the Store interface that utilizes
@@ -43,6 +45,10 @@ import org.apache.juli.logging.Log;
  */
 public final class FileStore extends StoreBase {
 
+private static final Log log = LogFactory.getLog(FileStore.class);
+private static final StringManager sm = 
StringManager.getManager(FileStore.class);
+
+
 // - Constants
 
 /**
@@ -389,11 +395,20 @@ public final class FileStore extends StoreBase {
  *used in the file naming.
  */
 private File file(String id) throws IOException {
-if (this.directory == null) {
+File storageDir = directory();
+if (storageDir == null) {
 return null;
 }
+
 String filename = id + FILE_EXT;
-File file = new File(directory(), filename);
+File file = new File(storageDir, filename);
+
+// Check the file is within the storage directory
+if 
(!file.getCanonicalPath().startsWith(storageDir.getCanonicalPath())) {
+log.warn(sm.getString("fileStore.invalid", file.getPath(), id));
+return null;
+}
+
 return file;
 }
 }
diff --git a/java/org/apache/catalina/session/LocalStrings.properties 
b/java/org/apache/catalina/session/LocalStrings.properties
index f969a8f..f0d15da 100644
--- a/java/org/apache/catalina/session/LocalStrings.properties
+++ b/java/org/apache/catalina/session/LocalStrings.properties
@@ -32,6 +32,7 @@ applicationSession.value.iae=null value
 fileStore.createFailed=Unable to create directory [{0}] for the storage of 
session data
 fileStore.deleteFailed=Unable to delete file [{0}] which is preventing the 
creation of the session storage location
 fileStore.deleteSessionFailed=Unable to delete file [{0}] which is no longer 
required
+fileStore.invalid=Invalid persistence file [{0}] for session ID [{1}]
 fileStore.loading=Loading Session [{0}] from file [{1}]
 fileStore.removing=Removing Session [{0}] at file [{1}]
 fileStore.saving=Saving Session [{0}] to file [{1}]
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b14142f..9eb7ebd 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -109,6 +109,9 @@
 replacement to :- due to possible conflicts. The
 syntax is now ${name:-default}. (remm)
   
+  
+Improve validation of storage location when using FileStore. (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: Improve validation of storage location when using FileStore.

[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 ec08af1  Improve validation of storage location when using FileStore.
ec08af1 is described below

commit ec08af18d0f9ddca3f2d800ef66fe7fd20afef2f
Author: Mark Thomas 
AuthorDate: Tue May 5 15:50:15 2020 +0100

Improve validation of storage location when using FileStore.
---
 java/org/apache/catalina/session/FileStore.java   | 19 +--
 .../apache/catalina/session/LocalStrings.properties   |  1 +
 webapps/docs/changelog.xml|  3 +++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/session/FileStore.java 
b/java/org/apache/catalina/session/FileStore.java
index 066d603..cf3ea88 100644
--- a/java/org/apache/catalina/session/FileStore.java
+++ b/java/org/apache/catalina/session/FileStore.java
@@ -33,6 +33,8 @@ import org.apache.catalina.Context;
 import org.apache.catalina.Globals;
 import org.apache.catalina.Session;
 import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.res.StringManager;
 
 /**
  * Concrete implementation of the Store interface that utilizes
@@ -43,6 +45,10 @@ import org.apache.juli.logging.Log;
  */
 public final class FileStore extends StoreBase {
 
+private static final Log log = LogFactory.getLog(FileStore.class);
+private static final StringManager sm = 
StringManager.getManager(FileStore.class);
+
+
 // - Constants
 
 /**
@@ -336,11 +342,20 @@ public final class FileStore extends StoreBase {
  *used in the file naming.
  */
 private File file(String id) throws IOException {
-if (this.directory == null) {
+File storageDir = directory();
+if (storageDir == null) {
 return null;
 }
+
 String filename = id + FILE_EXT;
-File file = new File(directory(), filename);
+File file = new File(storageDir, filename);
+
+// Check the file is within the storage directory
+if 
(!file.getCanonicalPath().startsWith(storageDir.getCanonicalPath())) {
+log.warn(sm.getString("fileStore.invalid", file.getPath(), id));
+return null;
+}
+
 return file;
 }
 }
diff --git a/java/org/apache/catalina/session/LocalStrings.properties 
b/java/org/apache/catalina/session/LocalStrings.properties
index 62a8b49..127cd43 100644
--- a/java/org/apache/catalina/session/LocalStrings.properties
+++ b/java/org/apache/catalina/session/LocalStrings.properties
@@ -29,6 +29,7 @@ JDBCStore.wrongDataSource=Cannot open JNDI DataSource [{0}]
 fileStore.createFailed=Unable to create directory [{0}] for the storage of 
session data
 fileStore.deleteFailed=Unable to delete file [{0}] which is preventing the 
creation of the session storage location
 fileStore.deleteSessionFailed=Unable to delete file [{0}] which is no longer 
required
+fileStore.invalid=Invalid persistence file [{0}] for session ID [{1}]
 fileStore.loading=Loading Session [{0}] from file [{1}]
 fileStore.removing=Removing Session [{0}] at file [{1}]
 fileStore.saving=Saving Session [{0}] to file [{1}]
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c6446d3..ce402cf 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -98,6 +98,9 @@
 replacement to :- due to possible conflicts. The
 syntax is now ${name:-default}. (remm)
   
+  
+Improve validation of storage location when using FileStore. (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: Improve validation of storage location when using FileStore.

[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 3aa8f28  Improve validation of storage location when using FileStore.
3aa8f28 is described below

commit 3aa8f28db7efb311cdd1b6fe15a9cd3b167a
Author: Mark Thomas 
AuthorDate: Tue May 5 15:50:15 2020 +0100

Improve validation of storage location when using FileStore.
---
 java/org/apache/catalina/session/FileStore.java   | 19 +--
 .../apache/catalina/session/LocalStrings.properties   |  1 +
 webapps/docs/changelog.xml|  3 +++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/session/FileStore.java 
b/java/org/apache/catalina/session/FileStore.java
index 066d603..cf3ea88 100644
--- a/java/org/apache/catalina/session/FileStore.java
+++ b/java/org/apache/catalina/session/FileStore.java
@@ -33,6 +33,8 @@ import org.apache.catalina.Context;
 import org.apache.catalina.Globals;
 import org.apache.catalina.Session;
 import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.res.StringManager;
 
 /**
  * Concrete implementation of the Store interface that utilizes
@@ -43,6 +45,10 @@ import org.apache.juli.logging.Log;
  */
 public final class FileStore extends StoreBase {
 
+private static final Log log = LogFactory.getLog(FileStore.class);
+private static final StringManager sm = 
StringManager.getManager(FileStore.class);
+
+
 // - Constants
 
 /**
@@ -336,11 +342,20 @@ public final class FileStore extends StoreBase {
  *used in the file naming.
  */
 private File file(String id) throws IOException {
-if (this.directory == null) {
+File storageDir = directory();
+if (storageDir == null) {
 return null;
 }
+
 String filename = id + FILE_EXT;
-File file = new File(directory(), filename);
+File file = new File(storageDir, filename);
+
+// Check the file is within the storage directory
+if 
(!file.getCanonicalPath().startsWith(storageDir.getCanonicalPath())) {
+log.warn(sm.getString("fileStore.invalid", file.getPath(), id));
+return null;
+}
+
 return file;
 }
 }
diff --git a/java/org/apache/catalina/session/LocalStrings.properties 
b/java/org/apache/catalina/session/LocalStrings.properties
index 62a8b49..127cd43 100644
--- a/java/org/apache/catalina/session/LocalStrings.properties
+++ b/java/org/apache/catalina/session/LocalStrings.properties
@@ -29,6 +29,7 @@ JDBCStore.wrongDataSource=Cannot open JNDI DataSource [{0}]
 fileStore.createFailed=Unable to create directory [{0}] for the storage of 
session data
 fileStore.deleteFailed=Unable to delete file [{0}] which is preventing the 
creation of the session storage location
 fileStore.deleteSessionFailed=Unable to delete file [{0}] which is no longer 
required
+fileStore.invalid=Invalid persistence file [{0}] for session ID [{1}]
 fileStore.loading=Loading Session [{0}] from file [{1}]
 fileStore.removing=Removing Session [{0}] at file [{1}]
 fileStore.saving=Saving Session [{0}] to file [{1}]
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 479714c..3cb4b57 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -99,6 +99,9 @@
 replacement to :- due to possible conflicts. The
 syntax is now ${name:-default}. (remm)
   
+  
+Improve validation of storage location when using FileStore. (markt)
+  
 
   
   


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

[tomcat] branch master updated: Improve validation of storage location when using FileStore.

[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 bb33048  Improve validation of storage location when using FileStore.
bb33048 is described below

commit bb33048e3f9b4f2b70e4da2e6c4e34ca89023b1b
Author: Mark Thomas 
AuthorDate: Tue May 5 15:50:15 2020 +0100

Improve validation of storage location when using FileStore.
---
 java/org/apache/catalina/session/FileStore.java   | 19 +--
 .../apache/catalina/session/LocalStrings.properties   |  1 +
 webapps/docs/changelog.xml|  3 +++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/session/FileStore.java 
b/java/org/apache/catalina/session/FileStore.java
index 0d0f41c..5c88e49 100644
--- a/java/org/apache/catalina/session/FileStore.java
+++ b/java/org/apache/catalina/session/FileStore.java
@@ -33,6 +33,8 @@ import org.apache.catalina.Context;
 import org.apache.catalina.Globals;
 import org.apache.catalina.Session;
 import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.res.StringManager;
 
 /**
  * Concrete implementation of the Store interface that utilizes
@@ -43,6 +45,10 @@ import org.apache.juli.logging.Log;
  */
 public final class FileStore extends StoreBase {
 
+private static final Log log = LogFactory.getLog(FileStore.class);
+private static final StringManager sm = 
StringManager.getManager(FileStore.class);
+
+
 // - Constants
 
 /**
@@ -336,11 +342,20 @@ public final class FileStore extends StoreBase {
  *used in the file naming.
  */
 private File file(String id) throws IOException {
-if (this.directory == null) {
+File storageDir = directory();
+if (storageDir == null) {
 return null;
 }
+
 String filename = id + FILE_EXT;
-File file = new File(directory(), filename);
+File file = new File(storageDir, filename);
+
+// Check the file is within the storage directory
+if 
(!file.getCanonicalPath().startsWith(storageDir.getCanonicalPath())) {
+log.warn(sm.getString("fileStore.invalid", file.getPath(), id));
+return null;
+}
+
 return file;
 }
 }
diff --git a/java/org/apache/catalina/session/LocalStrings.properties 
b/java/org/apache/catalina/session/LocalStrings.properties
index 62a8b49..127cd43 100644
--- a/java/org/apache/catalina/session/LocalStrings.properties
+++ b/java/org/apache/catalina/session/LocalStrings.properties
@@ -29,6 +29,7 @@ JDBCStore.wrongDataSource=Cannot open JNDI DataSource [{0}]
 fileStore.createFailed=Unable to create directory [{0}] for the storage of 
session data
 fileStore.deleteFailed=Unable to delete file [{0}] which is preventing the 
creation of the session storage location
 fileStore.deleteSessionFailed=Unable to delete file [{0}] which is no longer 
required
+fileStore.invalid=Invalid persistence file [{0}] for session ID [{1}]
 fileStore.loading=Loading Session [{0}] from file [{1}]
 fileStore.removing=Removing Session [{0}] at file [{1}]
 fileStore.saving=Saving Session [{0}] to file [{1}]
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ac0f7e0..c47f1f4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -114,6 +114,9 @@
 replacement to :- due to possible conflicts. The
 syntax is now ${name:-default}. (remm)
   
+  
+Improve validation of storage location when using FileStore. (markt)
+  
 
   
   


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

[Bug 53930] allow capture of catalina stdout/stderr to a command instead of just a file [PATCH]

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=53930

--- Comment #10 from harald.dun...@aixigo.de ---
This is pretty disappointing. CATALINA_PID is part of the interface to manage
tomcat.

Anyway, logging to stdout and stderr is an anachronism, even for Java. The
recommendation should be to set CATALINA_OUT to /dev/null and to use log4j or
similar.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

buildbot success in on tomcat-85-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-85-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-85-trunk/builds/2301

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' 
triggered this build
Build Source Stamp: [branch 8.5.x] e2e5b3444ca21057b7df8449dd6169985b55cbb1
Blamelist: Mark Thomas 

Build succeeded!

Sincerely,
 -The Buildbot




-
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: Remove tests for BZ 63835 that was not back-ported to 7.0.x

[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 729176e  Remove tests for BZ 63835 that was not back-ported to 7.0.x
729176e is described below

commit 729176e2b6b386fda05ac9ffc72d6ccfdf885023
Author: Mark Thomas 
AuthorDate: Tue May 5 12:56:28 2020 +0100

Remove tests for BZ 63835 that was not back-ported to 7.0.x
---
 .../coyote/http11/TestAbstractHttp11Processor.java | 102 -
 1 file changed, 102 deletions(-)

diff --git a/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java 
b/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
index b142431..0d9f0ed 100644
--- a/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
+++ b/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
@@ -25,13 +25,11 @@ import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.io.Reader;
-import java.io.StringReader;
 import java.io.Writer;
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.net.SocketAddress;
 import java.nio.CharBuffer;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -58,7 +56,6 @@ import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
 import org.apache.tomcat.util.buf.B2CConverter;
 import org.apache.tomcat.util.buf.ByteChunk;
-import org.apache.tomcat.util.http.parser.TokenList;
 
 public class TestAbstractHttp11Processor extends TomcatBaseTest {
 
@@ -1598,105 +1595,6 @@ public class TestAbstractHttp11Processor extends 
TomcatBaseTest {
 }
 
 
-@Test
-public void testKeepAliveHeader01() throws Exception {
-doTestKeepAliveHeader(false, 3000, 10);
-}
-
-@Test
-public void testKeepAliveHeader02() throws Exception {
-doTestKeepAliveHeader(true, 5000, 1);
-}
-
-@Test
-public void testKeepAliveHeader03() throws Exception {
-doTestKeepAliveHeader(true, 5000, 10);
-}
-
-@Test
-public void testKeepAliveHeader04() throws Exception {
-doTestKeepAliveHeader(true, -1, 10);
-}
-
-@Test
-public void testKeepAliveHeader05() throws Exception {
-doTestKeepAliveHeader(true, -1, 1);
-}
-
-@Test
-public void testKeepAliveHeader06() throws Exception {
-doTestKeepAliveHeader(true, -1, -1);
-}
-
-private void doTestKeepAliveHeader(boolean sendKeepAlive, int 
keepAliveTimeout,
-int maxKeepAliveRequests) throws Exception {
-Tomcat tomcat = getTomcatInstance();
-
-tomcat.getConnector().setProperty("keepAliveTimeout", 
Integer.toString(keepAliveTimeout));
-tomcat.getConnector().setProperty("maxKeepAliveRequests", 
Integer.toString(maxKeepAliveRequests));
-
-// No file system docBase required
-Context ctx = tomcat.addContext("", null);
-
-// Add servlet
-Tomcat.addServlet(ctx, "TesterServlet", new TesterServlet());
-ctx.addServletMapping("/foo", "TesterServlet");
-
-tomcat.start();
-
-String request =
-"GET /foo HTTP/1.1" + SimpleHttpClient.CRLF +
-"Host: localhost:" + getPort() + SimpleHttpClient.CRLF;
-
-if (sendKeepAlive) {
-request += "Connection: keep-alive" + SimpleHttpClient.CRLF;
-}
-
-request += SimpleHttpClient.CRLF;
-
-Client client = new Client(tomcat.getConnector().getLocalPort());
-client.setRequest(new String[] {request});
-
-client.connect();
-client.processRequest(false);
-
-Assert.assertTrue(client.isResponse200());
-
-String connectionHeaderValue = null;
-String keepAliveHeaderValue = null;
-for (String header : client.getResponseHeaders()) {
-if (header.startsWith("Connection:")) {
-connectionHeaderValue = header.substring(header.indexOf(':') + 
1).trim();
-}
-if (header.startsWith("Keep-Alive:")) {
-keepAliveHeaderValue = header.substring(header.indexOf(':') + 
1).trim();
-}
-}
-
-if (!sendKeepAlive || keepAliveTimeout < 0
-&& (maxKeepAliveRequests < 0 || maxKeepAliveRequests > 1)) {
-Assert.assertNull(connectionHeaderValue);
-Assert.assertNull(keepAliveHeaderValue);
-} else {
-List connectionHeaders = new ArrayList();
-TokenList.parseTokenList(new StringReader(connectionHeaderValue), 
connectionHeaders);
-
-if (sendKeepAlive && keepAliveTimeout > 0 &&
-(maxKeepAliveRequests < 0 || maxKeepAliveRequests > 1)) {
-Assert.assertEquals(1, connectionHeaders.size());
-Assert.assertEquals("keep-alive", connectionHeaders.get(0));
-   

[tomcat] branch 7.0.x updated: Remove call to set property that no longer exists.

[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 8fd82d8  Remove call to set property that no longer exists.
8fd82d8 is described below

commit 8fd82d83d64bdf45e28cc6c40cc71ed700d2814d
Author: Mark Thomas 
AuthorDate: Tue May 5 12:34:32 2020 +0100

Remove call to set property that no longer exists.
---
 test/org/apache/catalina/startup/TomcatBaseTest.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/org/apache/catalina/startup/TomcatBaseTest.java 
b/test/org/apache/catalina/startup/TomcatBaseTest.java
index e0757d8..332944e 100644
--- a/test/org/apache/catalina/startup/TomcatBaseTest.java
+++ b/test/org/apache/catalina/startup/TomcatBaseTest.java
@@ -126,7 +126,6 @@ public abstract class TomcatBaseTest extends 
LoggingBaseTest {
 AprLifecycleListener listener = new AprLifecycleListener();
 listener.setSSLRandomSeed("/dev/urandom");
 server.addLifecycleListener(listener);
-Assert.assertTrue(connector.setProperty("pollerThreadCount", "1"));
 }
 
 File catalinaBase = getTemporaryDirectory();


-
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 JUnit deprecations

[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 9a2cf7f  Fix JUnit deprecations
9a2cf7f is described below

commit 9a2cf7f2b52bca9e8e0d2c64da98c4de4faa72af
Author: Mark Thomas 
AuthorDate: Tue May 5 12:42:14 2020 +0100

Fix JUnit deprecations
---
 test/org/apache/catalina/core/TestStandardContext.java | 3 ++-
 .../catalina/tribes/group/interceptors/TestEncryptInterceptor.java | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/catalina/core/TestStandardContext.java 
b/test/org/apache/catalina/core/TestStandardContext.java
index 4d27958..88d7e53 100644
--- a/test/org/apache/catalina/core/TestStandardContext.java
+++ b/test/org/apache/catalina/core/TestStandardContext.java
@@ -43,6 +43,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.hamcrest.CoreMatchers;
+import org.hamcrest.MatcherAssert;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -862,7 +863,7 @@ public class TestStandardContext extends TomcatBaseTest {
 Context context = new StandardContext();
 
 context.setResourceOnlyServlets("a,b,c");
-
Assert.assertThat(Arrays.asList(context.getResourceOnlyServlets().split(",")),
+
MatcherAssert.assertThat(Arrays.asList(context.getResourceOnlyServlets().split(",")),
 CoreMatchers.hasItems("a", "b", "c"));
 }
 
diff --git 
a/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java
 
b/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java
index 8dc7a5f..e5be576 100644
--- 
a/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java
+++ 
b/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java
@@ -25,6 +25,7 @@ import java.util.Collection;
 
 import javax.crypto.Cipher;
 
+import org.hamcrest.MatcherAssert;
 import org.hamcrest.core.IsEqual;
 import org.hamcrest.core.IsNot;
 
@@ -371,7 +372,7 @@ public class TestEncryptInterceptor {
 
 byte[] cipherText2 = 
((ValueCaptureInterceptor)src.getNext()).getValue();
 
-Assert.assertThat("Two identical cleartexts encrypt to the same 
ciphertext",
+MatcherAssert.assertThat("Two identical cleartexts encrypt to the same 
ciphertext",
 cipherText1, IsNot.not(IsEqual.equalTo(cipherText2)));
 }
 


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

[tomcat] branch 8.5.x updated: Remove call to set property that no longer exists.

[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 e2e5b34  Remove call to set property that no longer exists.
e2e5b34 is described below

commit e2e5b3444ca21057b7df8449dd6169985b55cbb1
Author: Mark Thomas 
AuthorDate: Tue May 5 12:34:32 2020 +0100

Remove call to set property that no longer exists.
---
 test/org/apache/catalina/startup/TomcatBaseTest.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/org/apache/catalina/startup/TomcatBaseTest.java 
b/test/org/apache/catalina/startup/TomcatBaseTest.java
index 75e588d..d3cdc2e 100644
--- a/test/org/apache/catalina/startup/TomcatBaseTest.java
+++ b/test/org/apache/catalina/startup/TomcatBaseTest.java
@@ -184,7 +184,6 @@ public abstract class TomcatBaseTest extends 
LoggingBaseTest {
 AprLifecycleListener listener = new AprLifecycleListener();
 listener.setSSLRandomSeed("/dev/urandom");
 server.addLifecycleListener(listener);
-Assert.assertTrue(connector.setProperty("pollerThreadCount", "1"));
 }
 
 File catalinaBase = getTemporaryDirectory();


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

buildbot failure in on tomcat-85-trunk

[buildbot]

The Buildbot has detected a new failure on builder tomcat-85-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-85-trunk/builds/2300

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' 
triggered this build
Build Source Stamp: [branch 8.5.x] 906698fee92f0e571ca54db98ec0e163972285a2
Blamelist: Mark Thomas 

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

buildbot failure in on tomcat-7-trunk

[buildbot]

The Buildbot has detected a new failure on builder tomcat-7-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-7-trunk/builds/1696

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch 7.0.x] 00d95b6ffc8118f274369ad2c89fd98898edd7d2
Blamelist: Mark Thomas 

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

Re: [tomcat] branch 7.0.x updated: Reduce code duplication. Pick up allowHostHeaderMismatch setting.

[Mark Thomas]

On 05/05/2020 11:19, ma...@apache.org wrote:
> 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 1854fd4  Reduce code duplication. Pick up allowHostHeaderMismatch 
> setting.

Thsi fixes a handful of failures I am seeing after back-porting
additional tests to Tomcat 7.

I have one failure left to track down (unless CI finds any more).

Mark

-
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: Reduce code duplication. Pick up allowHostHeaderMismatch setting.

[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 1854fd4  Reduce code duplication. Pick up allowHostHeaderMismatch 
setting.
1854fd4 is described below

commit 1854fd483be73879ca347e7c04e46f3c9073df2c
Author: Mark Thomas 
AuthorDate: Tue May 5 11:19:15 2020 +0100

Reduce code duplication. Pick up allowHostHeaderMismatch setting.
---
 java/org/apache/coyote/http11/Http11AprProtocol.java | 16 +---
 java/org/apache/coyote/http11/Http11NioProtocol.java | 16 +---
 java/org/apache/coyote/http11/Http11Protocol.java| 19 ++-
 3 files changed, 4 insertions(+), 47 deletions(-)

diff --git a/java/org/apache/coyote/http11/Http11AprProtocol.java 
b/java/org/apache/coyote/http11/Http11AprProtocol.java
index 4afeac5..4f4fd4f 100644
--- a/java/org/apache/coyote/http11/Http11AprProtocol.java
+++ b/java/org/apache/coyote/http11/Http11AprProtocol.java
@@ -304,22 +304,8 @@ public class Http11AprProtocol extends 
AbstractHttp11Protocol {
 proto.getAllowedTrailerHeadersAsSet(), 
proto.getMaxExtensionSize(),
 proto.getMaxSwallowSize(), proto.getRelaxedPathChars(),
 proto.getRelaxedQueryChars());
-processor.setAdapter(proto.adapter);
-processor.setMaxKeepAliveRequests(proto.getMaxKeepAliveRequests());
-processor.setKeepAliveTimeout(proto.getKeepAliveTimeout());
-
processor.setConnectionUploadTimeout(proto.getConnectionUploadTimeout());
-processor.setDisableUploadTimeout(proto.getDisableUploadTimeout());
-processor.setCompressionMinSize(proto.getCompressionMinSize());
-
processor.setNoCompressionStrongETag(proto.getNoCompressionStrongETag());
-processor.setCompression(proto.getCompression());
-
processor.setNoCompressionUserAgents(proto.getNoCompressionUserAgents());
-
processor.setCompressableMimeTypes(proto.getCompressableMimeTypes());
-processor.setRestrictedUserAgents(proto.getRestrictedUserAgents());
-processor.setSocketBuffer(proto.getSocketBuffer());
-processor.setMaxSavePostSize(proto.getMaxSavePostSize());
-processor.setServer(proto.getServer());
+proto.configureProcessor(processor);
 processor.setClientCertProvider(proto.getClientCertProvider());
-processor.setMaxCookieCount(proto.getMaxCookieCount());
 register(processor);
 return processor;
 }
diff --git a/java/org/apache/coyote/http11/Http11NioProtocol.java 
b/java/org/apache/coyote/http11/Http11NioProtocol.java
index c61f3a0..cd32795 100644
--- a/java/org/apache/coyote/http11/Http11NioProtocol.java
+++ b/java/org/apache/coyote/http11/Http11NioProtocol.java
@@ -269,21 +269,7 @@ public class Http11NioProtocol extends 
AbstractHttp11JsseProtocol {
 proto.getAllowedTrailerHeadersAsSet(), 
proto.getMaxExtensionSize(),
 proto.getMaxSwallowSize(), proto.getRelaxedPathChars(),
 proto.getRelaxedQueryChars());
-processor.setAdapter(proto.adapter);
-processor.setMaxKeepAliveRequests(proto.getMaxKeepAliveRequests());
-processor.setKeepAliveTimeout(proto.getKeepAliveTimeout());
-
processor.setConnectionUploadTimeout(proto.getConnectionUploadTimeout());
-processor.setDisableUploadTimeout(proto.getDisableUploadTimeout());
-processor.setCompressionMinSize(proto.getCompressionMinSize());
-
processor.setNoCompressionStrongETag(proto.getNoCompressionStrongETag());
-processor.setCompression(proto.getCompression());
-
processor.setNoCompressionUserAgents(proto.getNoCompressionUserAgents());
-
processor.setCompressableMimeTypes(proto.getCompressableMimeTypes());
-processor.setRestrictedUserAgents(proto.getRestrictedUserAgents());
-processor.setSocketBuffer(proto.getSocketBuffer());
-processor.setMaxSavePostSize(proto.getMaxSavePostSize());
-processor.setServer(proto.getServer());
-processor.setMaxCookieCount(proto.getMaxCookieCount());
+proto.configureProcessor(processor);
 register(processor);
 return processor;
 }
diff --git a/java/org/apache/coyote/http11/Http11Protocol.java 
b/java/org/apache/coyote/http11/Http11Protocol.java
index 2e59197..c2997a2 100644
--- a/java/org/apache/coyote/http11/Http11Protocol.java
+++ b/java/org/apache/coyote/http11/Http11Protocol.java
@@ -168,23 +168,8 @@ public class Http11Protocol extends 
AbstractHttp11JsseProtocol {
 proto.getAllowedTrailerHeadersAsSet(), 
proto.getMaxExtensionSize(),
 

[tomcat] 01/03: Deprecate get/set attribute

[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 b1e276009f984c2071b232f807de06973c08bbdf
Author: Mark Thomas 
AuthorDate: Tue May 5 09:48:23 2020 +0100

Deprecate get/set attribute
---
 java/org/apache/catalina/connector/Connector.java | 8 
 1 file changed, 8 insertions(+)

diff --git a/java/org/apache/catalina/connector/Connector.java 
b/java/org/apache/catalina/connector/Connector.java
index 5a3a0f2..b06f6a6 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -320,7 +320,11 @@ public class Connector extends LifecycleMBeanBase  {
  *
  * @param name the property name
  * @return the property value
+ *
+ * @deprecated Use {@link #getProperty(String)}. This will be removed in
+ * Tomcat 10 onwards.
  */
+@Deprecated
 public Object getAttribute(String name) {
 return getProperty(name);
 }
@@ -331,7 +335,11 @@ public class Connector extends LifecycleMBeanBase  {
  *
  * @param name the property name
  * @param value the property value
+ *
+ * @deprecated Use {@link #setProperty(String, String)}. This will be
+ * removed in Tomcat 10 onwards.
  */
+@Deprecated
 public void setAttribute(String name, Object value) {
 setProperty(name, String.valueOf(value));
 }


-
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 (1b75434 -> 00d95b6)

[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 1b75434  Backport updates to Chinese translations
 new b1e2760  Deprecate get/set attribute
 new 47c9f38  Use setProperty and test return value in preference to 
setAttribute
 new 00d95b6  No need to duplicate class level @SuppressWarnings annotation

The 3 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:
 java/javax/servlet/http/HttpSessionContext.java|   2 -
 java/org/apache/catalina/connector/Connector.java  |   8 +
 .../apache/catalina/core/ApplicationContext.java   |   2 +-
 .../connector/TestCoyoteAdapterRequestFuzzing.java |   2 +-
 .../apache/catalina/core/TestAsyncContextImpl.java |   3 +-
 .../catalina/core/TestSwallowAbortedUploads.java   |   2 +-
 .../apache/catalina/mbeans/TestRegistration.java   |   2 +-
 .../apache/catalina/startup/TomcatBaseTest.java|   7 +-
 .../coyote/http11/TestAbstractHttp11Processor.java | 650 +
 .../apache/tomcat/util/http/TestMimeHeaders.java   |   3 +-
 test/org/apache/tomcat/util/net/TestCustomSsl.java |   7 +-
 test/org/apache/tomcat/util/net/TesterSupport.java |  22 +-
 12 files changed, 681 insertions(+), 29 deletions(-)


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

[tomcat] 02/03: Use setProperty and test return value in preference to setAttribute

[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 47c9f3813795f881f1d9b93ec3c1a259641f1a06
Author: Mark Thomas 
AuthorDate: Wed Jan 15 19:40:52 2020 +

Use setProperty and test return value in preference to setAttribute
---
 .../apache/catalina/core/ApplicationContext.java   |   2 +-
 .../connector/TestCoyoteAdapterRequestFuzzing.java |   2 +-
 .../apache/catalina/core/TestAsyncContextImpl.java |   3 +-
 .../catalina/core/TestSwallowAbortedUploads.java   |   2 +-
 .../apache/catalina/mbeans/TestRegistration.java   |   2 +-
 .../apache/catalina/startup/TomcatBaseTest.java|   7 +-
 .../coyote/http11/TestAbstractHttp11Processor.java | 650 +
 .../apache/tomcat/util/http/TestMimeHeaders.java   |   3 +-
 test/org/apache/tomcat/util/net/TestCustomSsl.java |   7 +-
 test/org/apache/tomcat/util/net/TesterSupport.java |  22 +-
 10 files changed, 673 insertions(+), 27 deletions(-)

diff --git a/java/org/apache/catalina/core/ApplicationContext.java 
b/java/org/apache/catalina/core/ApplicationContext.java
index 833c06e..dfd02a9 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -1043,7 +1043,7 @@ public class ApplicationContext implements ServletContext 
{
 Connector[] connectors = service.findConnectors();
 // Need at least one SSL enabled connector to use the SSL session ID.
 for (Connector connector : connectors) {
-if (Boolean.TRUE.equals(connector.getAttribute("SSLEnabled"))) {
+if (Boolean.TRUE.equals(connector.getProperty("SSLEnabled"))) {
 supportedSessionTrackingModes.add(SessionTrackingMode.SSL);
 break;
 }
diff --git 
a/test/org/apache/catalina/connector/TestCoyoteAdapterRequestFuzzing.java 
b/test/org/apache/catalina/connector/TestCoyoteAdapterRequestFuzzing.java
index b998ba1..6c89fd3 100644
--- a/test/org/apache/catalina/connector/TestCoyoteAdapterRequestFuzzing.java
+++ b/test/org/apache/catalina/connector/TestCoyoteAdapterRequestFuzzing.java
@@ -110,7 +110,7 @@ public class TestCoyoteAdapterRequestFuzzing extends 
TomcatBaseTest {
 @Test
 public void doTest() throws Exception {
 Tomcat tomcat = getTomcatInstance();
-tomcat.getConnector().setAttribute("restrictedUserAgents", 
"value-not-important");
+
Assert.assertTrue(tomcat.getConnector().setProperty("restrictedUserAgents", 
"value-not-important"));
 
 File appDir = new File("test/webapp");
 Context ctxt = tomcat.addContext("", appDir.getAbsolutePath());
diff --git a/test/org/apache/catalina/core/TestAsyncContextImpl.java 
b/test/org/apache/catalina/core/TestAsyncContextImpl.java
index 7aff34b..54a9e8b 100644
--- a/test/org/apache/catalina/core/TestAsyncContextImpl.java
+++ b/test/org/apache/catalina/core/TestAsyncContextImpl.java
@@ -165,8 +165,7 @@ public class TestAsyncContextImpl extends TomcatBaseTest {
 Tomcat tomcat = getTomcatInstance();
 
 // Minimise pauses during test
-tomcat.getConnector().setAttribute(
-"connectionTimeout", Integer.valueOf(3000));
+
Assert.assertTrue(tomcat.getConnector().setProperty("connectionTimeout", 
"3000"));
 
 // No file system docBase required
 Context ctx = tomcat.addContext("", null);
diff --git a/test/org/apache/catalina/core/TestSwallowAbortedUploads.java 
b/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
index b8f71ed..450d9fc 100644
--- a/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
+++ b/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
@@ -430,7 +430,7 @@ public class TestSwallowAbortedUploads extends 
TomcatBaseTest {
 // No need for target to exist.
 
 if (!limit) {
-tomcat.getConnector().setAttribute("maxSwallowSize", "-1");
+
Assert.assertTrue(tomcat.getConnector().setProperty("maxSwallowSize", "-1"));
 }
 
 tomcat.start();
diff --git a/test/org/apache/catalina/mbeans/TestRegistration.java 
b/test/org/apache/catalina/mbeans/TestRegistration.java
index 892ff8d..bc14553 100644
--- a/test/org/apache/catalina/mbeans/TestRegistration.java
+++ b/test/org/apache/catalina/mbeans/TestRegistration.java
@@ -169,7 +169,7 @@ public class TestRegistration extends TomcatBaseTest {
 // Disable keep-alive otherwise request processing threads in 
keep-alive
 // won't shut down fast enough with BIO to de-register the processor
 // triggering a test failure
-tomcat.getConnector().setAttribute("maxKeepAliveRequests", 
Integer.valueOf(1));
+
Assert.assertTrue(tomcat.getConnector().setProperty("maxKeepAliveRequests", 
"1"));
 
 tomcat.start();
 
diff --git a/test/org/apache/catalina/startup/TomcatBaseTest.java 

[tomcat] 03/03: No need to duplicate class level @SuppressWarnings annotation

[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 00d95b6ffc8118f274369ad2c89fd98898edd7d2
Author: Mark Thomas 
AuthorDate: Tue May 5 10:37:04 2020 +0100

No need to duplicate class level @SuppressWarnings annotation
---
 java/javax/servlet/http/HttpSessionContext.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/java/javax/servlet/http/HttpSessionContext.java 
b/java/javax/servlet/http/HttpSessionContext.java
index 13fb133..f1bab21 100644
--- a/java/javax/servlet/http/HttpSessionContext.java
+++ b/java/javax/servlet/http/HttpSessionContext.java
@@ -40,7 +40,6 @@ public interface HttpSessionContext {
  * must return null and will be removed in a future version of
  * this API.
  */
-@SuppressWarnings("dep-ann")
 // Spec API does not use @Deprecated
 public HttpSession getSession(String sessionId);
 
@@ -51,7 +50,6 @@ public interface HttpSessionContext {
  * must return an empty Enumeration and will be
  * removed in a future version of this API.
  */
-@SuppressWarnings("dep-ann")
 // Spec API does not use @Deprecated
 public Enumeration getIds();
 }


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

Re: Plans for 10.0.0-M5 etc

[Rémy Maucherat]

On Tue, May 5, 2020 at 10:45 AM Mark Thomas  wrote:

> Hi all,
>
> I am planning to start the monthly release cycle later today. I have a
> few bits and bobs of clean-up that I want to get done before tagging as
> well as my usual unit test run. I'll probably be in a position to tag
> towards the end of today.
>

No problem, I'm out of big todo items right now.

Rémy


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

[tomcat] 02/02: Use setProperty and test return value in preference to setAttribute

[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 906698fee92f0e571ca54db98ec0e163972285a2
Author: Mark Thomas 
AuthorDate: Wed Jan 15 19:40:52 2020 +

Use setProperty and test return value in preference to setAttribute
---
 .../connector/TestCoyoteAdapterRequestFuzzing.java |  2 +-
 .../apache/catalina/core/TestAsyncContextImpl.java |  3 +-
 .../catalina/core/TestSwallowAbortedUploads.java   |  2 +-
 .../apache/catalina/startup/TomcatBaseTest.java|  7 ++--
 .../apache/coyote/http11/TestHttp11Processor.java  | 46 +++---
 .../util/http/TestMimeHeadersIntegration.java  |  3 +-
 test/org/apache/tomcat/util/net/TesterSupport.java |  2 +-
 .../tomcat/websocket/TestConnectionLimit.java  |  3 +-
 8 files changed, 33 insertions(+), 35 deletions(-)

diff --git 
a/test/org/apache/catalina/connector/TestCoyoteAdapterRequestFuzzing.java 
b/test/org/apache/catalina/connector/TestCoyoteAdapterRequestFuzzing.java
index dc8ac5e..f2edf46 100644
--- a/test/org/apache/catalina/connector/TestCoyoteAdapterRequestFuzzing.java
+++ b/test/org/apache/catalina/connector/TestCoyoteAdapterRequestFuzzing.java
@@ -110,7 +110,7 @@ public class TestCoyoteAdapterRequestFuzzing extends 
TomcatBaseTest {
 @Test
 public void doTest() throws Exception {
 Tomcat tomcat = getTomcatInstance();
-tomcat.getConnector().setAttribute("restrictedUserAgents", 
"value-not-important");
+
Assert.assertTrue(tomcat.getConnector().setProperty("restrictedUserAgents", 
"value-not-important"));
 
 File appDir = new File("test/webapp");
 Context ctxt = tomcat.addContext("", appDir.getAbsolutePath());
diff --git a/test/org/apache/catalina/core/TestAsyncContextImpl.java 
b/test/org/apache/catalina/core/TestAsyncContextImpl.java
index b82b2bb..f4ef44c 100644
--- a/test/org/apache/catalina/core/TestAsyncContextImpl.java
+++ b/test/org/apache/catalina/core/TestAsyncContextImpl.java
@@ -171,8 +171,7 @@ public class TestAsyncContextImpl extends TomcatBaseTest {
 Tomcat tomcat = getTomcatInstance();
 
 // Minimise pauses during test
-tomcat.getConnector().setAttribute(
-"connectionTimeout", Integer.valueOf(3000));
+
Assert.assertTrue(tomcat.getConnector().setProperty("connectionTimeout", 
"3000"));
 
 // No file system docBase required
 Context ctx = tomcat.addContext("", null);
diff --git a/test/org/apache/catalina/core/TestSwallowAbortedUploads.java 
b/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
index 72e3a7b..83b1634 100644
--- a/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
+++ b/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
@@ -431,7 +431,7 @@ public class TestSwallowAbortedUploads extends 
TomcatBaseTest {
 // No need for target to exist.
 
 if (!limit) {
-tomcat.getConnector().setAttribute("maxSwallowSize", "-1");
+
Assert.assertTrue(tomcat.getConnector().setProperty("maxSwallowSize", "-1"));
 }
 
 tomcat.start();
diff --git a/test/org/apache/catalina/startup/TomcatBaseTest.java 
b/test/org/apache/catalina/startup/TomcatBaseTest.java
index ac7c3f5..75e588d 100644
--- a/test/org/apache/catalina/startup/TomcatBaseTest.java
+++ b/test/org/apache/catalina/startup/TomcatBaseTest.java
@@ -170,12 +170,11 @@ public abstract class TomcatBaseTest extends 
LoggingBaseTest {
 String protocol = getProtocol();
 Connector connector = new Connector(protocol);
 // Listen only on localhost
-connector.setAttribute("address",
-InetAddress.getByName("localhost").getHostAddress());
+Assert.assertTrue(connector.setProperty("address", 
InetAddress.getByName("localhost").getHostAddress()));
 // Use random free port
 connector.setPort(0);
 // Mainly set to reduce timeouts during async tests
-connector.setAttribute("connectionTimeout", "3000");
+Assert.assertTrue(connector.setProperty("connectionTimeout", "3000"));
 tomcat.getService().addConnector(connector);
 tomcat.setConnector(connector);
 
@@ -185,7 +184,7 @@ public abstract class TomcatBaseTest extends 
LoggingBaseTest {
 AprLifecycleListener listener = new AprLifecycleListener();
 listener.setSSLRandomSeed("/dev/urandom");
 server.addLifecycleListener(listener);
-connector.setAttribute("pollerThreadCount", Integer.valueOf(1));
+Assert.assertTrue(connector.setProperty("pollerThreadCount", "1"));
 }
 
 File catalinaBase = getTemporaryDirectory();
diff --git a/test/org/apache/coyote/http11/TestHttp11Processor.java 
b/test/org/apache/coyote/http11/TestHttp11Processor.java
index 4707a09..174793e 100644
--- a/test/org/apache/coyote/http11/TestHttp11Processor.java
+++ 

[tomcat] branch 8.5.x updated (8cd5cfb -> 906698f)

[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 8cd5cfb  Fix comment
 new 651a6a6  Deprecate get/set attribute
 new 906698f  Use setProperty and test return value in preference to 
setAttribute

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:
 java/org/apache/catalina/connector/Connector.java  |  8 
 .../connector/TestCoyoteAdapterRequestFuzzing.java |  2 +-
 .../apache/catalina/core/TestAsyncContextImpl.java |  3 +-
 .../catalina/core/TestSwallowAbortedUploads.java   |  2 +-
 .../apache/catalina/startup/TomcatBaseTest.java|  7 ++--
 .../apache/coyote/http11/TestHttp11Processor.java  | 46 +++---
 .../util/http/TestMimeHeadersIntegration.java  |  3 +-
 test/org/apache/tomcat/util/net/TesterSupport.java |  2 +-
 .../tomcat/websocket/TestConnectionLimit.java  |  3 +-
 9 files changed, 41 insertions(+), 35 deletions(-)


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

[tomcat] 01/02: Deprecate get/set attribute

[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 651a6a609010ed2bc6680bb28d9f2ef365709828
Author: Mark Thomas 
AuthorDate: Tue May 5 09:48:23 2020 +0100

Deprecate get/set attribute
---
 java/org/apache/catalina/connector/Connector.java | 8 
 1 file changed, 8 insertions(+)

diff --git a/java/org/apache/catalina/connector/Connector.java 
b/java/org/apache/catalina/connector/Connector.java
index 6bbab26..c248c0c 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -335,7 +335,11 @@ public class Connector extends LifecycleMBeanBase  {
  *
  * @param name the property name
  * @return the property value
+ *
+ * @deprecated Use {@link #getProperty(String)}. This will be removed in
+ * Tomcat 10 onwards.
  */
+@Deprecated
 public Object getAttribute(String name) {
 return getProperty(name);
 }
@@ -346,7 +350,11 @@ public class Connector extends LifecycleMBeanBase  {
  *
  * @param name the property name
  * @param value the property value
+ *
+ * @deprecated Use {@link #setProperty(String, String)}. This will be
+ * removed in Tomcat 10 onwards.
  */
+@Deprecated
 public void setAttribute(String name, Object value) {
 setProperty(name, String.valueOf(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: Correct comment

[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 99135bc  Correct comment
99135bc is described below

commit 99135bc2158c3d241e84b3bffc93efdb43cdaa36
Author: Mark Thomas 
AuthorDate: Tue May 5 10:07:51 2020 +0100

Correct comment
---
 java/org/apache/catalina/connector/Connector.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/connector/Connector.java 
b/java/org/apache/catalina/connector/Connector.java
index 90c218a..b493387 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -330,7 +330,7 @@ public class Connector extends LifecycleMBeanBase  {
  * @param name the property name
  * @param value the property value
  *
- * @deprecated Use {@link #setAttribute(String, Object)}. This will be
+ * @deprecated Use {@link #setProperty(String, String)}. This will be
  * removed in Tomcat 10 onwards.
  */
 @Deprecated


-
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: Deprecate get/set attribute

[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 a02375c  Deprecate get/set attribute
a02375c is described below

commit a02375cfe67eb8b7ce6f71a5f5e052a5f3755f73
Author: Mark Thomas 
AuthorDate: Tue May 5 09:48:23 2020 +0100

Deprecate get/set attribute
---
 java/org/apache/catalina/connector/Connector.java | 8 
 1 file changed, 8 insertions(+)

diff --git a/java/org/apache/catalina/connector/Connector.java 
b/java/org/apache/catalina/connector/Connector.java
index eefb6aa..90c218a 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -314,7 +314,11 @@ public class Connector extends LifecycleMBeanBase  {
  *
  * @param name the property name
  * @return the property value
+ *
+ * @deprecated Use {@link #getProperty(String)}. This will be removed in
+ * Tomcat 10 onwards.
  */
+@Deprecated
 public Object getAttribute(String name) {
 return getProperty(name);
 }
@@ -325,7 +329,11 @@ public class Connector extends LifecycleMBeanBase  {
  *
  * @param name the property name
  * @param value the property value
+ *
+ * @deprecated Use {@link #setAttribute(String, Object)}. This will be
+ * removed in Tomcat 10 onwards.
  */
+@Deprecated
 public void setAttribute(String name, Object value) {
 setProperty(name, String.valueOf(value));
 }


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

[tomcat] 01/02: Deprecate get/set attribute

[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 9b1a6f6350b22a3991d785bea91f95c41660fa19
Author: Mark Thomas 
AuthorDate: Tue May 5 09:48:23 2020 +0100

Deprecate get/set attribute
---
 java/org/apache/catalina/connector/Connector.java | 8 
 1 file changed, 8 insertions(+)

diff --git a/java/org/apache/catalina/connector/Connector.java 
b/java/org/apache/catalina/connector/Connector.java
index 2a56d16..033b194 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -326,7 +326,11 @@ public class Connector extends LifecycleMBeanBase  {
  *
  * @param name the property name
  * @return the property value
+ *
+ * @deprecated Use {@link #getProperty(String)}. This will be removed in
+ * Tomcat 10 onwards.
  */
+@Deprecated
 public Object getAttribute(String name) {
 return getProperty(name);
 }
@@ -337,7 +341,11 @@ public class Connector extends LifecycleMBeanBase  {
  *
  * @param name the property name
  * @param value the property value
+ *
+ * @deprecated Use {@link #setAttribute(String, Object)}. This will be
+ * removed in Tomcat 10 onwards.
  */
+@Deprecated
 public void setAttribute(String name, Object value) {
 setProperty(name, String.valueOf(value));
 }


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

[tomcat] 02/02: Remove deprecated code

[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 563f85ab1076fdf7329b2c6cbae22d64a859d572
Author: Mark Thomas 
AuthorDate: Tue May 5 09:48:44 2020 +0100

Remove deprecated code
---
 java/org/apache/catalina/connector/Connector.java | 30 ---
 1 file changed, 30 deletions(-)

diff --git a/java/org/apache/catalina/connector/Connector.java 
b/java/org/apache/catalina/connector/Connector.java
index 033b194..e941291 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -322,36 +322,6 @@ public class Connector extends LifecycleMBeanBase  {
 
 
 /**
- * Return a property from the protocol handler.
- *
- * @param name the property name
- * @return the property value
- *
- * @deprecated Use {@link #getProperty(String)}. This will be removed in
- * Tomcat 10 onwards.
- */
-@Deprecated
-public Object getAttribute(String name) {
-return getProperty(name);
-}
-
-
-/**
- * Set a property on the protocol handler.
- *
- * @param name the property name
- * @param value the property value
- *
- * @deprecated Use {@link #setAttribute(String, Object)}. This will be
- * removed in Tomcat 10 onwards.
- */
-@Deprecated
-public void setAttribute(String name, Object value) {
-setProperty(name, String.valueOf(value));
-}
-
-
-/**
  * @return the Service with which we are associated (if any).
  */
 public Service getService() {


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

[tomcat] branch master updated (5be7aab -> 563f85a)

[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 5be7aab  Fix comment
 new 9b1a6f6  Deprecate get/set attribute
 new 563f85a  Remove deprecated code

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:
 java/org/apache/catalina/connector/Connector.java | 22 --
 1 file changed, 22 deletions(-)


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

Plans for 10.0.0-M5 etc

[Mark Thomas]

Hi all,

I am planning to start the monthly release cycle later today. I have a
few bits and bobs of clean-up that I want to get done before tagging as
well as my usual unit test run. I'll probably be in a position to tag
towards the end of today.

Mark

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

[tomcat] branch 8.5.x updated: Fix comment

[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 8cd5cfb  Fix comment
8cd5cfb is described below

commit 8cd5cfb4fa0d885f964809a63f1c6c2aa7a229af
Author: Mark Thomas 
AuthorDate: Tue May 5 09:32:24 2020 +0100

Fix comment
---
 test/org/apache/coyote/http2/TestStreamProcessor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/org/apache/coyote/http2/TestStreamProcessor.java 
b/test/org/apache/coyote/http2/TestStreamProcessor.java
index cfa0863..d660638 100644
--- a/test/org/apache/coyote/http2/TestStreamProcessor.java
+++ b/test/org/apache/coyote/http2/TestStreamProcessor.java
@@ -240,7 +240,7 @@ public class TestStreamProcessor extends Http2TestBase {
 Tomcat.addServlet(ctxt, "compression", new CompressionServlet());
 ctxt.addServletMappingDecoded("/compression", "compression");
 
-// Enable compression for the LargeServlet
+// Enable compression
 Connector connector = tomcat.getConnector();
 
 tomcat.start();


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

[tomcat] branch master updated: Fix comment

[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 5be7aab  Fix comment
5be7aab is described below

commit 5be7aabfd478baab101d9037fbf772aa8e8fda2e
Author: Mark Thomas 
AuthorDate: Tue May 5 09:32:24 2020 +0100

Fix comment
---
 test/org/apache/coyote/http2/TestStreamProcessor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/org/apache/coyote/http2/TestStreamProcessor.java 
b/test/org/apache/coyote/http2/TestStreamProcessor.java
index e72be5f..6628d0f 100644
--- a/test/org/apache/coyote/http2/TestStreamProcessor.java
+++ b/test/org/apache/coyote/http2/TestStreamProcessor.java
@@ -239,7 +239,7 @@ public class TestStreamProcessor extends Http2TestBase {
 Tomcat.addServlet(ctxt, "compression", new CompressionServlet());
 ctxt.addServletMappingDecoded("/compression", "compression");
 
-// Enable compression for the LargeServlet
+// Enable compression
 Connector connector = tomcat.getConnector();
 Assert.assertTrue(connector.setProperty("compression", "on"));
 


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

[tomcat] branch 9.0.x updated: Fix comment

[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 bb83129  Fix comment
bb83129 is described below

commit bb8312958b661218bf18b50eda7fef71642693db
Author: Mark Thomas 
AuthorDate: Tue May 5 09:32:24 2020 +0100

Fix comment
---
 test/org/apache/coyote/http2/TestStreamProcessor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/org/apache/coyote/http2/TestStreamProcessor.java 
b/test/org/apache/coyote/http2/TestStreamProcessor.java
index cfa0863..d660638 100644
--- a/test/org/apache/coyote/http2/TestStreamProcessor.java
+++ b/test/org/apache/coyote/http2/TestStreamProcessor.java
@@ -240,7 +240,7 @@ public class TestStreamProcessor extends Http2TestBase {
 Tomcat.addServlet(ctxt, "compression", new CompressionServlet());
 ctxt.addServletMappingDecoded("/compression", "compression");
 
-// Enable compression for the LargeServlet
+// Enable compression
 Connector connector = tomcat.getConnector();
 
 tomcat.start();


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

Re: [tomcat] branch master updated: Fix BZ 64403 Compressed h2 responses should not have C-L header

[Mark Thomas]

On 05/05/2020 06:38, Martin Grigorov wrote:
> On Mon, May 4, 2020 at 11:06 PM 

> 
> +        // Enable compression for the LargeServlet
> 
> 
> What is LargeServlet ?
> There are only SimpleServlet and CompressionServlet in this test.

Ah. The comment is out of date. I started writing the text case using
LargeServlet but found it was easier to use a new Servlet to generate
the output to be compressed than handle all the differences when
enabling compression for LargeServlet.

I'll correct the comment.

Mark

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

Re: [tomcat] branch 9.0.x updated: Set the compression on the HTTP/2 protocol

[Mark Thomas]

On 05/05/2020 08:00, r...@apache.org wrote:
> This is an automated email from the ASF dual-hosted git repository.
> 
> remm pushed a commit to branch 9.0.x
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
> 
> 
> The following commit(s) were added to refs/heads/9.0.x by this push:
>  new e79485b  Set the compression on the HTTP/2 protocol
> e79485b is described below
> 
> commit e79485b1214c7dd9b320efdce5740c58e599635e
> Author: remm 
> AuthorDate: Tue May 5 09:00:06 2020 +0200
> 
> Set the compression on the HTTP/2 protocol

Thanks for fixing this.

Mark

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

buildbot success in on tomcat-85-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-85-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-85-trunk/builds/2298

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' 
triggered this build
Build Source Stamp: [branch 8.5.x] d985886c0fdfd7ce39b18c8f896845140d1b1853
Blamelist: remm 

Build succeeded!

Sincerely,
 -The Buildbot




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

buildbot success in on tomcat-9-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-9-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-9-trunk/builds/222

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-9-commit' 
triggered this build
Build Source Stamp: [branch 9.0.x] e79485b1214c7dd9b320efdce5740c58e599635e
Blamelist: remm 

Build succeeded!

Sincerely,
 -The Buildbot




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

[tomcat] branch 8.5.x updated: Set the compression on the HTTP/2 protocol

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm 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 d985886  Set the compression on the HTTP/2 protocol
d985886 is described below

commit d985886c0fdfd7ce39b18c8f896845140d1b1853
Author: remm 
AuthorDate: Tue May 5 09:00:06 2020 +0200

Set the compression on the HTTP/2 protocol
---
 test/org/apache/coyote/http2/TestStreamProcessor.java | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/org/apache/coyote/http2/TestStreamProcessor.java 
b/test/org/apache/coyote/http2/TestStreamProcessor.java
index a46e1b2..cfa0863 100644
--- a/test/org/apache/coyote/http2/TestStreamProcessor.java
+++ b/test/org/apache/coyote/http2/TestStreamProcessor.java
@@ -37,6 +37,7 @@ import org.apache.catalina.Context;
 import org.apache.catalina.Wrapper;
 import org.apache.catalina.connector.Connector;
 import org.apache.catalina.startup.Tomcat;
+import org.apache.coyote.UpgradeProtocol;
 import org.apache.tomcat.util.compat.JrePlatform;
 import org.apache.tomcat.util.http.FastHttpDateFormat;
 
@@ -241,11 +242,15 @@ public class TestStreamProcessor extends Http2TestBase {
 
 // Enable compression for the LargeServlet
 Connector connector = tomcat.getConnector();
-Assert.assertTrue(connector.setProperty("compression", "on"));
 
 tomcat.start();
 
 enableHttp2();
+for (UpgradeProtocol protocol : connector.findUpgradeProtocols()) {
+if (protocol instanceof Http2Protocol) {
+((Http2Protocol) protocol).setCompression("on");
+}
+}
 openClientConnection();
 doHttpUpgrade();
 sendClientPreface();


-
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: Set the compression on the HTTP/2 protocol

[remm]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new e79485b  Set the compression on the HTTP/2 protocol
e79485b is described below

commit e79485b1214c7dd9b320efdce5740c58e599635e
Author: remm 
AuthorDate: Tue May 5 09:00:06 2020 +0200

Set the compression on the HTTP/2 protocol
---
 test/org/apache/coyote/http2/TestStreamProcessor.java | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/org/apache/coyote/http2/TestStreamProcessor.java 
b/test/org/apache/coyote/http2/TestStreamProcessor.java
index a46e1b2..cfa0863 100644
--- a/test/org/apache/coyote/http2/TestStreamProcessor.java
+++ b/test/org/apache/coyote/http2/TestStreamProcessor.java
@@ -37,6 +37,7 @@ import org.apache.catalina.Context;
 import org.apache.catalina.Wrapper;
 import org.apache.catalina.connector.Connector;
 import org.apache.catalina.startup.Tomcat;
+import org.apache.coyote.UpgradeProtocol;
 import org.apache.tomcat.util.compat.JrePlatform;
 import org.apache.tomcat.util.http.FastHttpDateFormat;
 
@@ -241,11 +242,15 @@ public class TestStreamProcessor extends Http2TestBase {
 
 // Enable compression for the LargeServlet
 Connector connector = tomcat.getConnector();
-Assert.assertTrue(connector.setProperty("compression", "on"));
 
 tomcat.start();
 
 enableHttp2();
+for (UpgradeProtocol protocol : connector.findUpgradeProtocols()) {
+if (protocol instanceof Http2Protocol) {
+((Http2Protocol) protocol).setCompression("on");
+}
+}
 openClientConnection();
 doHttpUpgrade();
 sendClientPreface();


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