[tomcat] 01/01: Tag 9.0.31

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

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

commit b6ff6f5c8a977fad074ae64c7ba4e38968d70b86
Author: Mark Thomas 
AuthorDate: Wed Feb 5 19:26:48 2020 +

Tag 9.0.31
---
 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 ffe38de..19ed0b3 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=9
 version.minor=0
 version.build=31
 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 948505b..25ccd44 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.31 created (now b6ff6f5)

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

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


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

 new b6ff6f5  Tag 9.0.31

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



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



[tomcat] branch master updated: Increment version for next dev cycle

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 51f8c1c  Increment version for next dev cycle
51f8c1c is described below

commit 51f8c1c1445a3ff5df460754f24a42e913c55f08
Author: Mark Thomas 
AuthorDate: Wed Feb 5 18:00:36 2020 +

Increment version for next dev cycle
---
 webapps/docs/changelog.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index fb86ab4..108e7c7 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).
 -->
-
+
+
+
   
 
   This release contains all of the changes upto and including those in


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



svn commit: r37888 - in /dev/tomcat/tomcat-9/v9.0.31: ./ bin/ bin/embed/ src/

2020-02-05 Thread markt
Author: markt
Date: Wed Feb  5 20:25:57 2020
New Revision: 37888

Log:
Upload 9.0.31 for voting

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

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

Added: dev/tomcat/tomcat-9/v9.0.31/KEYS
==
--- dev/tomcat/tomcat-9/v9.0.31/KEYS (added)
+++ dev/tomcat/tomcat-9/v9.0.31/KEYS Wed Feb  5 20:25:57 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] branch 8.5.x updated (03c4361 -> b9eb876)

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

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


from 03c4361  Refactor secret check
 new 92d0da1  Fix typo
 new b9eb876  Missing credit

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


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


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



[tomcat] 02/03: Missing credit

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

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

commit b9824fd186bf8740de575563a353eb801e10cfc5
Author: Mark Thomas 
AuthorDate: Wed Feb 5 21:23:12 2020 +

Missing credit
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index faed189..3789e5d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -133,7 +133,7 @@
   
 Fix a problem that meant that remote host, address and port information
 could be missing in the access log for an HTTP/2 request where the
-connection was closed unexpectely.
+connection was closed unexpectely. (markt)
   
 
   


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



[tomcat] 01/03: Fix typo

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

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

commit 253322a12d4cfbd029b486e5be8a0b484e075aeb
Author: Mark Thomas 
AuthorDate: Wed Feb 5 21:21:34 2020 +

Fix typo
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 948505b..faed189 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -229,7 +229,7 @@
 
   
 64000: In the examples web application, where a Servlet
-example includes ii18n support, the Locale used should be based on the
+example includes i18n support, the Locale used should be based on the
 request locale and not the server locale. (markt)
   
   


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



[tomcat] 03/03: Increment version number for next development cycle

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

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

commit f9faad60368c9c346e43cf78b8e5d82115e5acf8
Author: Mark Thomas 
AuthorDate: Wed Feb 5 21:30:06 2020 +

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 ffe38de..010b6e5 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=9
 version.minor=0
-version.build=31
+version.build=32
 version.patch=0
 version.suffix=-dev
 
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index a258b78..8fce25e 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.31
+maven.asf.release.deploy.version=9.0.32
 
 #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 3789e5d..d46f660 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] 01/02: Fix typo

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

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

commit 92d0da1b7d2dea3415f3fd1e95cb29677f4c1e4e
Author: Mark Thomas 
AuthorDate: Wed Feb 5 21:21:34 2020 +

Fix typo
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b640408..1daf575 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -234,7 +234,7 @@
 
   
 64000: In the examples web application, where a Servlet
-example includes ii18n support, the Locale used should be based on the
+example includes i18n support, the Locale used should be based on the
 request locale and not the server locale. (markt)
   
   


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



[tomcat] 02/02: Missing credit

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

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

commit b9eb8768b084e7c027ef0fde2ef95197540de9eb
Author: Mark Thomas 
AuthorDate: Wed Feb 5 21:23:12 2020 +

Missing credit
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1daf575..63f7c6a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -141,7 +141,7 @@
   
 Fix a problem that meant that remote host, address and port information
 could be missing in the access log for an HTTP/2 request where the
-connection was closed unexpectely.
+connection was closed unexpectely. (markt)
   
 
   


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



[tomcat] branch 7.0.x updated: Fix typo

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

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new c7803ee  Fix typo
c7803ee is described below

commit c7803ee7ab5795f865d9b4cac121710b30097c1d
Author: Mark Thomas 
AuthorDate: Wed Feb 5 21:21:34 2020 +

Fix typo
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4adc3f1..2f29dee 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -188,7 +188,7 @@
 
   
 64000: In the examples web application, where a Servlet
-example includes ii18n support, the Locale used should be based on the
+example includes i18n support, the Locale used should be based on the
 request locale and not the server locale. (markt)
   
 


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



Nexus: Staging Completed

2020-02-05 Thread Nexus Repository Manager
Message from: https://repository.apache.orgDeployer properties:"userAgent" = "maven-artifact/2.2.1 (Java 1.8.0_232; Windows 10 10.0)""userId" = "markt""ip" = "109.149.198.114"Details:The following artifacts have been staged/org/apache/tomcat/tomcat-i18n-de/9.0.31/tomcat-i18n-de-9.0.31.pom(SHA1: cd9d11aa85c9779941a5f1cd32835dfdd354ed0d)/org/apache/tomcat/tomcat-i18n-de/9.0.31/tomcat-i18n-de-9.0.31.jar.asc(SHA1: 3625045132f23eeb177d655706d0e058aad9a1f3)/org/apache/tomcat/tomcat-i18n-de/9.0.31/tomcat-i18n-de-9.0.31.pom.asc(SHA1: 6baa55410345e5109bcb771cd3e0bf1a0a96f0c6)/org/apache/tomcat/tomcat-i18n-de/9.0.31/tomcat-i18n-de-9.0.31.jar(SHA1: f6a9c92ff3d81fe766b4360e805167de19128500)/org/apache/tomcat/tomcat-jni/9.0.31/tomcat-jni-9.0.31.pom(SHA1: 1f3b3796e4319cab579bef4df43d5770dee4d0e4)/org/apache/tomcat/tomcat-jni/9.0.31/tomcat-jni-9.0.31.jar.asc(SHA1: 2ed4413d4f92d06c778d216ba2206369c8b2)/org/apache/tomcat/tomcat-jni/9.0.31/tomcat-jni-9.0.31.pom.asc(SHA1: f763e6d7a9ec5adbe5d57ba41f5fe0ba5e00885f)/org/apache/tomcat/tomcat-jni/9.0.31/tomcat-jni-9.0.31-sources.jar(SHA1: 63f7b3856ecb75b375747a8acdab7ef3d6502836)/org/apache/tomcat/tomcat-jni/9.0.31/tomcat-jni-9.0.31-sources.jar.asc(SHA1: c9fd03ddc4c9a22edf7685d459e04aeaedbcf5b3)/org/apache/tomcat/tomcat-jni/9.0.31/tomcat-jni-9.0.31.jar(SHA1: 4492f243ce4d099f814e35cc1f2883ca871de6ea)/org/apache/tomcat/tomcat-juli/9.0.31/tomcat-juli-9.0.31-sources.jar(SHA1: c1682f4fa5ce5c5c27e3ca81e243c6a5258053fc)/org/apache/tomcat/tomcat-juli/9.0.31/tomcat-juli-9.0.31.jar.asc(SHA1: 188cbb4516c811dc565187ca03c1c5e24a2b381f)/org/apache/tomcat/tomcat-juli/9.0.31/tomcat-juli-9.0.31.pom(SHA1: beed872ae35164754612f0eea2a96a723a6714e6)/org/apache/tomcat/tomcat-juli/9.0.31/tomcat-juli-9.0.31-sources.jar.asc(SHA1: 73de45c7519d86cf4d507dbabf0ceeea30b71b4b)/org/apache/tomcat/tomcat-juli/9.0.31/tomcat-juli-9.0.31.jar(SHA1: d6e741b265bfeb25d2af93e68cd568629263179a)/org/apache/tomcat/tomcat-juli/9.0.31/tomcat-juli-9.0.31.pom.asc(SHA1: 2524686701f1b0df75505322f7e7dab7fab8c828)/org/apache/tomcat/tomcat-util/9.0.31/tomcat-util-9.0.31.jar.asc(SHA1: bfe4e0619cb4030ec95c85e6fd0fe955b9b07f41)/org/apache/tomcat/tomcat-util/9.0.31/tomcat-util-9.0.31.pom(SHA1: 1d455ff693027f02834632dbbb4fd933589683d5)/org/apache/tomcat/tomcat-util/9.0.31/tomcat-util-9.0.31.pom.asc(SHA1: f13e9ed57d9b34492a019308d054c6f322afa1d8)/org/apache/tomcat/tomcat-util/9.0.31/tomcat-util-9.0.31-sources.jar(SHA1: b3deece44e59db015b10c28e0a6bd3d7a1b87cf7)/org/apache/tomcat/tomcat-util/9.0.31/tomcat-util-9.0.31-sources.jar.asc(SHA1: aced991ca4c73d74c745f5660951225fe59cd26b)/org/apache/tomcat/tomcat-util/9.0.31/tomcat-util-9.0.31.jar(SHA1: 36b1393ca0fb7f933c2a69124c8fb0e278c4d7dd)/org/apache/tomcat/tomcat-catalina/9.0.31/tomcat-catalina-9.0.31.jar(SHA1: d13dccd55a83c30f139d0540925625207ed35347)/org/apache/tomcat/tomcat-catalina/9.0.31/tomcat-catalina-9.0.31-sources.jar.asc(SHA1: 4451a49a990e5d7591eaba611ad966abe037b7e7)/org/apache/tomcat/tomcat-catalina/9.0.31/tomcat-catalina-9.0.31.pom(SHA1: 743f895fb3dcd9839e0c2f572b11afce75a26742)/org/apache/tomcat/tomcat-catalina/9.0.31/tomcat-catalina-9.0.31.pom.asc(SHA1: 75b2461103a582657c70130c638eb6450d6a603d)/org/apache/tomcat/tomcat-catalina/9.0.31/tomcat-catalina-9.0.31.jar.asc(SHA1: de0be9db701b39ab4492cf568beabd17070b2805)/org/apache/tomcat/tomcat-catalina/9.0.31/tomcat-catalina-9.0.31-sources.jar(SHA1: e103ad696a434ab438c99fa0af7b9f2d2a39a9e7)/org/apache/tomcat/tomcat-i18n-fr/9.0.31/tomcat-i18n-fr-9.0.31.pom(SHA1: 802fc17417ed0c0f5103894469c9788319e8968c)/org/apache/tomcat/tomcat-i18n-fr/9.0.31/tomcat-i18n-fr-9.0.31.jar(SHA1: 0c54a4c84bbc16f52e23a37092f4a54b147d0eae)/org/apache/tomcat/tomcat-i18n-fr/9.0.31/tomcat-i18n-fr-9.0.31.pom.asc(SHA1: 01347e0787c7e630851ff8c114b6612d979ed2a8)/org/apache/tomcat/tomcat-i18n-fr/9.0.31/tomcat-i18n-fr-9.0.31.jar.asc(SHA1: 9cd6b9a1ff1e005fd4ae9376bb7bb642bf02248c)/org/apache/tomcat/tomcat-i18n-cs/9.0.31/tomcat-i18n-cs-9.0.31.pom(SHA1: 8da6a768b8637b51429982d887349babb529ca8b)/org/apache/tomcat/tomcat-i18n-cs/9.0.31/tomcat-i18n-cs-9.0.31.pom.asc(SHA1: 157688dbf07f875ae66d2677e2567b4c406d0b4d)/org/apache/tomcat/tomcat-i18n-cs/9.0.31/tomcat-i18n-cs-9.0.31.jar.asc(SHA1: 405be548b8f7aecf30713e56f301e83f240fcd1c)/org/apache/tomcat/tomcat-i18n-cs/9.0.31/tomcat-i18n-cs-9.0.31.jar(SHA1: e1f4723fbfdecf60fd6e62f7563e9a032bd2a382)/org/apache/tomcat/tomcat-jdbc/9.0.31/tomcat-jdbc-9.0.31-sources.jar(SHA1: 3bbe52460d2a50d066e9ec9aa8fcc5997da692c8)/org/apache/tomcat/tomcat-jdbc/9.0.31/tomcat-jdbc-9.0.31.jar(SHA1: 28129623d8097e3e787f5866f20c2a78236a56b4)/org/apache/tomcat/tomcat-jdbc/9.0.31/tomcat-jdbc-9.0.31.pom.asc(SHA1: 18a8b178be7ff98326ef7b413004be7399037a12)/org/apache/tomcat/tomcat-jdbc/9.0.31/tomcat-jdbc-9.0.31.pom(SHA1: a6dbf75d72ce22157ca3756542fc9754418b4dfd)/org/apache/tomcat/tomcat-jdbc/9.0.31/tomcat-jdbc-9.0.31.jar.asc(SHA1: c504f6cc3af480a7d1fb8cbda79d7026a67c03ea)/org/apache/tomcat/tomcat-jdbc/9.0.31/tomcat-jdbc-9.0.31-sources.jar.asc(SHA1: 

[VOTE] Release Apache Tomcat 10.0.0.0-M1

2020-02-05 Thread Mark Thomas
The proposed Apache Tomcat 10.0.0.0-M1 release is now available for
voting. This is the first release of 10.0.0.x and is based on 9.0.31.

The major changes compared to 9.0.31  are:

- Complete the javax to jakarta package rename

- Remove duplication of configuration between HTTP/1.1 and HTTP/2.
  HTTP/2 will now inherit values from HTTP/1.1.

- Remove deprecated code

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.0-M1/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1244/
The tag is:
https://github.com/apache/tomcat/tree/10.0.0.0-M1
9797ba13e0e554c3b8e990f2dc4f846d2bdccf6d

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

I opted to only include alpha here as there are still some potentially
significant changes on the TOMCAT-NEXT list.


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



svn commit: r37885 - in /dev/tomcat/tomcat-10: ./ v10.0.0.0-M1/ v10.0.0.0-M1/bin/ v10.0.0.0-M1/bin/embed/ v10.0.0.0-M1/src/

2020-02-05 Thread markt
Author: markt
Date: Wed Feb  5 17:52:00 2020
New Revision: 37885

Log:
Upload Tomcat 10.0.0.0-M1 for voting

Added:
dev/tomcat/tomcat-10/
dev/tomcat/tomcat-10/v10.0.0.0-M1/
dev/tomcat/tomcat-10/v10.0.0.0-M1/KEYS
dev/tomcat/tomcat-10/v10.0.0.0-M1/README.html
dev/tomcat/tomcat-10/v10.0.0.0-M1/RELEASE-NOTES
dev/tomcat/tomcat-10/v10.0.0.0-M1/bin/
dev/tomcat/tomcat-10/v10.0.0.0-M1/bin/README.html

dev/tomcat/tomcat-10/v10.0.0.0-M1/bin/apache-tomcat-10.0.0.0-M1-deployer.tar.gz 
  (with props)

dev/tomcat/tomcat-10/v10.0.0.0-M1/bin/apache-tomcat-10.0.0.0-M1-deployer.tar.gz.asc

dev/tomcat/tomcat-10/v10.0.0.0-M1/bin/apache-tomcat-10.0.0.0-M1-deployer.tar.gz.sha512

dev/tomcat/tomcat-10/v10.0.0.0-M1/bin/apache-tomcat-10.0.0.0-M1-deployer.zip   
(with props)

dev/tomcat/tomcat-10/v10.0.0.0-M1/bin/apache-tomcat-10.0.0.0-M1-deployer.zip.asc

dev/tomcat/tomcat-10/v10.0.0.0-M1/bin/apache-tomcat-10.0.0.0-M1-deployer.zip.sha512

dev/tomcat/tomcat-10/v10.0.0.0-M1/bin/apache-tomcat-10.0.0.0-M1-fulldocs.tar.gz 
  (with props)

dev/tomcat/tomcat-10/v10.0.0.0-M1/bin/apache-tomcat-10.0.0.0-M1-fulldocs.tar.gz.asc

dev/tomcat/tomcat-10/v10.0.0.0-M1/bin/apache-tomcat-10.0.0.0-M1-fulldocs.tar.gz.sha512

dev/tomcat/tomcat-10/v10.0.0.0-M1/bin/apache-tomcat-10.0.0.0-M1-windows-x64.zip 
  (with props)

dev/tomcat/tomcat-10/v10.0.0.0-M1/bin/apache-tomcat-10.0.0.0-M1-windows-x64.zip.asc

dev/tomcat/tomcat-10/v10.0.0.0-M1/bin/apache-tomcat-10.0.0.0-M1-windows-x64.zip.sha512

dev/tomcat/tomcat-10/v10.0.0.0-M1/bin/apache-tomcat-10.0.0.0-M1-windows-x86.zip 
  (with props)

dev/tomcat/tomcat-10/v10.0.0.0-M1/bin/apache-tomcat-10.0.0.0-M1-windows-x86.zip.asc

dev/tomcat/tomcat-10/v10.0.0.0-M1/bin/apache-tomcat-10.0.0.0-M1-windows-x86.zip.sha512
dev/tomcat/tomcat-10/v10.0.0.0-M1/bin/apache-tomcat-10.0.0.0-M1.exe   (with 
props)
dev/tomcat/tomcat-10/v10.0.0.0-M1/bin/apache-tomcat-10.0.0.0-M1.exe.asc
dev/tomcat/tomcat-10/v10.0.0.0-M1/bin/apache-tomcat-10.0.0.0-M1.exe.sha512
dev/tomcat/tomcat-10/v10.0.0.0-M1/bin/apache-tomcat-10.0.0.0-M1.tar.gz   
(with props)
dev/tomcat/tomcat-10/v10.0.0.0-M1/bin/apache-tomcat-10.0.0.0-M1.tar.gz.asc

dev/tomcat/tomcat-10/v10.0.0.0-M1/bin/apache-tomcat-10.0.0.0-M1.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.0.0-M1/bin/apache-tomcat-10.0.0.0-M1.zip   (with 
props)
dev/tomcat/tomcat-10/v10.0.0.0-M1/bin/apache-tomcat-10.0.0.0-M1.zip.asc
dev/tomcat/tomcat-10/v10.0.0.0-M1/bin/apache-tomcat-10.0.0.0-M1.zip.sha512
dev/tomcat/tomcat-10/v10.0.0.0-M1/bin/embed/

dev/tomcat/tomcat-10/v10.0.0.0-M1/bin/embed/apache-tomcat-10.0.0.0-M1-embed.tar.gz
   (with props)

dev/tomcat/tomcat-10/v10.0.0.0-M1/bin/embed/apache-tomcat-10.0.0.0-M1-embed.tar.gz.asc

dev/tomcat/tomcat-10/v10.0.0.0-M1/bin/embed/apache-tomcat-10.0.0.0-M1-embed.tar.gz.sha512

dev/tomcat/tomcat-10/v10.0.0.0-M1/bin/embed/apache-tomcat-10.0.0.0-M1-embed.zip 
  (with props)

dev/tomcat/tomcat-10/v10.0.0.0-M1/bin/embed/apache-tomcat-10.0.0.0-M1-embed.zip.asc

dev/tomcat/tomcat-10/v10.0.0.0-M1/bin/embed/apache-tomcat-10.0.0.0-M1-embed.zip.sha512
dev/tomcat/tomcat-10/v10.0.0.0-M1/src/
dev/tomcat/tomcat-10/v10.0.0.0-M1/src/apache-tomcat-10.0.0.0-M1-src.tar.gz  
 (with props)

dev/tomcat/tomcat-10/v10.0.0.0-M1/src/apache-tomcat-10.0.0.0-M1-src.tar.gz.asc

dev/tomcat/tomcat-10/v10.0.0.0-M1/src/apache-tomcat-10.0.0.0-M1-src.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.0.0-M1/src/apache-tomcat-10.0.0.0-M1-src.zip   
(with props)
dev/tomcat/tomcat-10/v10.0.0.0-M1/src/apache-tomcat-10.0.0.0-M1-src.zip.asc

dev/tomcat/tomcat-10/v10.0.0.0-M1/src/apache-tomcat-10.0.0.0-M1-src.zip.sha512

Added: dev/tomcat/tomcat-10/v10.0.0.0-M1/KEYS
==
--- dev/tomcat/tomcat-10/v10.0.0.0-M1/KEYS (added)
+++ dev/tomcat/tomcat-10/v10.0.0.0-M1/KEYS Wed Feb  5 17:52:00 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

Nexus: Staging Repository Dropped

2020-02-05 Thread Nexus Repository Manager
Message from: https://repository.apache.orgDeployer properties:"userAgent" = "maven-artifact/2.2.1 (Java 1.8.0_232; Windows 10 10.0)""userId" = "markt""ip" = "109.149.198.114"Details:The orgapachetomcat-1243 staging repository has been dropped.Action performed by Mark Thomas (markt)

Nexus: Staging Completed

2020-02-05 Thread Nexus Repository Manager
Message from: https://repository.apache.orgDeployer properties:"userAgent" = "maven-artifact/2.2.1 (Java 1.8.0_232; Windows 10 10.0)""userId" = "markt""ip" = "109.149.198.114"Details:The following artifacts have been staged/org/apache/tomcat/tomcat-i18n-de/10.0.0.0-M1/tomcat-i18n-de-10.0.0.0-M1.pom.asc(SHA1: 34c044dfa322e7cec69e97cae5be7b6c656254f1)/org/apache/tomcat/tomcat-i18n-de/10.0.0.0-M1/tomcat-i18n-de-10.0.0.0-M1.jar.asc(SHA1: 30960db147bf15f91197eb7f488973849b65b4e9)/org/apache/tomcat/tomcat-i18n-de/10.0.0.0-M1/tomcat-i18n-de-10.0.0.0-M1.pom(SHA1: 4950ea06821c73d78c2069d8d21f265526b3f6b2)/org/apache/tomcat/tomcat-i18n-de/10.0.0.0-M1/tomcat-i18n-de-10.0.0.0-M1.jar(SHA1: fcfa3f7dd3cd95cf656be583fe2c19a5fa727878)/org/apache/tomcat/tomcat-jni/10.0.0.0-M1/tomcat-jni-10.0.0.0-M1-sources.jar.asc(SHA1: eda250085a4c5e8d5d82ada327c9959d085ab3b7)/org/apache/tomcat/tomcat-jni/10.0.0.0-M1/tomcat-jni-10.0.0.0-M1.jar.asc(SHA1: 42efd34200e7197ac206a0ef9fa0b97f1c274682)/org/apache/tomcat/tomcat-jni/10.0.0.0-M1/tomcat-jni-10.0.0.0-M1.pom(SHA1: 7264bbd71d5540c7c3a4745dfc21ea087f40eb41)/org/apache/tomcat/tomcat-jni/10.0.0.0-M1/tomcat-jni-10.0.0.0-M1-sources.jar(SHA1: fe7a8ecc82501a321e18d7eb2981846e2c44a08b)/org/apache/tomcat/tomcat-jni/10.0.0.0-M1/tomcat-jni-10.0.0.0-M1.jar(SHA1: 30dcfc8493c2a551f8979b789f9f9fb70fee33e3)/org/apache/tomcat/tomcat-jni/10.0.0.0-M1/tomcat-jni-10.0.0.0-M1.pom.asc(SHA1: 7d1b65b630020e2a9ee6754b08f4ae6534843a10)/org/apache/tomcat/tomcat-juli/10.0.0.0-M1/tomcat-juli-10.0.0.0-M1.pom(SHA1: 76b88776a765fe7d7853ea73418af1fcd4ad4514)/org/apache/tomcat/tomcat-juli/10.0.0.0-M1/tomcat-juli-10.0.0.0-M1.jar(SHA1: d5a6eeec69c302013ea8ddca19e69d9223f4c89a)/org/apache/tomcat/tomcat-juli/10.0.0.0-M1/tomcat-juli-10.0.0.0-M1.jar.asc(SHA1: b858f016debadc7f99ae1b8efe4e135c767da04f)/org/apache/tomcat/tomcat-juli/10.0.0.0-M1/tomcat-juli-10.0.0.0-M1-sources.jar(SHA1: ec118b43853f5cd382f2bfa249bb57a4e75273ac)/org/apache/tomcat/tomcat-juli/10.0.0.0-M1/tomcat-juli-10.0.0.0-M1.pom.asc(SHA1: f0a3ec7f658ba5640815bfc38c5b4227ee97c344)/org/apache/tomcat/tomcat-juli/10.0.0.0-M1/tomcat-juli-10.0.0.0-M1-sources.jar.asc(SHA1: 725e740d91d6bb60886017e50283300b7d0ecddc)/org/apache/tomcat/tomcat-util/10.0.0.0-M1/tomcat-util-10.0.0.0-M1.jar(SHA1: 2cff58599eb389d90485d768d6e1efa702c9a065)/org/apache/tomcat/tomcat-util/10.0.0.0-M1/tomcat-util-10.0.0.0-M1-sources.jar.asc(SHA1: 411ee6dcc6679979a01a47e94aa93b9be59e8a02)/org/apache/tomcat/tomcat-util/10.0.0.0-M1/tomcat-util-10.0.0.0-M1.jar.asc(SHA1: 22b439f69004217df49217c8f716a109c5e61cf2)/org/apache/tomcat/tomcat-util/10.0.0.0-M1/tomcat-util-10.0.0.0-M1.pom(SHA1: 9e9e399a45a026873a8eabf2828a65dec6dd2177)/org/apache/tomcat/tomcat-util/10.0.0.0-M1/tomcat-util-10.0.0.0-M1-sources.jar(SHA1: 81ba86fe881b2ed43336f6b4c030dc535bcde106)/org/apache/tomcat/tomcat-util/10.0.0.0-M1/tomcat-util-10.0.0.0-M1.pom.asc(SHA1: 3cd64d939c05e71a8924fb4619b4f2fac93a2fe0)/org/apache/tomcat/tomcat-catalina/10.0.0.0-M1/tomcat-catalina-10.0.0.0-M1.jar(SHA1: 6a1dacb0f49e2710a0331ea204b3cc470db54262)/org/apache/tomcat/tomcat-catalina/10.0.0.0-M1/tomcat-catalina-10.0.0.0-M1-sources.jar(SHA1: 687530a17cb58c3ff24d4185180cf98fe3b572db)/org/apache/tomcat/tomcat-catalina/10.0.0.0-M1/tomcat-catalina-10.0.0.0-M1.pom(SHA1: 13d106f9a4548e6d3fae9aec6d061ec5b6684237)/org/apache/tomcat/tomcat-catalina/10.0.0.0-M1/tomcat-catalina-10.0.0.0-M1-sources.jar.asc(SHA1: 8d10d555010de1471638f36e78392b6d01aecb7b)/org/apache/tomcat/tomcat-catalina/10.0.0.0-M1/tomcat-catalina-10.0.0.0-M1.pom.asc(SHA1: 0ebbcbc417de4907843c0d79d48c33f9655b8a34)/org/apache/tomcat/tomcat-catalina/10.0.0.0-M1/tomcat-catalina-10.0.0.0-M1.jar.asc(SHA1: 98d077fcfe0f7ffdb875d7cd0d1bfaebb41bd0e2)/org/apache/tomcat/tomcat-i18n-fr/10.0.0.0-M1/tomcat-i18n-fr-10.0.0.0-M1.pom.asc(SHA1: 5806827086a250be10872a5100f116b226c27716)/org/apache/tomcat/tomcat-i18n-fr/10.0.0.0-M1/tomcat-i18n-fr-10.0.0.0-M1.jar(SHA1: 0ebdd798bebf6ac67121e556ed53c666c21c5a96)/org/apache/tomcat/tomcat-i18n-fr/10.0.0.0-M1/tomcat-i18n-fr-10.0.0.0-M1.jar.asc(SHA1: 1734a7e99d5efd0dd43e1f362d428d75148eba1f)/org/apache/tomcat/tomcat-i18n-fr/10.0.0.0-M1/tomcat-i18n-fr-10.0.0.0-M1.pom(SHA1: bc6fd2ec8564c8859bfbef278ce37bbac8771b37)/org/apache/tomcat/tomcat-i18n-cs/10.0.0.0-M1/tomcat-i18n-cs-10.0.0.0-M1.pom(SHA1: 4c91f5bba3247bf049ee9fda835f82bd6bd52115)/org/apache/tomcat/tomcat-i18n-cs/10.0.0.0-M1/tomcat-i18n-cs-10.0.0.0-M1.jar(SHA1: 34360206472df3ac36f0fb6bf59392a77d888ef8)/org/apache/tomcat/tomcat-i18n-cs/10.0.0.0-M1/tomcat-i18n-cs-10.0.0.0-M1.jar.asc(SHA1: 973f3fc85314d6dbdbaeaee63295e088aee5f2cb)/org/apache/tomcat/tomcat-i18n-cs/10.0.0.0-M1/tomcat-i18n-cs-10.0.0.0-M1.pom.asc(SHA1: aaa06460ab29a3db7b518f7cc1889bfe4960598b)/org/apache/tomcat/tomcat-jdbc/10.0.0.0-M1/tomcat-jdbc-10.0.0.0-M1.pom.asc(SHA1: 3ac13f282b78bffe5794fe77c441ef7a6e8ad2a6)/org/apache/tomcat/tomcat-jdbc/10.0.0.0-M1/tomcat-jdbc-10.0.0.0-M1-sources.jar(SHA1: 

[tomcat] branch 9.0.x updated (49ad3f9 -> f9faad6)

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

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


from 49ad3f9  Refactor secret check
 new 253322a  Fix typo
 new b9824fd  Missing credit
 new f9faad6  Increment version number for next development cycle

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


-
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.31

2020-02-05 Thread Mark Thomas
The proposed Apache Tomcat 9.0.31 release is now available for voting.

The major changes compared to the 9.0.30 release are:

- AJP defaults changed to listen the loopback address, require a secret
  and to be disabled in the sample server.xml

- The JmxRemoteLifecycleListener is now deprecated

- The HTTP Connector attribute rejectIllegalHeaderName is renamed to
  rejectIllegalHeader and expanded to include header values as well as
  names


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.31/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1245/
The tag is:
https://github.com/apache/tomcat/tree/9.0.31
https://github.com/apache/tomcat/tree/9.0.31

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

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



[tomcat] tag 8.5.51 created (now 05bfeed)

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

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


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

 new 05bfeed  Tag 8.5.51

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.51

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

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

commit 05bfeed882fadd6e3b5c64a7851125750d37e297
Author: Mark Thomas 
AuthorDate: Wed Feb 5 22:03:27 2020 +

Tag 8.5.51
---
 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 2a442a6..d7b0767 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=8
 version.minor=5
 version.build=51
 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 63f7c6a..a2246d5 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



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

2020-02-05 Thread markt
Added: dev/tomcat/tomcat-8/v8.5.51/src/apache-tomcat-8.5.51-src.zip.asc
==
--- dev/tomcat/tomcat-8/v8.5.51/src/apache-tomcat-8.5.51-src.zip.asc (added)
+++ dev/tomcat/tomcat-8/v8.5.51/src/apache-tomcat-8.5.51-src.zip.asc Wed Feb  5 
22:40:21 2020
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAl47Q1EACgkQEMAcWi9g
+WedjchAAm4IMiRiCQXgxO37N/4p9N6mcNOFDVGsBuXt1eWCRSJvMVOTcdKEHTpvw
+MzggWZEWCvG3kSY7NDenP3m0QnIiKOMfB1NbwGNf+tNSS+G3PpErvidqjjYjStXe
+r7gmvTCAPnusvnggXq2u/RunMbxqTqdxR98VfsxBU0rsjGHsoPKDpQuKTMw6/1VL
+/BgTMVDsQYSXGTVc8Y2vlWSZoXh+WbDOqA59lwcVln+FCmGlG6tJai+6IdKhGOaE
+elEbG1kSxiNGMK75gb0r0J+qfV5JRS+v4F//HyJf0gfHzynk2IL7LSVl+dHQptF/
+QDMifDASqREmeiGt1VWt66DVmNAltT2NiVk64Q/ihNNP45yIzGkjPBvtSMxhEKdB
+jqon4nRalWUKYBVBF3Dq5uaj0LKGKZcf3ZOTGEsMpQAdKt75Paf7wvrdBMfb6Qt0
+EXg4jv2mPpmJIc5qRBFcbdKIHcPT6CoPYcGqbKrFqWBsewy1wXUJGUaSU41j5XPo
+ND6F+M/YzMUsrbhnZJ3nFpAjSfTHo0rXzqX/yvsAIB4SiptXeXvtEV3MQ77vTcVJ
+gHuFY1vW1DN05mQrlfI3GzkWt6yoQ6Lhxj7bjN0drbqVXNl3P89Cf+BaiQjgg84+
+rEiMWouJaU9Sh65EyGxU09rgT0TOB9pZGZZnuxbUOQhW+yOnR7w=
+=T7HN
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-8/v8.5.51/src/apache-tomcat-8.5.51-src.zip.sha512
==
--- dev/tomcat/tomcat-8/v8.5.51/src/apache-tomcat-8.5.51-src.zip.sha512 (added)
+++ dev/tomcat/tomcat-8/v8.5.51/src/apache-tomcat-8.5.51-src.zip.sha512 Wed Feb 
 5 22:40:21 2020
@@ -0,0 +1 @@
+b2c9f7fb84bba7b4e5a473e40e402682e60e3e7d247379784c257c858fc14de12efc758775fb427bd1221c6a972ecfa97549fd98d9856cbc471a0f0a4b92ffb2
 *apache-tomcat-8.5.51-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



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

2020-02-05 Thread markt
Author: markt
Date: Wed Feb  5 22:40:21 2020
New Revision: 37889

Log:
Upload 8.5.51 for voting

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

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

Added: dev/tomcat/tomcat-8/v8.5.51/KEYS
==
--- dev/tomcat/tomcat-8/v8.5.51/KEYS (added)
+++ dev/tomcat/tomcat-8/v8.5.51/KEYS Wed Feb  5 22:40:21 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

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

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 11c40d2  Increment version for next dev cycle
11c40d2 is described below

commit 11c40d26b1daa9289000d1d85c833e90894180bc
Author: Mark Thomas 
AuthorDate: Wed Feb 5 22:51:04 2020 +

Increment version 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 2a442a6..8f029d1 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=8
 version.minor=5
-version.build=51
+version.build=52
 version.patch=0
 version.suffix=-dev
 
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 7a32c72..220e27f 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.51
+maven.asf.release.deploy.version=8.5.52
 
 #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 63f7c6a..545fb3c 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



Nexus: Staging Completed

2020-02-05 Thread 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" = "109.149.198.114"Details:The following artifacts have been staged/org/apache/tomcat/tomcat-i18n-de/8.5.51/tomcat-i18n-de-8.5.51.jar(SHA1: f9918b6f7539b8b2939902c37483dd2d6ddde29d)/org/apache/tomcat/tomcat-i18n-de/8.5.51/tomcat-i18n-de-8.5.51.jar.asc(SHA1: df6d7812024c7bd6fc64695866f409fd3831)/org/apache/tomcat/tomcat-i18n-de/8.5.51/tomcat-i18n-de-8.5.51.pom.asc(SHA1: 811fb9c74b41d9ea4cbba92d2f2c42ec3df79216)/org/apache/tomcat/tomcat-i18n-de/8.5.51/tomcat-i18n-de-8.5.51.pom(SHA1: 63a6276dd7ef194d8c382296f14799d64a67181a)/org/apache/tomcat/tomcat-jni/8.5.51/tomcat-jni-8.5.51-sources.jar.asc(SHA1: 9ccc57cbaae3ba742822aed697b39d0b0af8f9c3)/org/apache/tomcat/tomcat-jni/8.5.51/tomcat-jni-8.5.51-sources.jar(SHA1: 6f85638cd487f1770b0189675e9073c091ba7444)/org/apache/tomcat/tomcat-jni/8.5.51/tomcat-jni-8.5.51.jar.asc(SHA1: 708705549a1acd8b218f18afc18f8283867bd532)/org/apache/tomcat/tomcat-jni/8.5.51/tomcat-jni-8.5.51.pom.asc(SHA1: 0dcdd430608cfea35a9dc256f83fb12ab08b7031)/org/apache/tomcat/tomcat-jni/8.5.51/tomcat-jni-8.5.51.pom(SHA1: 97fd618a0da710a0d154958221a6ebf3214c4535)/org/apache/tomcat/tomcat-jni/8.5.51/tomcat-jni-8.5.51.jar(SHA1: cc974d052aa09963184f7b99339bcd1d0c8c2b1c)/org/apache/tomcat/tomcat-juli/8.5.51/tomcat-juli-8.5.51-sources.jar.asc(SHA1: 819a3d4955a6c2df99583bacac1e137a83bf58a6)/org/apache/tomcat/tomcat-juli/8.5.51/tomcat-juli-8.5.51.pom(SHA1: 10e3fe8b19d415ebfe14a3aa693094a6b1b51e42)/org/apache/tomcat/tomcat-juli/8.5.51/tomcat-juli-8.5.51-sources.jar(SHA1: 5d4d7f77c14051df3a9bafee8b9e5e099066f2f6)/org/apache/tomcat/tomcat-juli/8.5.51/tomcat-juli-8.5.51.pom.asc(SHA1: fc63c797a974dad51a61a5809ff21794da8914ee)/org/apache/tomcat/tomcat-juli/8.5.51/tomcat-juli-8.5.51.jar.asc(SHA1: 6cacc7a475aaf2b646d76feeec8eb54bbdf602f9)/org/apache/tomcat/tomcat-juli/8.5.51/tomcat-juli-8.5.51.jar(SHA1: 5e5b0b43f98aed549ef63d2a1df43c779e1e2b00)/org/apache/tomcat/tomcat-util/8.5.51/tomcat-util-8.5.51-sources.jar.asc(SHA1: 9b9085619c17ef93e6ed3cfa1552abf0bb162ed9)/org/apache/tomcat/tomcat-util/8.5.51/tomcat-util-8.5.51-sources.jar(SHA1: c0340520f7b56dc31b731b4c3479e6e0ac804833)/org/apache/tomcat/tomcat-util/8.5.51/tomcat-util-8.5.51.jar.asc(SHA1: 79b43621a3252bd8a93d612b43a8498c77ca4943)/org/apache/tomcat/tomcat-util/8.5.51/tomcat-util-8.5.51.pom(SHA1: bb7b96b65848a928d878a7d67a52186f1df0e8dd)/org/apache/tomcat/tomcat-util/8.5.51/tomcat-util-8.5.51.jar(SHA1: 792130d4e1ea979dbbf8aa16ddd5b4d35dd8a2b3)/org/apache/tomcat/tomcat-util/8.5.51/tomcat-util-8.5.51.pom.asc(SHA1: 6f343a86c4ebd3a8318621351b226a80788857e3)/org/apache/tomcat/tomcat-catalina/8.5.51/tomcat-catalina-8.5.51.pom.asc(SHA1: faf74e3e8d5157888cc777b6848a4e0ef155c884)/org/apache/tomcat/tomcat-catalina/8.5.51/tomcat-catalina-8.5.51-sources.jar(SHA1: d7cfe8b7963926267fee411e2ed6d245e57b1db4)/org/apache/tomcat/tomcat-catalina/8.5.51/tomcat-catalina-8.5.51.jar.asc(SHA1: 516dccdd16aca63a47af17c9b7dde8c17b5a01c2)/org/apache/tomcat/tomcat-catalina/8.5.51/tomcat-catalina-8.5.51-sources.jar.asc(SHA1: e5efa21567339439b4fdae4d0ea82704caba6d9c)/org/apache/tomcat/tomcat-catalina/8.5.51/tomcat-catalina-8.5.51.jar(SHA1: 1fbd9f4958a0e7a05b1d7231b5c1bfae4fe1a1ab)/org/apache/tomcat/tomcat-catalina/8.5.51/tomcat-catalina-8.5.51.pom(SHA1: 54a6f71963d4415f73f6ff43acf47efc2de9ac01)/org/apache/tomcat/tomcat-catalina-ws/8.5.51/tomcat-catalina-ws-8.5.51.jar(SHA1: 6e98158dd34e86741292b85bb049952752742df4)/org/apache/tomcat/tomcat-catalina-ws/8.5.51/tomcat-catalina-ws-8.5.51-sources.jar.asc(SHA1: 1a7e03ac7b27230562b16e0e854ca8f725daff2c)/org/apache/tomcat/tomcat-catalina-ws/8.5.51/tomcat-catalina-ws-8.5.51.pom(SHA1: 0a8a99ee0152babed53c16acf2280c5e954db3d2)/org/apache/tomcat/tomcat-catalina-ws/8.5.51/tomcat-catalina-ws-8.5.51.jar.asc(SHA1: 97c45748436617ec386e116ad16f7b0458167c30)/org/apache/tomcat/tomcat-catalina-ws/8.5.51/tomcat-catalina-ws-8.5.51-sources.jar(SHA1: aea87541a1e0071341e51fc2acf401277a58b0e6)/org/apache/tomcat/tomcat-catalina-ws/8.5.51/tomcat-catalina-ws-8.5.51.pom.asc(SHA1: 9725cda34a97b73a2808182ed7b67acc0f16f5ec)/org/apache/tomcat/tomcat-i18n-fr/8.5.51/tomcat-i18n-fr-8.5.51.pom.asc(SHA1: 076ddbf37d441d4504c90612f8aebcc1571fdcef)/org/apache/tomcat/tomcat-i18n-fr/8.5.51/tomcat-i18n-fr-8.5.51.jar(SHA1: b0f3b1f888cd0174ce4e05b3413d610867267dee)/org/apache/tomcat/tomcat-i18n-fr/8.5.51/tomcat-i18n-fr-8.5.51.pom(SHA1: d93114828d516f6a2521783a49dae91da30984ca)/org/apache/tomcat/tomcat-i18n-fr/8.5.51/tomcat-i18n-fr-8.5.51.jar.asc(SHA1: 7d9b1af75b44b559dc169e1ebf3e7886a250f1a6)/org/apache/tomcat/tomcat-jdbc/8.5.51/tomcat-jdbc-8.5.51.pom(SHA1: da81cfde22a4da62cc2527aed0f794daa3fe1941)/org/apache/tomcat/tomcat-jdbc/8.5.51/tomcat-jdbc-8.5.51-sources.jar.asc(SHA1: a16443194a2a52ccfa5dba9ebc69c38e45f18344)/org/apache/tomcat/tomcat-jdbc/8.5.51/tomcat-jdbc-8.5.51.jar.asc(SHA1: 

[VOTE] Release Apache Tomcat 8.5.51

2020-02-05 Thread Mark Thomas
The proposed Apache Tomcat 8.5.51 release is now available for voting.

The major changes compared to the 8.5.50 release are:

- AJP defaults changed to listen the loopback address, require a secret
  and to be disabled in the sample server.xml

- The JmxRemoteLifecycleListener is now deprecated

- The HTTP Connector attribute rejectIllegalHeaderName is renamed to
  rejectIllegalHeader and expanded to include header values as well as
  names

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.51/

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

The tag is:
https://github.com/apache/tomcat/tree/8.5.51
05bfeed882fadd6e3b5c64a7851125750d37e297

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

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



Re: [VOTE] Release Apache Tomcat 10.0.0.0-M1

2020-02-05 Thread Rémy Maucherat
On Wed, Feb 5, 2020 at 8:22 PM Mark Thomas  wrote:

> The proposed Apache Tomcat 10.0.0.0-M1 release is now available for
> voting. This is the first release of 10.0.0.x and is based on 9.0.31.
>
> The major changes compared to 9.0.31  are:
>
> - Complete the javax to jakarta package rename
>
> - Remove duplication of configuration between HTTP/1.1 and HTTP/2.
>   HTTP/2 will now inherit values from HTTP/1.1.
>
> - Remove deprecated code
>
> 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.0-M1/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1244/
> The tag is:
> https://github.com/apache/tomcat/tree/10.0.0.0-M1
> 9797ba13e0e554c3b8e990f2dc4f846d2bdccf6d
>
> The proposed 10.0.0.0-M1 release is:
> [ ] Broken - do not release
> [X] Alpha  - go ahead and release as 10.0.0.0-M1
>
> I opted to only include alpha here as there are still some potentially
> significant changes on the TOMCAT-NEXT list.
>

Rémy

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


svn commit: r1873595 - in /tomcat/site/trunk: docs/ci.html xdocs/ci.xml

2020-02-05 Thread mgrigorov
Author: mgrigorov
Date: Wed Feb  5 08:42:53 2020
New Revision: 1873595

URL: http://svn.apache.org/viewvc?rev=1873595=rev
Log:
Improve wording for usage of TravisCI for testing on ARM64


Modified:
tomcat/site/trunk/docs/ci.html
tomcat/site/trunk/xdocs/ci.xml

Modified: tomcat/site/trunk/docs/ci.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1873595=1873594=1873595=diff
==
--- tomcat/site/trunk/docs/ci.html (original)
+++ tomcat/site/trunk/docs/ci.html Wed Feb  5 08:42:53 2020
@@ -990,17 +990,17 @@ prepared and published by ASF Buildbot,
 
 
 
-https://travis-ci.org/;>Travis CI is used to test Tomcat builds on 
ARM64 architecture
+https://travis-ci.org/;>Travis CI is being used to test Tomcat builds 
on ARM64 architecture
 
 
 
   
 
-https://travis-ci.org/apache/tomcat;>Tomcat master
+https://travis-ci.org/apache/tomcat;>Tomcat server  native
 
   
 
-https://travis-ci.org/apache/tomcat-connectors;>Tomcat Connectors 
master
+https://travis-ci.org/apache/tomcat-connectors;>Tomcat Connectors 
(mod_jk)
 
 
 

Modified: tomcat/site/trunk/xdocs/ci.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/ci.xml?rev=1873595=1873594=1873595=diff
==
--- tomcat/site/trunk/xdocs/ci.xml (original)
+++ tomcat/site/trunk/xdocs/ci.xml Wed Feb  5 08:42:53 2020
@@ -291,10 +291,10 @@ prepared and published by ASF Buildbot,
 
 
 
-https://travis-ci.org/;>Travis CI is used to test Tomcat 
builds on ARM64 architecture
+https://travis-ci.org/;>Travis CI is being used to test Tomcat 
builds on ARM64 architecture
 
-  https://travis-ci.org/apache/tomcat;>Tomcat master
-  https://travis-ci.org/apache/tomcat-connectors;>Tomcat 
Connectors master
+  https://travis-ci.org/apache/tomcat;>Tomcat server  
native
+  https://travis-ci.org/apache/tomcat-connectors;>Tomcat 
Connectors (mod_jk)
 
 
 



-
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 failing CI tests as unlimited strength encryption is not available

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

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 6bce898  Fix failing CI tests as unlimited strength encryption is not 
available
6bce898 is described below

commit 6bce89826b78843f10c3e135becc93b8202bbbce
Author: Mark Thomas 
AuthorDate: Wed Feb 5 09:37:34 2020 +

Fix failing CI tests as unlimited strength encryption is not available
---
 .../catalina/tribes/group/interceptors/TestEncryptInterceptor.java| 4 
 1 file changed, 4 insertions(+)

diff --git 
a/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java
 
b/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java
index c5fe3c8..8dc7a5f 100644
--- 
a/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java
+++ 
b/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java
@@ -23,6 +23,8 @@ import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import javax.crypto.Cipher;
+
 import org.hamcrest.core.IsEqual;
 import org.hamcrest.core.IsNot;
 
@@ -177,6 +179,7 @@ public class TestEncryptInterceptor {
 
 @Test
 public void test192BitKey() throws Exception {
+Assume.assumeTrue(Cipher.getMaxAllowedKeyLength("AES") >= 192);
 src.setEncryptionKey(encryptionKey192);
 dest.setEncryptionKey(encryptionKey192);
 src.start(Channel.SND_TX_SEQ);
@@ -191,6 +194,7 @@ public class TestEncryptInterceptor {
 
 @Test
 public void test256BitKey() throws Exception {
+Assume.assumeTrue(Cipher.getMaxAllowedKeyLength("AES") >= 256);
 src.setEncryptionKey(encryptionKey256);
 dest.setEncryptionKey(encryptionKey256);
 src.start(Channel.SND_TX_SEQ);


-
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: Disable AJP connector by default

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

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 0f725b3  Disable AJP connector by default
0f725b3 is described below

commit 0f725b323a74b64cdb35fce04b54427582ad6063
Author: Mark Thomas 
AuthorDate: Tue Jan 21 12:41:01 2020 +

Disable AJP connector by default
---
 conf/server.xml |  3 ++-
 res/tomcat.nsi  | 21 -
 webapps/docs/changelog.xml  |  4 
 webapps/docs/security-howto.xml |  8 
 webapps/docs/setup.xml  |  1 -
 5 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/conf/server.xml b/conf/server.xml
index 502858c..b1afebb 100644
--- a/conf/server.xml
+++ b/conf/server.xml
@@ -90,8 +90,9 @@
 -->
 
 
+
 
 

[tomcat] branch 7.0.x updated: Change the default bind address for AJP to the loopback address

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

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 0d633e7  Change the default bind address for AJP to the loopback 
address
0d633e7 is described below

commit 0d633e72ebc7b3c242d0081c23bba5e4dacd9b72
Author: Mark Thomas 
AuthorDate: Tue Jan 21 13:02:13 2020 +

Change the default bind address for AJP to the loopback address
---
 java/org/apache/coyote/ajp/AjpAprProtocol.java |  2 ++
 java/org/apache/coyote/ajp/AjpNioProtocol.java |  2 ++
 java/org/apache/coyote/ajp/AjpProtocol.java|  2 ++
 java/org/apache/tomcat/util/compat/Jre7Compat.java | 19 +++
 java/org/apache/tomcat/util/compat/JreCompat.java  | 28 ++
 webapps/docs/changelog.xml |  4 
 webapps/docs/config/ajp.xml|  5 +---
 7 files changed, 58 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/coyote/ajp/AjpAprProtocol.java 
b/java/org/apache/coyote/ajp/AjpAprProtocol.java
index 7b4a825..418d2ca 100644
--- a/java/org/apache/coyote/ajp/AjpAprProtocol.java
+++ b/java/org/apache/coyote/ajp/AjpAprProtocol.java
@@ -20,6 +20,7 @@ import org.apache.coyote.AbstractProtocol;
 import org.apache.coyote.Processor;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.compat.JreCompat;
 import org.apache.tomcat.util.net.AbstractEndpoint;
 import org.apache.tomcat.util.net.AprEndpoint;
 import org.apache.tomcat.util.net.AprEndpoint.Handler;
@@ -61,6 +62,7 @@ public class AjpAprProtocol extends AbstractAjpProtocol 
{
 
 public AjpAprProtocol() {
 endpoint = new AprEndpoint();
+endpoint.setAddress(JreCompat.getInstance().getLoopbackAddress());
 cHandler = new AjpConnectionHandler(this);
 ((AprEndpoint) endpoint).setHandler(cHandler);
 setSoLinger(Constants.DEFAULT_CONNECTION_LINGER);
diff --git a/java/org/apache/coyote/ajp/AjpNioProtocol.java 
b/java/org/apache/coyote/ajp/AjpNioProtocol.java
index 741cb22..8668323 100644
--- a/java/org/apache/coyote/ajp/AjpNioProtocol.java
+++ b/java/org/apache/coyote/ajp/AjpNioProtocol.java
@@ -23,6 +23,7 @@ import org.apache.coyote.AbstractProtocol;
 import org.apache.coyote.Processor;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.compat.JreCompat;
 import org.apache.tomcat.util.net.AbstractEndpoint;
 import org.apache.tomcat.util.net.NioChannel;
 import org.apache.tomcat.util.net.NioEndpoint;
@@ -56,6 +57,7 @@ public class AjpNioProtocol extends 
AbstractAjpProtocol {
 
 public AjpNioProtocol() {
 endpoint = new NioEndpoint();
+endpoint.setAddress(JreCompat.getInstance().getLoopbackAddress());
 cHandler = new AjpConnectionHandler(this);
 ((NioEndpoint) endpoint).setHandler(cHandler);
 setSoLinger(Constants.DEFAULT_CONNECTION_LINGER);
diff --git a/java/org/apache/coyote/ajp/AjpProtocol.java 
b/java/org/apache/coyote/ajp/AjpProtocol.java
index 50f6f58..69c24eb 100644
--- a/java/org/apache/coyote/ajp/AjpProtocol.java
+++ b/java/org/apache/coyote/ajp/AjpProtocol.java
@@ -22,6 +22,7 @@ import org.apache.coyote.AbstractProtocol;
 import org.apache.coyote.Processor;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.compat.JreCompat;
 import org.apache.tomcat.util.net.AbstractEndpoint;
 import org.apache.tomcat.util.net.JIoEndpoint;
 import org.apache.tomcat.util.net.JIoEndpoint.Handler;
@@ -57,6 +58,7 @@ public class AjpProtocol extends AbstractAjpProtocol {
 
 public AjpProtocol() {
 endpoint = new JIoEndpoint();
+endpoint.setAddress(JreCompat.getInstance().getLoopbackAddress());
 cHandler = new AjpConnectionHandler(this);
 ((JIoEndpoint) endpoint).setHandler(cHandler);
 setSoLinger(Constants.DEFAULT_CONNECTION_LINGER);
diff --git a/java/org/apache/tomcat/util/compat/Jre7Compat.java 
b/java/org/apache/tomcat/util/compat/Jre7Compat.java
index 43513a9..d469f48 100644
--- a/java/org/apache/tomcat/util/compat/Jre7Compat.java
+++ b/java/org/apache/tomcat/util/compat/Jre7Compat.java
@@ -20,6 +20,7 @@ import java.io.OutputStream;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.net.InetAddress;
 import java.sql.CallableStatement;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
@@ -56,6 +57,7 @@ class Jre7Compat extends JreCompat {
 private static final Method resultSetGetObjectName;
 private static final Method statementCloseOnCompletion;
 private static final Method statementIsCloseOnCompletion;
+private static final Method getLoopbackAddress;
 
 static {
 Method m1 = null;
@@ -72,6 +74,7 

[tomcat] branch 7.0.x updated: Rename requiredSecret to secret and add secretRequired

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

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 40d5d93  Rename requiredSecret to secret and add secretRequired
40d5d93 is described below

commit 40d5d93bd284033cf4a1f77f5492444f83d803e2
Author: Mark Thomas 
AuthorDate: Tue Jan 21 14:24:33 2020 +

Rename requiredSecret to secret and add secretRequired

AJP Connector will not start if secretRequired="true" and secret is set
to null or zero length String.
---
 .../apache/coyote/ajp/AbstractAjpProcessor.java| 19 +---
 .../org/apache/coyote/ajp/AbstractAjpProtocol.java | 50 +-
 java/org/apache/coyote/ajp/AjpAprProtocol.java |  2 +-
 java/org/apache/coyote/ajp/AjpNioProtocol.java |  2 +-
 java/org/apache/coyote/ajp/AjpProtocol.java|  2 +-
 java/org/apache/coyote/ajp/LocalStrings.properties |  1 +
 .../coyote/ajp/TestAbstractAjpProcessor.java   | 11 +
 webapps/docs/changelog.xml |  8 
 webapps/docs/config/ajp.xml| 12 +-
 9 files changed, 96 insertions(+), 11 deletions(-)

diff --git a/java/org/apache/coyote/ajp/AbstractAjpProcessor.java 
b/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
index f3c84a9..e17b5a2 100644
--- a/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
+++ b/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
@@ -300,9 +300,16 @@ public abstract class AbstractAjpProcessor extends 
AbstractProcessor {
 /**
  * Required secret.
  */
+@Deprecated
 protected String requiredSecret = null;
+protected String secret = null;
+public void setSecret(String secret) {
+this.secret = secret;
+this.requiredSecret = secret;
+}
+@Deprecated
 public void setRequiredSecret(String requiredSecret) {
-this.requiredSecret = requiredSecret;
+setSecret(requiredSecret);
 }
 
 
@@ -831,7 +838,7 @@ public abstract class AbstractAjpProcessor extends 
AbstractProcessor {
 }
 
 // Decode extra attributes
-boolean secret = false;
+boolean secretPresentInRequest = false;
 byte attributeCode;
 while ((attributeCode = requestHeaderMessage.getByte())
 != Constants.SC_A_ARE_DONE) {
@@ -934,9 +941,9 @@ public abstract class AbstractAjpProcessor extends 
AbstractProcessor {
 
 case Constants.SC_A_SECRET:
 requestHeaderMessage.getBytes(tmpMB);
-if (requiredSecret != null) {
-secret = true;
-if (!tmpMB.equals(requiredSecret)) {
+if (secret != null) {
+secretPresentInRequest = true;
+if (!tmpMB.equals(secret)) {
 response.setStatus(403);
 setErrorState(ErrorState.CLOSE_CLEAN, null);
 }
@@ -952,7 +959,7 @@ public abstract class AbstractAjpProcessor extends 
AbstractProcessor {
 }
 
 // Check if secret was submitted if required
-if ((requiredSecret != null) && !secret) {
+if ((secret != null) && !secretPresentInRequest) {
 response.setStatus(403);
 setErrorState(ErrorState.CLOSE_CLEAN, null);
 }
diff --git a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java 
b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
index 7c644db..c5e7335 100644
--- a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
+++ b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
@@ -95,13 +95,49 @@ public abstract class AbstractAjpProtocol extends 
AbstractProtocol {
 
 
 protected String requiredSecret = null;
+private String secret = null;
+/**
+ * Set the secret that must be included with every request.
+ *
+ * @param secret The required secret
+ */
+public void setSecret(String secret) {
+this.secret = secret;
+this.requiredSecret = secret;
+}
+protected String getSecret() {
+return secret;
+}
 /**
  * Set the required secret that must be included with every request.
  *
  * @param requiredSecret The required secret
+ *
+ * @deprecated Replaced by {@link #setSecret(String)}.
+ * Will be removed in Tomcat 11 onwards
  */
+@Deprecated
 public void setRequiredSecret(String requiredSecret) {
-this.requiredSecret = requiredSecret;
+setSecret(requiredSecret);
+}
+/**
+ * @return The current secret
+ *
+ * @deprecated Replaced by {@link #getSecret()}.
+ * Will be removed in Tomcat 11 onwards
+ */
+@Deprecated
+protected String getRequiredSecret() {
+return getSecret();
+}
+
+
+private boolean secretRequired = true;
+public void setSecretRequired(boolean secretRequired) {
+

Re: [tomcat] branch 7.0.x updated: Change the default bind address for AJP to the loopback address

2020-02-05 Thread Michael Osipov

Am 2020-02-05 um 13:30 schrieb ma...@apache.org:

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 0d633e7  Change the default bind address for AJP to the loopback 
address
0d633e7 is described below

commit 0d633e72ebc7b3c242d0081c23bba5e4dacd9b72
Author: Mark Thomas 
AuthorDate: Tue Jan 21 13:02:13 2020 +

 Change the default bind address for AJP to the loopback address
---
  java/org/apache/coyote/ajp/AjpAprProtocol.java |  2 ++
  java/org/apache/coyote/ajp/AjpNioProtocol.java |  2 ++
  java/org/apache/coyote/ajp/AjpProtocol.java|  2 ++
  java/org/apache/tomcat/util/compat/Jre7Compat.java | 19 +++
  java/org/apache/tomcat/util/compat/JreCompat.java  | 28 ++
  webapps/docs/changelog.xml |  4 
  webapps/docs/config/ajp.xml|  5 +---
  7 files changed, 58 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/coyote/ajp/AjpAprProtocol.java 
b/java/org/apache/coyote/ajp/AjpAprProtocol.java
index 7b4a825..418d2ca 100644
--- a/java/org/apache/coyote/ajp/AjpAprProtocol.java
+++ b/java/org/apache/coyote/ajp/AjpAprProtocol.java
@@ -20,6 +20,7 @@ import org.apache.coyote.AbstractProtocol;
  import org.apache.coyote.Processor;
  import org.apache.juli.logging.Log;
  import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.compat.JreCompat;
  import org.apache.tomcat.util.net.AbstractEndpoint;
  import org.apache.tomcat.util.net.AprEndpoint;
  import org.apache.tomcat.util.net.AprEndpoint.Handler;
@@ -61,6 +62,7 @@ public class AjpAprProtocol extends AbstractAjpProtocol 
{
  
  public AjpAprProtocol() {

  endpoint = new AprEndpoint();
+endpoint.setAddress(JreCompat.getInstance().getLoopbackAddress());
  cHandler = new AjpConnectionHandler(this);
  ((AprEndpoint) endpoint).setHandler(cHandler);
  setSoLinger(Constants.DEFAULT_CONNECTION_LINGER);
diff --git a/java/org/apache/coyote/ajp/AjpNioProtocol.java 
b/java/org/apache/coyote/ajp/AjpNioProtocol.java
index 741cb22..8668323 100644
--- a/java/org/apache/coyote/ajp/AjpNioProtocol.java
+++ b/java/org/apache/coyote/ajp/AjpNioProtocol.java
@@ -23,6 +23,7 @@ import org.apache.coyote.AbstractProtocol;
  import org.apache.coyote.Processor;
  import org.apache.juli.logging.Log;
  import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.compat.JreCompat;
  import org.apache.tomcat.util.net.AbstractEndpoint;
  import org.apache.tomcat.util.net.NioChannel;
  import org.apache.tomcat.util.net.NioEndpoint;
@@ -56,6 +57,7 @@ public class AjpNioProtocol extends 
AbstractAjpProtocol {
  
  public AjpNioProtocol() {

  endpoint = new NioEndpoint();
+endpoint.setAddress(JreCompat.getInstance().getLoopbackAddress());
  cHandler = new AjpConnectionHandler(this);
  ((NioEndpoint) endpoint).setHandler(cHandler);
  setSoLinger(Constants.DEFAULT_CONNECTION_LINGER);
diff --git a/java/org/apache/coyote/ajp/AjpProtocol.java 
b/java/org/apache/coyote/ajp/AjpProtocol.java
index 50f6f58..69c24eb 100644
--- a/java/org/apache/coyote/ajp/AjpProtocol.java
+++ b/java/org/apache/coyote/ajp/AjpProtocol.java
@@ -22,6 +22,7 @@ import org.apache.coyote.AbstractProtocol;
  import org.apache.coyote.Processor;
  import org.apache.juli.logging.Log;
  import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.compat.JreCompat;
  import org.apache.tomcat.util.net.AbstractEndpoint;
  import org.apache.tomcat.util.net.JIoEndpoint;
  import org.apache.tomcat.util.net.JIoEndpoint.Handler;
@@ -57,6 +58,7 @@ public class AjpProtocol extends AbstractAjpProtocol {
  
  public AjpProtocol() {

  endpoint = new JIoEndpoint();
+endpoint.setAddress(JreCompat.getInstance().getLoopbackAddress());
  cHandler = new AjpConnectionHandler(this);
  ((JIoEndpoint) endpoint).setHandler(cHandler);
  setSoLinger(Constants.DEFAULT_CONNECTION_LINGER);
diff --git a/java/org/apache/tomcat/util/compat/Jre7Compat.java 
b/java/org/apache/tomcat/util/compat/Jre7Compat.java
index 43513a9..d469f48 100644
--- a/java/org/apache/tomcat/util/compat/Jre7Compat.java
+++ b/java/org/apache/tomcat/util/compat/Jre7Compat.java
@@ -20,6 +20,7 @@ import java.io.OutputStream;
  import java.lang.reflect.Constructor;
  import java.lang.reflect.InvocationTargetException;
  import java.lang.reflect.Method;
+import java.net.InetAddress;
  import java.sql.CallableStatement;
  import java.sql.Connection;
  import java.sql.DatabaseMetaData;
@@ -56,6 +57,7 @@ class Jre7Compat extends JreCompat {
  private static final Method resultSetGetObjectName;
  private static final Method statementCloseOnCompletion;
  private static final Method statementIsCloseOnCompletion;
+   

buildbot success in on tomcat-7-trunk

2020-02-05 Thread 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/1588

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] 6bce89826b78843f10c3e135becc93b8202bbbce
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 master updated (35f6d6e -> 26e411d)

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

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


from 35f6d6e  Tweak AJP improvements
 new ab848bc  Fix trailing ws
 new 95e5987  Update MBean descriptors for JMX changes
 new 26e411d  Refactor secret check

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:
 conf/server.xml   |  2 +-
 java/org/apache/catalina/connector/mbeans-descriptors.xml | 10 +-
 java/org/apache/coyote/ajp/AbstractAjpProtocol.java   |  4 ++--
 3 files changed, 12 insertions(+), 4 deletions(-)


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



[tomcat] 03/03: Refactor secret check

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

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

commit 26e411dbcf8fd047d631a2ecde70f2dd14be1ada
Author: Mark Thomas 
AuthorDate: Wed Feb 5 14:47:48 2020 +

Refactor secret check

Moving the check to start allows invalid configurations to be fixed via
JMX and changes to be made followed by stop()/start() for those changes
to take effect.
---
 java/org/apache/coyote/ajp/AbstractAjpProtocol.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java 
b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
index 63ff6c5..7cfdf0a 100644
--- a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
+++ b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
@@ -257,13 +257,13 @@ public abstract class AbstractAjpProtocol extends 
AbstractProtocol {
 
 
 @Override
-public void init() throws Exception {
+public void start() throws Exception {
 if (getSecretRequired()) {
 String secret = getSecret();
 if (secret == null || secret.length() == 0) {
 throw new 
IllegalArgumentException(sm.getString("ajpprotocol.nosecret"));
 }
 }
-super.init();
+super.start();
 }
 }


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



[tomcat] 01/03: Fix trailing ws

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

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

commit ab848bc60d3ad326e966ab31ec44c94db66aa5fc
Author: Mark Thomas 
AuthorDate: Wed Feb 5 14:33:47 2020 +

Fix trailing ws
---
 conf/server.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/server.xml b/conf/server.xml
index bd3ed3e..91bd415 100644
--- a/conf/server.xml
+++ b/conf/server.xml
@@ -116,7 +116,7 @@
 
 


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



[tomcat] 02/03: Update MBean descriptors for JMX changes

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

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

commit 95e598774fbab95833071cac50b6c4ed9e9737e5
Author: Mark Thomas 
AuthorDate: Wed Feb 5 14:46:45 2020 +

Update MBean descriptors for JMX changes
---
 java/org/apache/catalina/connector/mbeans-descriptors.xml | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/connector/mbeans-descriptors.xml 
b/java/org/apache/catalina/connector/mbeans-descriptors.xml
index 8464034..20c068e 100644
--- a/java/org/apache/catalina/connector/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/connector/mbeans-descriptors.xml
@@ -44,6 +44,10 @@
   description="Send AJP flush package for each explicit flush"
  type="boolean"/>
 
+
+
 
@@ -180,10 +184,14 @@
  type="java.lang.String"/>
 
 
 
+
+
 


-
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: Change the default bind address for AJP to the loopback address

2020-02-05 Thread Mark Thomas
On 05/02/2020 13:03, Michael Osipov wrote:
> Am 2020-02-05 um 13:30 schrieb ma...@apache.org:
>> 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 0d633e7  Change the default bind address for AJP to the
>> loopback address
>> 0d633e7 is described below
>>
>> commit 0d633e72ebc7b3c242d0081c23bba5e4dacd9b72
>> Author: Mark Thomas 
>> AuthorDate: Tue Jan 21 13:02:13 2020 +
>>
>>  Change the default bind address for AJP to the loopback address



>>     +    public InetAddress getLoopbackAddress() {
>> +    // Javadoc for getByName() states that calling with null will
>> return one
>> +    // of the loopback addresses
>> +    InetAddress result = null;
>> +    try {
>> +    result = InetAddress.getByName(null);
>> +    } catch (UnknownHostException e) {
>> +    // This would be unusual but ignore it in this case.
>> +    }
>> +    if (result == null) {
>> +    // Fallback to default IPv4 loopback address.
>> +    // Not perfect but good enough and if the address is not
>> valid the
>> +    // bind will fail later with an appropriate error message
>> +    try {
>> +    result = InetAddress.getByName("127.0.0.1");
> 
> This is wrong. localhost is not always 127.0.0.1. I have hosts where lo1
> is cloned with 127.0.0/29 and not local IPs are passed into Jails.

The code was designed with that in mind.

As the comments state, it isn't perfect but it is a fall-back for a
state that should happen rarely / not at all.

It is preferrable to use "127.0.0.1" and have the Connector fail than
the other options which are:

- fail immediately as that would prevent the user specifying an
  alternative value for address; or

- have the Connector come up listening on all addresses.

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: Tweak AJP improvements

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

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 15cd78c  Tweak AJP improvements
15cd78c is described below

commit 15cd78c528425c693f1d2b51057f32d3d63d360a
Author: Mark Thomas 
AuthorDate: Wed Feb 5 13:38:58 2020 +

Tweak AJP improvements

Add explicit address attribute to commented out AJP connector
---
 conf/server.xml | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/conf/server.xml b/conf/server.xml
index b1afebb..abd3b3e 100644
--- a/conf/server.xml
+++ b/conf/server.xml
@@ -91,7 +91,10 @@
 
 
 
 
 

[tomcat] 01/03: Fix trailing ws

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

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

commit 2f7745c817b8861d1a0cd1de80fd81aa40b006be
Author: Mark Thomas 
AuthorDate: Wed Feb 5 14:33:07 2020 +

Fix trailing ws
---
 conf/server.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/server.xml b/conf/server.xml
index bd3ed3e..91bd415 100644
--- a/conf/server.xml
+++ b/conf/server.xml
@@ -116,7 +116,7 @@
 
 


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



[tomcat] branch 9.0.x updated (4f471ad -> 49ad3f9)

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

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


from 4f471ad  Fix typo. Update for change to attribute name.
 new e143b2f  Fix trailing ws
 new ab9bc7e  Update MBean descriptors for JMX changes
 new 49ad3f9  Refactor secret check

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:
 conf/server.xml   |  2 +-
 java/org/apache/catalina/connector/mbeans-descriptors.xml | 10 +-
 java/org/apache/coyote/ajp/AbstractAjpProtocol.java   |  4 ++--
 3 files changed, 12 insertions(+), 4 deletions(-)


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



[tomcat] 01/03: Fix trailing ws

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

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

commit e143b2fd29687aa2d167230414a97c68cf6c963b
Author: Mark Thomas 
AuthorDate: Wed Feb 5 14:33:07 2020 +

Fix trailing ws
---
 conf/server.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/server.xml b/conf/server.xml
index bd3ed3e..91bd415 100644
--- a/conf/server.xml
+++ b/conf/server.xml
@@ -116,7 +116,7 @@
 
 


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



[tomcat] 02/03: Update MBean descriptors for JMX changes

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

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

commit 6193d3b03f91ff004a008693ed6041401b7c9d09
Author: Mark Thomas 
AuthorDate: Wed Feb 5 14:46:45 2020 +

Update MBean descriptors for JMX changes
---
 java/org/apache/catalina/connector/mbeans-descriptors.xml | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/connector/mbeans-descriptors.xml 
b/java/org/apache/catalina/connector/mbeans-descriptors.xml
index efc26c7..976144c 100644
--- a/java/org/apache/catalina/connector/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/connector/mbeans-descriptors.xml
@@ -44,6 +44,10 @@
   description="Send AJP flush package for each explicit flush"
  type="boolean"/>
 
+
+
 
@@ -164,10 +168,14 @@
  type="java.lang.String"/>
 
 
 
+
+
 


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



[tomcat] 02/03: Update MBean descriptors for JMX changes

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

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

commit ab9bc7e6de72abe98505d8ca205e2a661c37780b
Author: Mark Thomas 
AuthorDate: Wed Feb 5 14:46:45 2020 +

Update MBean descriptors for JMX changes
---
 java/org/apache/catalina/connector/mbeans-descriptors.xml | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/connector/mbeans-descriptors.xml 
b/java/org/apache/catalina/connector/mbeans-descriptors.xml
index 8464034..20c068e 100644
--- a/java/org/apache/catalina/connector/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/connector/mbeans-descriptors.xml
@@ -44,6 +44,10 @@
   description="Send AJP flush package for each explicit flush"
  type="boolean"/>
 
+
+
 
@@ -180,10 +184,14 @@
  type="java.lang.String"/>
 
 
 
+
+
 


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



[tomcat] 03/03: Refactor secret check

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

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

commit 49ad3f954f69c6e838c8cd112ad79aa5fa8e7153
Author: Mark Thomas 
AuthorDate: Wed Feb 5 14:47:48 2020 +

Refactor secret check

Moving the check to start allows invalid configurations to be fixed via
JMX and changes to be made followed by stop()/start() for those changes
to take effect.
---
 java/org/apache/coyote/ajp/AbstractAjpProtocol.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java 
b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
index 63ff6c5..7cfdf0a 100644
--- a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
+++ b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
@@ -257,13 +257,13 @@ public abstract class AbstractAjpProtocol extends 
AbstractProtocol {
 
 
 @Override
-public void init() throws Exception {
+public void start() throws Exception {
 if (getSecretRequired()) {
 String secret = getSecret();
 if (secret == null || secret.length() == 0) {
 throw new 
IllegalArgumentException(sm.getString("ajpprotocol.nosecret"));
 }
 }
-super.init();
+super.start();
 }
 }


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



[tomcat] 03/03: Refactor secret check

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

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

commit 03c436126db6794db5277a3b3d871016fb9a3f23
Author: Mark Thomas 
AuthorDate: Wed Feb 5 14:47:48 2020 +

Refactor secret check

Moving the check to start allows invalid configurations to be fixed via
JMX and changes to be made followed by stop()/start() for those changes
to take effect.
---
 java/org/apache/coyote/ajp/AbstractAjpProtocol.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java 
b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
index 6790713..641ec18 100644
--- a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
+++ b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
@@ -267,13 +267,13 @@ public abstract class AbstractAjpProtocol extends 
AbstractProtocol {
 
 
 @Override
-public void init() throws Exception {
+public void start() throws Exception {
 if (getSecretRequired()) {
 String secret = getSecret();
 if (secret == null || secret.length() == 0) {
 throw new 
IllegalArgumentException(sm.getString("ajpprotocol.nosecret"));
 }
 }
-super.init();
+super.start();
 }
 }


-
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 (e303c8e -> 03c4361)

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

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


from e303c8e  Fix typo. Update for change to attribute name.
 new 2f7745c  Fix trailing ws
 new 6193d3b  Update MBean descriptors for JMX changes
 new 03c4361  Refactor secret check

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:
 conf/server.xml   |  2 +-
 java/org/apache/catalina/connector/mbeans-descriptors.xml | 10 +-
 java/org/apache/coyote/ajp/AbstractAjpProtocol.java   |  4 ++--
 3 files changed, 12 insertions(+), 4 deletions(-)


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



[Bug 64116] Incorrect expanstion of JAVA_OPTS in tool-wrapper.sh when JAVA_OPT is empty

2020-02-05 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64116

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEW |RESOLVED

--- Comment #1 from Mark Thomas  ---
See https://bz.apache.org/bugzilla/show_bug.cgi?id=63815#c9

-- 
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 7.0.x updated: Add new AJP attribute allowedArbitraryRequestAttributes

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

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new b99fba5  Add new AJP attribute allowedArbitraryRequestAttributes
b99fba5 is described below

commit b99fba5bd796d876ea536e83299603443842feba
Author: Mark Thomas 
AuthorDate: Tue Jan 21 15:04:12 2020 +

Add new AJP attribute allowedArbitraryRequestAttributes

Requests with unrecognised attributes will be blocked with a 403
---
 .../apache/coyote/ajp/AbstractAjpProcessor.java| 43 +-
 .../org/apache/coyote/ajp/AbstractAjpProtocol.java | 14 +++
 java/org/apache/coyote/ajp/AjpAprProtocol.java |  1 +
 java/org/apache/coyote/ajp/AjpNioProtocol.java |  1 +
 java/org/apache/coyote/ajp/AjpProtocol.java|  1 +
 .../coyote/ajp/TestAbstractAjpProcessor.java   |  1 +
 webapps/docs/changelog.xml |  5 +++
 webapps/docs/config/ajp.xml| 19 ++
 8 files changed, 83 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/coyote/ajp/AbstractAjpProcessor.java 
b/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
index e17b5a2..e68b458 100644
--- a/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
+++ b/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
@@ -23,7 +23,12 @@ import java.net.InetAddress;
 import java.security.NoSuchProviderException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -79,6 +84,9 @@ public abstract class AbstractAjpProcessor extends 
AbstractProcessor {
 protected static final byte[] pongMessageArray;
 
 
+private static final Set javaxAttributes;
+
+
 static {
 // Allocate the end message array
 AjpMessage endMessage = new AjpMessage(16);
@@ -119,6 +127,14 @@ public abstract class AbstractAjpProcessor extends 
AbstractProcessor {
 pongMessageArray = new byte[pongMessage.getLen()];
 System.arraycopy(pongMessage.getBuffer(), 0, pongMessageArray,
 0, pongMessage.getLen());
+
+// Build the Set of javax attributes
+Set s = new HashSet();
+s.add("javax.servlet.request.cipher_suite");
+s.add("javax.servlet.request.key_size");
+s.add("javax.servlet.request.ssl_session");
+s.add("javax.servlet.request.X509Certificate");
+javaxAttributes= Collections.unmodifiableSet(s);
 }
 
 
@@ -326,8 +342,14 @@ public abstract class AbstractAjpProcessor extends 
AbstractProcessor {
 public String getClientCertProvider() { return clientCertProvider; }
 public void setClientCertProvider(String s) { this.clientCertProvider = s; 
}
 
-// - Public Methods
 
+private Pattern allowedRequestAttributesPatternPattern;
+public void setAllowedRequestAttributesPatternPattern(Pattern 
allowedRequestAttributesPatternPattern) {
+this.allowedRequestAttributesPatternPattern = 
allowedRequestAttributesPatternPattern;
+}
+
+
+// - Public Methods
 
 /**
  * Send an action to the connector.
@@ -867,8 +889,25 @@ public abstract class AbstractAjpProcessor extends 
AbstractProcessor {
 }
 } else if(n.equals(Constants.SC_A_SSL_PROTOCOL)) {
 request.setAttribute(SSLSupport.PROTOCOL_VERSION_KEY, v);
+} else if (n.equals("JK_LB_ACTIVATION")) {
+request.setAttribute(n, v);
+} else if (javaxAttributes.contains(n)) {
+request.setAttribute(n, v);
 } else {
-request.setAttribute(n, v );
+// All 'known' attributes will be processed by the previous
+// blocks. Any remaining attribute is an 'arbitrary' one.
+if (allowedRequestAttributesPatternPattern == null) {
+response.setStatus(403);
+setErrorState(ErrorState.CLOSE_CLEAN, null);
+} else {
+Matcher m = 
allowedRequestAttributesPatternPattern.matcher(n);
+if (m.matches()) {
+request.setAttribute(n, v);
+} else {
+response.setStatus(403);
+setErrorState(ErrorState.CLOSE_CLEAN, null);
+}
+}
 }
 break;
 
diff --git a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java 

[tomcat] 03/03: Refactor secret check

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

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

commit f7180bafc74cb1250c9e9287b68a230f0e1f4645
Author: Mark Thomas 
AuthorDate: Wed Feb 5 14:47:48 2020 +

Refactor secret check

Moving the check to start allows invalid configurations to be fixed via
JMX and changes to be made followed by stop()/start() for those changes
to take effect.
---
 java/org/apache/coyote/ajp/AbstractAjpProtocol.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java 
b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
index e27c623..e324783 100644
--- a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
+++ b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
@@ -204,13 +204,13 @@ public abstract class AbstractAjpProtocol extends 
AbstractProtocol {
 
 
 @Override
-public void init() throws Exception {
+public void start() throws Exception {
 if (getSecretRequired()) {
 String secret = getSecret();
 if (secret == null || secret.length() == 0) {
 throw new 
IllegalArgumentException(sm.getString("ajpprotocol.nosecret"));
 }
 }
-super.init();
+super.start();
 }
 }


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



[tomcat] 01/03: Fix trailing ws

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

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

commit 1750466e464549cab2cad09dd1b89bb7fcedbd19
Author: Mark Thomas 
AuthorDate: Wed Feb 5 14:33:07 2020 +

Fix trailing ws
---
 conf/server.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/server.xml b/conf/server.xml
index abd3b3e..851eac4 100644
--- a/conf/server.xml
+++ b/conf/server.xml
@@ -93,7 +93,7 @@
 
 


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



[tomcat] 02/03: Update MBean descriptors for JMX changes

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

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

commit 99a4cd985b9c41769e7ca9149cab79d6f7a5e5c5
Author: Mark Thomas 
AuthorDate: Wed Feb 5 14:46:45 2020 +

Update MBean descriptors for JMX changes
---
 java/org/apache/catalina/connector/mbeans-descriptors.xml | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/connector/mbeans-descriptors.xml 
b/java/org/apache/catalina/connector/mbeans-descriptors.xml
index f280f6c..0d89a8e 100644
--- a/java/org/apache/catalina/connector/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/connector/mbeans-descriptors.xml
@@ -44,6 +44,10 @@
   description="Send AJP flush package for each explicit flush"
  type="boolean"/>
 
+
+
 
@@ -155,10 +159,14 @@
  type="java.lang.String"/>
 
 
 
+
+
 


-
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 (15cd78c -> f7180ba)

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

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


from 15cd78c  Tweak AJP improvements
 new 1750466  Fix trailing ws
 new 99a4cd9  Update MBean descriptors for JMX changes
 new f7180ba  Refactor secret check

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:
 conf/server.xml   |  2 +-
 java/org/apache/catalina/connector/mbeans-descriptors.xml | 10 +-
 java/org/apache/coyote/ajp/AbstractAjpProtocol.java   |  4 ++--
 3 files changed, 12 insertions(+), 4 deletions(-)


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



[tomcat] tag 10.0.0.0-M1 created (now 9797ba1)

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

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


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

 new 9797ba1  Tag 10.0.0.0-M1

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 10.0.0.0-M1

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

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

commit 9797ba13e0e554c3b8e990f2dc4f846d2bdccf6d
Author: Mark Thomas 
AuthorDate: Wed Feb 5 16:36:37 2020 +

Tag 10.0.0.0-M1
---
 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 8986247..5ca9411 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=10
 version.minor=0
 version.build=0
 version.patch=0
-version.suffix=-dev
+version.suffix=-M1
 
 # - Source control flags -
 git.branch=master
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index fb86ab4..e697a98 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).
 -->
-
+
   
 
   This release contains all of the changes upto and including those in


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