[Bug 63682] Async servlet over HTTP/2 non-blocking write hanging on certain flow control window update pattern from client

2019-09-16 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=63682

--- Comment #3 from Dapeng Zhang  ---
Thank you Mark for the fix!

I can verify the issue is fixed by testing my project where the issue was
originally found.

BTW I also had been working on and off on making a reproducible minimum test
case.

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



[VOTE] Release Apache Tomcat 8.5.46

2019-09-16 Thread Mark Thomas
The proposed Apache Tomcat 8.5.46 release is now available for voting.

The major changes compared to the 8.5.45 release are:

- Update to Commons Daemon 1.2.1 to pick up fixes for regressions in
  Commons Daemon 1.2.0, most notably a failure to start when using
  a 32-bit JVM on Windows.

- Avoid an NPE when accessing an https port using http.

- Fix a potential hang when using HTTP/2 with the asynchronous Servlet
  API.

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

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

The tag is:
https://github.com/apache/tomcat/tree/8.5.46
914f68b45127207170dff894e03ec31732cac898

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

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



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

2019-09-16 Thread markt
Author: markt
Date: Mon Sep 16 18:41:03 2019
New Revision: 35899

Log:
Upload 8.5.46 for voting

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

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

Added: dev/tomcat/tomcat-8/v8.5.46/KEYS
==
--- dev/tomcat/tomcat-8/v8.5.46/KEYS (added)
+++ dev/tomcat/tomcat-8/v8.5.46/KEYS Mon Sep 16 18:41:03 2019
@@ -0,0 +1,676 @@
+This file contains the PGP keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS
+Apache developers:
+(pgpk -ll  && pgpk -xa ) >> this file.
+  or
+(gpg --fingerprint --list-sigs 
+ && gpg --armor --export ) >> this file.
+
+Apache developers: please ensure that your key is also available via the
+PGP keyservers (such as pgpkeys.mit.edu).
+
+
+Type Bits/KeyIDDate   User ID
+pub  2048/F22C4FED 2001/07/02 Andy Armstrong 
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: PGPfreeware 7.0.3 for non-commercial use 
+
+mQGiBDtAWuURBADZ0KUEyUkSUiTA09e7tvEbX25STsjxrR+DNTainCls+XlkVOij
+gBv216lqge9tIsS0L6hCP4OQbFf/64qVtJssX4QXdyiZGb5wpmcj0Mz602Ew8r+N
+I0S5NvmogoYWW7BlP4r61jNxO5zrr03KaijM5r4ipJdLUxyOmM6P2jRPUwCg/5gm
+bpqiYl7pXX5FgDeB36tmD+UD/06iLqOnoiKO0vMbOk7URclhCObMNrHqxTxozMTS
+B9soYURbIeArei+plYo2n+1qB12ayybjhVu3uksXRdT9bEkyxMfslvLbIpDAG8Cz

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

2019-09-16 Thread markt
Added: dev/tomcat/tomcat-8/v8.5.46/src/apache-tomcat-8.5.46-src.zip.asc
==
--- dev/tomcat/tomcat-8/v8.5.46/src/apache-tomcat-8.5.46-src.zip.asc (added)
+++ dev/tomcat/tomcat-8/v8.5.46/src/apache-tomcat-8.5.46-src.zip.asc Mon Sep 16 
18:41:03 2019
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAl1/0mcACgkQEMAcWi9g
+WeeMPhAAlmbw+cQXRYCuxzT/dVgNTjWQvYUY4/iTJw0LatSZLLz1Nhc8baXgNODc
+DhnWq4EoA5oJiOu76R5MKKjaXXZA167x8VZIkaUvcLWt6CTT0hBzUZ705Vlk8maW
+GUFJCjjY1FI8EGp2n2BJb9US+K2c4xzB1AZ7XJGXl+rTeBUn02d+BA3+AxGyz04N
+NUNqFwZrMSOHJ3rjPBouoOFVJElmrzwJnfWnuzgI+i76tQAsk6/ujBhdFvhdlyjC
+VfDS5irzQNwXEPNzi4VmpTWG51t9DBgrlaneA+J1fuK77Z6o9QX8vSXCWBxA2zZa
+0a6RtL0sqLCrENFEwYW+AcF2etJ1djX6oPQvTrcidiomRhpyoWgvfra+LpKPndtb
+YEbJ7mRLBsOrIKJwHtKYgloDxP+6Ph2CcEXcxRztAs2jtOZ26EpVBZvxDML+kDyU
+G/XX/5ZzgrhDAMt7YfSScC4YID2b+JVbeEKy8Uvwq94bNh3x7CtJGCcpn58zgrbT
+ahHjwVfuXomekzHZVDiXODe/bchRx0Io3TriKqvWLPiswPBtiJZ7qiW7xgBMM/Z4
+MmD/YoSn7YBYZ5HL6NFm+euwJGMJoQc/4gJr2IJbX45zYjznPTXfVTuqhP5q7zUd
+zWKkSdvMM8BzQitXIOXSR12Z8EQUF1ESYPpYIaJtyvRJtO80wi4=
+=hSQd
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-8/v8.5.46/src/apache-tomcat-8.5.46-src.zip.sha512
==
--- dev/tomcat/tomcat-8/v8.5.46/src/apache-tomcat-8.5.46-src.zip.sha512 (added)
+++ dev/tomcat/tomcat-8/v8.5.46/src/apache-tomcat-8.5.46-src.zip.sha512 Mon Sep 
16 18:41:03 2019
@@ -0,0 +1 @@
+e4e0313f5da2405c6ab75c6756ede6e180738d5d7d6dc2a0a95e67245c476630046314fa4313460d37da2e61627c5c91ef4fed62078b7ec7f03aa979e291cb0e
 *apache-tomcat-8.5.46-src.zip
\ No newline at end of file



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



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

2019-09-16 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 cddf523  Increment version number for next development cycle
cddf523 is described below

commit cddf523026c6152d3bbbdca3809ee4840fb0a518
Author: Mark Thomas 
AuthorDate: Mon Sep 16 19:34:04 2019 +0100

Increment version number for next development cycle
---
 build.properties.default | 2 +-
 res/maven/mvn.properties.default | 2 +-
 webapps/docs/changelog.xml   | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 9142f2c..16cf44a 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=8
 version.minor=5
-version.build=46
+version.build=47
 version.patch=0
 version.suffix=-dev
 
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index ece9033..9a59763 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.46
+maven.asf.release.deploy.version=8.5.47
 
 #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 2b63d25..d553a69 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

2019-09-16 Thread Nexus Repository Manager
Message from: https://repository.apache.orgDeployer properties:"userAgent" = "maven-artifact/2.2.1 (Java 1.7.0_80; Windows 7 6.1)""userId" = "markt""ip" = "86.144.250.12"Details:The following artifacts have been staged/org/apache/tomcat/tomcat-i18n-de/8.5.46/tomcat-i18n-de-8.5.46.pom(SHA1: d23bee92359009bb3ac3485fe5b9764eca832fd7)/org/apache/tomcat/tomcat-i18n-de/8.5.46/tomcat-i18n-de-8.5.46.jar(SHA1: d2f3003fbaa0ee99340dda041afd9148655e248c)/org/apache/tomcat/tomcat-i18n-de/8.5.46/tomcat-i18n-de-8.5.46.jar.asc(SHA1: cdfff2d664b52bddc04996fb3100562e0137b766)/org/apache/tomcat/tomcat-i18n-de/8.5.46/tomcat-i18n-de-8.5.46.pom.asc(SHA1: 4cb627ba89ddbfc146b035b434c8bf7733382f3c)/org/apache/tomcat/tomcat-jni/8.5.46/tomcat-jni-8.5.46.jar.asc(SHA1: 91ebfae01fb30ddce644ee1dcaa22b375dfcdd3d)/org/apache/tomcat/tomcat-jni/8.5.46/tomcat-jni-8.5.46.pom(SHA1: a94ba0d3c7c2567d4494b016e0ee8139c6cd5313)/org/apache/tomcat/tomcat-jni/8.5.46/tomcat-jni-8.5.46.jar(SHA1: 1f089f96ec103f9eb1356859a610df9545058805)/org/apache/tomcat/tomcat-jni/8.5.46/tomcat-jni-8.5.46-sources.jar.asc(SHA1: c405a25ae428a0bee71a431c3836b913ae808df0)/org/apache/tomcat/tomcat-jni/8.5.46/tomcat-jni-8.5.46.pom.asc(SHA1: 9031ca041ea303220792cfc8319ae53b1328b22e)/org/apache/tomcat/tomcat-jni/8.5.46/tomcat-jni-8.5.46-sources.jar(SHA1: 971c2db9b418039541f6d6b473efb0538c54a850)/org/apache/tomcat/tomcat-juli/8.5.46/tomcat-juli-8.5.46.pom.asc(SHA1: 8380a40384e9c70bcb29731ec65d7fdb7969caaa)/org/apache/tomcat/tomcat-juli/8.5.46/tomcat-juli-8.5.46.pom(SHA1: 4f1ff658dcbcf3663afd218e870f8090519edc41)/org/apache/tomcat/tomcat-juli/8.5.46/tomcat-juli-8.5.46-sources.jar(SHA1: 95aedae892cd036f2a7cfb034e0940406cd3b430)/org/apache/tomcat/tomcat-juli/8.5.46/tomcat-juli-8.5.46-sources.jar.asc(SHA1: 98c7a55297ff99e1559871abe54f502b7763ba18)/org/apache/tomcat/tomcat-juli/8.5.46/tomcat-juli-8.5.46.jar.asc(SHA1: 9a720ee91cecb312afdc9bab0080204276bad58a)/org/apache/tomcat/tomcat-juli/8.5.46/tomcat-juli-8.5.46.jar(SHA1: d5053263d572a1d4737a3efa17ecd1a9816c5aa3)/org/apache/tomcat/tomcat-util/8.5.46/tomcat-util-8.5.46-sources.jar(SHA1: bb552d09c9934c75a11ac638d4cce41cc403e76e)/org/apache/tomcat/tomcat-util/8.5.46/tomcat-util-8.5.46.jar.asc(SHA1: ed2e8b0a345d6451735fe89c4009d1648c1f5694)/org/apache/tomcat/tomcat-util/8.5.46/tomcat-util-8.5.46.pom(SHA1: df5dec4ac74f5f4a32c9bf1e2411ac702fc0c0f0)/org/apache/tomcat/tomcat-util/8.5.46/tomcat-util-8.5.46.pom.asc(SHA1: 77ac836af55d8838fe2b1c0b940efdd657e474eb)/org/apache/tomcat/tomcat-util/8.5.46/tomcat-util-8.5.46.jar(SHA1: 89bda6bccc2c92e9f4106e6ecfeadbb448ce2173)/org/apache/tomcat/tomcat-util/8.5.46/tomcat-util-8.5.46-sources.jar.asc(SHA1: 1a5cdfd74f33eb379b2e3d4173f7bf4ce042d904)/org/apache/tomcat/tomcat-catalina/8.5.46/tomcat-catalina-8.5.46.pom.asc(SHA1: b7d886fe0ce99d160c67dc7b2b4829cd436dddee)/org/apache/tomcat/tomcat-catalina/8.5.46/tomcat-catalina-8.5.46-sources.jar.asc(SHA1: 6fd96ef7dd38fe5e69afb4a6dc894c52e3300e10)/org/apache/tomcat/tomcat-catalina/8.5.46/tomcat-catalina-8.5.46.pom(SHA1: f5a970ce0b17af738c29e61fdc0e4e3bc438b2ec)/org/apache/tomcat/tomcat-catalina/8.5.46/tomcat-catalina-8.5.46.jar.asc(SHA1: f05cf5a12875f76b962cd52b65af07651c807eca)/org/apache/tomcat/tomcat-catalina/8.5.46/tomcat-catalina-8.5.46-sources.jar(SHA1: 3b11ce14899fe2e82986994b646a1ef478fc15d8)/org/apache/tomcat/tomcat-catalina/8.5.46/tomcat-catalina-8.5.46.jar(SHA1: 679f8e9adf311e2af78480b5e4ba4f2c1d8a616c)/org/apache/tomcat/tomcat-catalina-ws/8.5.46/tomcat-catalina-ws-8.5.46-sources.jar.asc(SHA1: 4b37178dfd1a93aa00d421372180b7d39e93aba7)/org/apache/tomcat/tomcat-catalina-ws/8.5.46/tomcat-catalina-ws-8.5.46.pom.asc(SHA1: 35f4ad663b037b97c1df57648bde96ced6a85d56)/org/apache/tomcat/tomcat-catalina-ws/8.5.46/tomcat-catalina-ws-8.5.46.pom(SHA1: c998e0415fdd11c6383e0ec3f88072578f511e99)/org/apache/tomcat/tomcat-catalina-ws/8.5.46/tomcat-catalina-ws-8.5.46.jar(SHA1: 06528eef915b939318161fa47bd8d5753c2d34f1)/org/apache/tomcat/tomcat-catalina-ws/8.5.46/tomcat-catalina-ws-8.5.46-sources.jar(SHA1: 56c63c2337598ced57650747b4d11533dc0738d8)/org/apache/tomcat/tomcat-catalina-ws/8.5.46/tomcat-catalina-ws-8.5.46.jar.asc(SHA1: 2593cdf949a2bd5c9f3d7b03272ccd3ce4db051a)/org/apache/tomcat/tomcat-i18n-fr/8.5.46/tomcat-i18n-fr-8.5.46.jar.asc(SHA1: 725181ff2528b9d528409379d4239381a828a9b6)/org/apache/tomcat/tomcat-i18n-fr/8.5.46/tomcat-i18n-fr-8.5.46.jar(SHA1: 22b1cadf7afb58da9f313decb3355a59da3fc0e9)/org/apache/tomcat/tomcat-i18n-fr/8.5.46/tomcat-i18n-fr-8.5.46.pom(SHA1: ac12d5c8a439b77c05f6c3b6eb7f2d4f04f45522)/org/apache/tomcat/tomcat-i18n-fr/8.5.46/tomcat-i18n-fr-8.5.46.pom.asc(SHA1: 9274b9f445a5b9ed0efe17beb9d8481a84845f2a)/org/apache/tomcat/tomcat-jdbc/8.5.46/tomcat-jdbc-8.5.46-sources.jar(SHA1: c7608d8fc870f46cbb1f4505ab3b0d5678298de1)/org/apache/tomcat/tomcat-jdbc/8.5.46/tomcat-jdbc-8.5.46-sources.jar.asc(SHA1: aaf89c8997a5f4961b13b347a7a8d8506da09c92)/org/apache/tomcat/tomcat-jdbc/8.5.46/tomcat-jdbc-8.5.46.jar(SHA1: 

[tomcat] branch 7.0.x updated: Fix typo

2019-09-16 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 3e1fc1d  Fix typo
3e1fc1d is described below

commit 3e1fc1d27a08475ad5ecfeeb5a93d78eef2ef83c
Author: Mark Thomas 
AuthorDate: Mon Sep 16 19:19:16 2019 +0100

Fix typo
---
 java/org/apache/tomcat/buildutil/SignCode.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/buildutil/SignCode.java 
b/java/org/apache/tomcat/buildutil/SignCode.java
index 20b6bed..a1d1955 100644
--- a/java/org/apache/tomcat/buildutil/SignCode.java
+++ b/java/org/apache/tomcat/buildutil/SignCode.java
@@ -208,7 +208,7 @@ public class SignCode extends Task {
 SOAPConnectionFactory soapConnectionFactory = 
SOAPConnectionFactory.newInstance();
 SOAPConnection connection = soapConnectionFactory.createConnection();
 
-log("Sending singing request to server and waiting for response");
+log("Sending signing request to server and waiting for response");
 SOAPMessage response = connection.call(message, SIGNING_SERVICE_URL);
 
 if (debug) {


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



[tomcat] branch 8.5.x updated: Fix typo

2019-09-16 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 b99c16d  Fix typo
b99c16d is described below

commit b99c16d1c9f51e05543ff3957f94f52acd68b3d5
Author: Mark Thomas 
AuthorDate: Mon Sep 16 19:19:16 2019 +0100

Fix typo
---
 java/org/apache/tomcat/buildutil/SignCode.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/buildutil/SignCode.java 
b/java/org/apache/tomcat/buildutil/SignCode.java
index bde6bcd..3f0c50f 100644
--- a/java/org/apache/tomcat/buildutil/SignCode.java
+++ b/java/org/apache/tomcat/buildutil/SignCode.java
@@ -206,7 +206,7 @@ public class SignCode extends Task {
 SOAPConnectionFactory soapConnectionFactory = 
SOAPConnectionFactory.newInstance();
 SOAPConnection connection = soapConnectionFactory.createConnection();
 
-log("Sending singing request to server and waiting for response");
+log("Sending signing request to server and waiting for response");
 SOAPMessage response = connection.call(message, SIGNING_SERVICE_URL);
 
 if (debug) {


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



[tomcat] branch master updated: Fix typo

2019-09-16 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 d656101  Fix typo
d656101 is described below

commit d6561014930c1b6b5df6f87f889dd54de94193d5
Author: Mark Thomas 
AuthorDate: Mon Sep 16 19:19:16 2019 +0100

Fix typo
---
 java/org/apache/tomcat/buildutil/SignCode.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/buildutil/SignCode.java 
b/java/org/apache/tomcat/buildutil/SignCode.java
index bde6bcd..3f0c50f 100644
--- a/java/org/apache/tomcat/buildutil/SignCode.java
+++ b/java/org/apache/tomcat/buildutil/SignCode.java
@@ -206,7 +206,7 @@ public class SignCode extends Task {
 SOAPConnectionFactory soapConnectionFactory = 
SOAPConnectionFactory.newInstance();
 SOAPConnection connection = soapConnectionFactory.createConnection();
 
-log("Sending singing request to server and waiting for response");
+log("Sending signing request to server and waiting for response");
 SOAPMessage response = connection.call(message, SIGNING_SERVICE_URL);
 
 if (debug) {


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



[tomcat] tag 8.5.46 created (now 914f68b)

2019-09-16 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


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

 new 914f68b  Tag 8.5.46

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

2019-09-16 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit 914f68b45127207170dff894e03ec31732cac898
Author: Mark Thomas 
AuthorDate: Mon Sep 16 18:24:12 2019 +0100

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

diff --git a/build.properties.default b/build.properties.default
index 9142f2c..334d9eb 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=8
 version.minor=5
 version.build=46
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Source control flags -
 git.branch=8.5.x
@@ -290,4 +290,4 @@ saaj-api.checksum.algorithm=MD5|SHA-1
 
saaj-api.checksum.value=caae8b4bf2c551155815331e9e96256f|1c399a7fea4d0262a6a39750e419c24f0c769586
 saaj-api.home=${base.path}/saaj-api-${saaj-api.version}
 saaj-api.jar=${saaj-api.home}/saaj-api-${saaj-api.version}.jar
-saaj-api.loc=${base-maven.loc}/javax/xml/soap/saaj-api/${saaj-api.version}/saaj-api-${saaj-api.version}.jar
\ No newline at end of file
+saaj-api.loc=${base-maven.loc}/javax/xml/soap/saaj-api/${saaj-api.version}/saaj-api-${saaj-api.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2b63d25..1715640 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] branch 8.5.x updated: Fix test failure on Windows

2019-09-16 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 5debbdf  Fix test failure on Windows
5debbdf is described below

commit 5debbdfc0dfbf03ed5d9236f31323527250d5258
Author: Mark Thomas 
AuthorDate: Fri Sep 13 18:05:47 2019 +0100

Fix test failure on Windows
---
 test/org/apache/coyote/http2/TestStreamProcessor.java | 19 ++-
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestStreamProcessor.java 
b/test/org/apache/coyote/http2/TestStreamProcessor.java
index 5f9651a..a4dd5f1 100644
--- a/test/org/apache/coyote/http2/TestStreamProcessor.java
+++ b/test/org/apache/coyote/http2/TestStreamProcessor.java
@@ -35,6 +35,7 @@ import org.junit.Test;
 import org.apache.catalina.Context;
 import org.apache.catalina.Wrapper;
 import org.apache.catalina.startup.Tomcat;
+import org.apache.tomcat.util.compat.JrePlatform;
 import org.apache.tomcat.util.http.FastHttpDateFormat;
 
 public class TestStreamProcessor extends Http2TestBase {
@@ -150,11 +151,19 @@ public class TestStreamProcessor extends Http2TestBase {
 
 parser.readFrame(true);
 
-Assert.assertEquals("3-HeadersStart\n" +
-"3-Header-[:status]-[304]\n" +
-"3-Header-[etag]-[W/\"934-1447269522000\"]\n" +
-"3-Header-[date]-[Wed, 11 Nov 2015 19:18:42 GMT]\n" +
-"3-HeadersEnd\n", output.getTrace());
+StringBuilder expected = new StringBuilder();
+expected.append("3-HeadersStart\n");
+expected.append("3-Header-[:status]-[304]\n");
+// Different line-endings -> different files size -> different weak 
eTag
+if (JrePlatform.IS_WINDOWS) {
+expected.append("3-Header-[etag]-[W/\"957-1447269522000\"]\n");
+} else {
+expected.append("3-Header-[etag]-[W/\"934-1447269522000\"]\n");
+}
+expected.append("3-Header-[date]-[Wed, 11 Nov 2015 19:18:42 GMT]\n");
+expected.append("3-HeadersEnd\n");
+
+Assert.assertEquals(expected.toString(), output.getTrace());
 }
 
 


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

2019-09-16 Thread Mark Thomas
The proposed Apache Tomcat 9.0.26 release is now available for voting.

The major changes compared to the 9.0.24 release are:

- Update to Commons Daemon 1.2.1 to pick up fixes for regressions in
  Commons Daemon 1.2.0, most notably a failure to start when using
  a 32-bit JVM on Windows.

- Avoid an NPE when accessing an https port using http.

- Correct the invalid automatic module names for the embedded JARs.

- Fix a potential hang when using HTTP/2 with the asynchronous Servlet
  API.

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


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

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



Nexus: Staging Completed

2019-09-16 Thread Nexus Repository Manager
Message from: https://repository.apache.orgDeployer properties:"userAgent" = "maven-artifact/2.2.1 (Java 1.8.0_222; Windows 7 6.1)""userId" = "markt""ip" = "86.144.250.12"Details:The following artifacts have been staged/org/apache/tomcat/tomcat-i18n-de/9.0.26/tomcat-i18n-de-9.0.26.pom.asc(SHA1: 167a14f0b6746cfc38da590352a15b5003db7783)/org/apache/tomcat/tomcat-i18n-de/9.0.26/tomcat-i18n-de-9.0.26.pom(SHA1: b88cc9f87fcd71f2c97f39ad09aa56fb4b300c1f)/org/apache/tomcat/tomcat-i18n-de/9.0.26/tomcat-i18n-de-9.0.26.jar.asc(SHA1: 311a16b79563fe00a6d6422caa1bde27ce5e460c)/org/apache/tomcat/tomcat-i18n-de/9.0.26/tomcat-i18n-de-9.0.26.jar(SHA1: 440d05312853e7f607b335b93b53cb2d25a0a99f)/org/apache/tomcat/tomcat-jni/9.0.26/tomcat-jni-9.0.26.jar(SHA1: c5c6db37ad14ac8a6fe9b776ec96d2a13246b8eb)/org/apache/tomcat/tomcat-jni/9.0.26/tomcat-jni-9.0.26.jar.asc(SHA1: 81ec0dca72b2eeb4ccac4ff80ecee7fbd93d924b)/org/apache/tomcat/tomcat-jni/9.0.26/tomcat-jni-9.0.26-sources.jar(SHA1: 78fb8e6b7c71c90a6e5239459f01184c57b79f2c)/org/apache/tomcat/tomcat-jni/9.0.26/tomcat-jni-9.0.26.pom(SHA1: 8de698ba317262fb50d7abd62ed589759e5d86ab)/org/apache/tomcat/tomcat-jni/9.0.26/tomcat-jni-9.0.26.pom.asc(SHA1: 6587b57532d97089827da14f1bacf14909791aec)/org/apache/tomcat/tomcat-jni/9.0.26/tomcat-jni-9.0.26-sources.jar.asc(SHA1: 36c06ff9ba0fb8e804c51415be1725f9df66fa78)/org/apache/tomcat/tomcat-juli/9.0.26/tomcat-juli-9.0.26.jar(SHA1: 82b41dbb296f72dad5ec12e58d02b13ef9ee08ba)/org/apache/tomcat/tomcat-juli/9.0.26/tomcat-juli-9.0.26-sources.jar(SHA1: 0f0fbb8b8c7ee7e3e5e8dc9d59fc0a3404263efc)/org/apache/tomcat/tomcat-juli/9.0.26/tomcat-juli-9.0.26-sources.jar.asc(SHA1: ab45432f5f60f2f56786503f9a9f564d925977be)/org/apache/tomcat/tomcat-juli/9.0.26/tomcat-juli-9.0.26.pom.asc(SHA1: 475cd384f5f7397f0aacf370e47413217e64d3ea)/org/apache/tomcat/tomcat-juli/9.0.26/tomcat-juli-9.0.26.pom(SHA1: 1c7fddf8a251746748a2baaf3f12602b98be3fc3)/org/apache/tomcat/tomcat-juli/9.0.26/tomcat-juli-9.0.26.jar.asc(SHA1: 97c425397fe12f79fc27fb8bc99d296de685d710)/org/apache/tomcat/tomcat-util/9.0.26/tomcat-util-9.0.26.pom(SHA1: 6f7d1d3c390a4f62a4d809b74336ea1b223f2db1)/org/apache/tomcat/tomcat-util/9.0.26/tomcat-util-9.0.26-sources.jar.asc(SHA1: f49c62d2719da6f46eb72f2fb0f9baae32ee8c23)/org/apache/tomcat/tomcat-util/9.0.26/tomcat-util-9.0.26.jar(SHA1: 4c2e446b15d00c33cb98dd10f7ddeb069288d0d6)/org/apache/tomcat/tomcat-util/9.0.26/tomcat-util-9.0.26-sources.jar(SHA1: a66eb85a3b6dd6073cc46c97a2fe1b9824d63f28)/org/apache/tomcat/tomcat-util/9.0.26/tomcat-util-9.0.26.pom.asc(SHA1: ae3cae537fb8adb32f9fc841a5b92f7715d19b7f)/org/apache/tomcat/tomcat-util/9.0.26/tomcat-util-9.0.26.jar.asc(SHA1: e5e42761f0eb7fd097e98adda03736ed956a6570)/org/apache/tomcat/tomcat-catalina/9.0.26/tomcat-catalina-9.0.26.jar.asc(SHA1: 22ffe73e32185b6cff4d040244027cc8bff789cb)/org/apache/tomcat/tomcat-catalina/9.0.26/tomcat-catalina-9.0.26-sources.jar.asc(SHA1: 17b2a689833b24a09cf3d3e349a9b8d7aa5bb9e6)/org/apache/tomcat/tomcat-catalina/9.0.26/tomcat-catalina-9.0.26.pom(SHA1: e291461163470c8f4664e0bcbc293fc3a5754ab3)/org/apache/tomcat/tomcat-catalina/9.0.26/tomcat-catalina-9.0.26.pom.asc(SHA1: 6e66da0fcb0a5b735a0f180c6eeb6c0c9a7b8251)/org/apache/tomcat/tomcat-catalina/9.0.26/tomcat-catalina-9.0.26-sources.jar(SHA1: a1d2d2971e6c80790bbfbab9d48692440db0f098)/org/apache/tomcat/tomcat-catalina/9.0.26/tomcat-catalina-9.0.26.jar(SHA1: ec3bb83f316592b7c9edf6abcfc79d2425e40e52)/org/apache/tomcat/tomcat-i18n-fr/9.0.26/tomcat-i18n-fr-9.0.26.pom.asc(SHA1: 46a1d2af299a9c1ddb26fc54921e8625ed1c81fb)/org/apache/tomcat/tomcat-i18n-fr/9.0.26/tomcat-i18n-fr-9.0.26.jar(SHA1: f2777d1684d209f941675bf50ea492661325e0e6)/org/apache/tomcat/tomcat-i18n-fr/9.0.26/tomcat-i18n-fr-9.0.26.jar.asc(SHA1: 0b6c8be22423b760b1b956733ea7e7c5abf36594)/org/apache/tomcat/tomcat-i18n-fr/9.0.26/tomcat-i18n-fr-9.0.26.pom(SHA1: 82298582f03b35ee7e0c6a7dfdde72773b60118d)/org/apache/tomcat/tomcat-i18n-cs/9.0.26/tomcat-i18n-cs-9.0.26.pom(SHA1: cc89427aecdac8ef6f341151ee1aaf7c80da9e35)/org/apache/tomcat/tomcat-i18n-cs/9.0.26/tomcat-i18n-cs-9.0.26.pom.asc(SHA1: 1c48cc1f89e206a15d8a8f7944450a69f38a0bfb)/org/apache/tomcat/tomcat-i18n-cs/9.0.26/tomcat-i18n-cs-9.0.26.jar.asc(SHA1: b39d19567d036b026d84d3b6fae3a2134995486c)/org/apache/tomcat/tomcat-i18n-cs/9.0.26/tomcat-i18n-cs-9.0.26.jar(SHA1: 45f2537ea3d9f2ff14c36d91e0edf67c7a37626d)/org/apache/tomcat/tomcat-jdbc/9.0.26/tomcat-jdbc-9.0.26.pom(SHA1: a122487e1d3caaa174545655a004c471a1242c42)/org/apache/tomcat/tomcat-jdbc/9.0.26/tomcat-jdbc-9.0.26.jar(SHA1: bbdb8eb7c1fb3eca499cff36443e9c36b8842d5a)/org/apache/tomcat/tomcat-jdbc/9.0.26/tomcat-jdbc-9.0.26-sources.jar.asc(SHA1: ed5690d0ea4dfa83f02962efc772dad04b2a7ae6)/org/apache/tomcat/tomcat-jdbc/9.0.26/tomcat-jdbc-9.0.26-sources.jar(SHA1: bd7c683f81a7b736ea9c005ab67890584ddb525f)/org/apache/tomcat/tomcat-jdbc/9.0.26/tomcat-jdbc-9.0.26.jar.asc(SHA1: efa03048ee8841a4dfe5468ddefe8c3fe64b2578)/org/apache/tomcat/tomcat-jdbc/9.0.26/tomcat-jdbc-9.0.26.pom.asc(SHA1: 

svn commit: r35890 - in /dev/tomcat/tomcat-9/v9.0.26: ./ bin/ bin/embed/ src/

2019-09-16 Thread markt
Author: markt
Date: Mon Sep 16 16:14:06 2019
New Revision: 35890

Log:
Upload 9.0.26 for voting

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

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

Added: dev/tomcat/tomcat-9/v9.0.26/KEYS
==
--- dev/tomcat/tomcat-9/v9.0.26/KEYS (added)
+++ dev/tomcat/tomcat-9/v9.0.26/KEYS Mon Sep 16 16:14:06 2019
@@ -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 master updated: Increment version number for next release

2019-09-16 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 a080a41  Increment version number for next release
a080a41 is described below

commit a080a41ea6cf677f157e87d010d9bce648f65efa
Author: Mark Thomas 
AuthorDate: Mon Sep 16 17:00:26 2019 +0100

Increment version number for next release
---
 build.properties.default | 2 +-
 res/maven/mvn.properties.default | 2 +-
 webapps/docs/changelog.xml   | 6 --
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 1e02c83..bd04c89 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=9
 version.minor=0
-version.build=26
+version.build=27
 version.patch=0
 version.suffix=-dev
 
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 9c354b4..4ef6563 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.26
+maven.asf.release.deploy.version=9.0.27
 
 #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 66eb514..6427313 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -44,8 +44,10 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
-  
+
+
+
+  
 
   
 Re-tagged to ensure that the source file for the changelog did not


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



[tomcat] tag 9.0.26 created (now 508a36c)

2019-09-16 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


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

 new 508a36c  Tag 9.0.26

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



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



[tomcat] 01/01: Tag 9.0.26

2019-09-16 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit 508a36c1f48c8d500c4e205097c2ade93e589d13
Author: Mark Thomas 
AuthorDate: Mon Sep 16 15:08:22 2019 +0100

Tag 9.0.26
---
 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 1e02c83..6ff17cd 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=9
 version.minor=0
 version.build=26
 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 66eb514..18717cd 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] 02/02: Update changelog

2019-09-16 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 b4bd03b07e5e304cc93a8a47c15bda34a99a9e5f
Author: Mark Thomas 
AuthorDate: Mon Sep 16 15:05:06 2019 +0100

Update changelog
---
 webapps/docs/changelog.xml | 8 
 1 file changed, 8 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index accad49..66eb514 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -45,6 +45,14 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Re-tagged to ensure that the source file for the changelog did not
+contain an XML byte order mark. (markt)
+  
+
+  
 
 
   


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



[tomcat] branch master updated (1840b7e -> b4bd03b)

2019-09-16 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 1840b7e  Align with 7.0.x
 new 2c5426c  Increment version for next dev cycle
 new b4bd03b  Update changelog

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


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


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



[tomcat] 01/02: Increment version for next dev cycle

2019-09-16 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 2c5426c0c5b88df22a105b2221df568aae855f45
Author: Mark Thomas 
AuthorDate: Mon Sep 16 14:56:23 2019 +0100

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 a47e0e5..1e02c83 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=9
 version.minor=0
-version.build=25
+version.build=26
 version.patch=0
 version.suffix=-dev
 
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 7c063fd..9c354b4 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.25
+maven.asf.release.deploy.version=9.0.26
 
 #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 c223a4c..accad49 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



svn commit: r35888 - /dev/tomcat/tomcat-9/v9.0.25/

2019-09-16 Thread markt
Author: markt
Date: Mon Sep 16 13:57:13 2019
New Revision: 35888

Log:
Drop 9.0.25 - vote cancelled

Removed:
dev/tomcat/tomcat-9/v9.0.25/


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



Nexus: Staging Repository Dropped

2019-09-16 Thread Nexus Repository Manager
Message from: https://repository.apache.orgDeployer properties:"userAgent" = "maven-artifact/2.2.1 (Java 1.8.0_222; Windows 7 6.1)""userId" = "markt""ip" = "86.144.250.12"Details:The orgapachetomcat-1229 staging repository has been dropped.Action performed by Mark Thomas (markt)

[VOTE][CANCELLED] Release Apache Tomcat 9.0.25

2019-09-16 Thread Mark Thomas
I messed up the tagging procedure again.

I need to re-tag.

Sorry.

Mark

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



Re: [tomcat] 01/01: Tag 9.0.25

2019-09-16 Thread Mark Thomas
On 16/09/2019 14:23, Rainer Jung wrote:
> The BOM in changelog.xml is back, at least in the tag, letting
> checkstyle fail. See below.

Thanks for spotting this. I thought I checked that. Obviously not
carefully enough.

I'll re-roll the release.

Mark


> 
> Am 16.09.2019 um 13:55 schrieb ma...@apache.org:
>> This is an automated email from the ASF dual-hosted git repository.
>>
>> markt pushed a commit to tag 9.0.25
>> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>>
>> commit fad275b0541595ea89e59f5cb024ada531d5dbe4
>> Author: Mark Thomas 
>> AuthorDate: Mon Sep 16 12:54:37 2019 +0100
>>
>>  Tag 9.0.25
>> ---
>>   build.properties.default   | 2 +-
>>   webapps/docs/changelog.xml | 4 ++--
>>   2 files changed, 3 insertions(+), 3 deletions(-)
>>
> ...
>> diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
>> index c223a4c..d5328c9 100644
>> --- a/webapps/docs/changelog.xml
>> +++ b/webapps/docs/changelog.xml
>> @@ -1,4 +1,4 @@
>> -
>> +
> 
> I think that hunk points to where the BOM reappeared.
> 
>>    To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 


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



Re: [tomcat] 01/01: Tag 9.0.25

2019-09-16 Thread Rainer Jung
The BOM in changelog.xml is back, at least in the tag, letting 
checkstyle fail. See below.


Am 16.09.2019 um 13:55 schrieb ma...@apache.org:

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

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

commit fad275b0541595ea89e59f5cb024ada531d5dbe4
Author: Mark Thomas 
AuthorDate: Mon Sep 16 12:54:37 2019 +0100

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


...

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c223a4c..d5328c9 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -1,4 +1,4 @@
-
+


I think that hunk points to where the BOM reappeared.


  

[tomcat] branch 8.5.x updated: Exclude build.properties for jdbc-pool Align with 7.0.x

2019-09-16 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 ece94b7  Exclude build.properties for jdbc-pool Align with 7.0.x
ece94b7 is described below

commit ece94b79915b50d876e3d98011cdd99329e2d9ae
Author: Mark Thomas 
AuthorDate: Mon Sep 16 14:18:59 2019 +0100

Exclude build.properties for jdbc-pool Align with 7.0.x
---
 build.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build.xml b/build.xml
index 54fb967..1f4761f 100644
--- a/build.xml
+++ b/build.xml
@@ -594,6 +594,8 @@
 
 
 
+
+
   
 
 


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



[tomcat] branch master updated: Align with 7.0.x

2019-09-16 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 1840b7e  Align with 7.0.x
1840b7e is described below

commit 1840b7e891bffa229ff6ca94edc5aab14f4b4a32
Author: Mark Thomas 
AuthorDate: Mon Sep 16 14:18:19 2019 +0100

Align with 7.0.x
---
 build.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index ab00dc2..1d706c6 100644
--- a/build.xml
+++ b/build.xml
@@ -596,8 +596,9 @@
   
 
 
-
 
+
+
   
 
 


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

2019-09-16 Thread Mark Thomas
The proposed Apache Tomcat 9.0.25 release is now available for voting.

The major changes compared to the 9.0.24 release are:

- Update to Commons Daemon 1.2.1 to pick up fixes for regressions in
  Commons Daemon 1.2.0, most notably a failure to start when using
  a 32-bit JVM on Windows.

- Avoid an NPE when accessing an https port using http.

- Correct the invalid automatic module names for the embedded JARs.

- Fix a potential hang when using HTTP/2 with the asynchronous Servlet
  API.

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


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

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



[GitHub] [tomcat] KangZhiDong closed pull request #207: Fix typos

2019-09-16 Thread GitBox
KangZhiDong closed pull request #207: Fix typos
URL: https://github.com/apache/tomcat/pull/207
 
 
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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



[GitHub] [tomcat] KangZhiDong commented on issue #207: Fix typos

2019-09-16 Thread GitBox
KangZhiDong commented on issue #207: Fix typos
URL: https://github.com/apache/tomcat/pull/207#issuecomment-531760193
 
 
   i will make other changes in spare time @markt-asf 


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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



Nexus: Staging Completed

2019-09-16 Thread Nexus Repository Manager
Message from: https://repository.apache.orgDeployer properties:"userAgent" = "maven-artifact/2.2.1 (Java 1.8.0_222; Windows 7 6.1)""userId" = "markt""ip" = "86.144.250.12"Details:The following artifacts have been staged/org/apache/tomcat/tomcat-i18n-de/9.0.25/tomcat-i18n-de-9.0.25.pom.asc(SHA1: 082ed2966c3ba71f80d507baed64d2eecb6f10b1)/org/apache/tomcat/tomcat-i18n-de/9.0.25/tomcat-i18n-de-9.0.25.pom(SHA1: 5564b8c01dd72da45588471e3acd50bcfca47335)/org/apache/tomcat/tomcat-i18n-de/9.0.25/tomcat-i18n-de-9.0.25.jar(SHA1: 702aeffc50c313f5becfaa564bb1dea7ed48017d)/org/apache/tomcat/tomcat-i18n-de/9.0.25/tomcat-i18n-de-9.0.25.jar.asc(SHA1: b9565690f2763643352710e37f658ed1aaae43c1)/org/apache/tomcat/tomcat-jni/9.0.25/tomcat-jni-9.0.25-sources.jar(SHA1: 6849b0076051f4dc6d34a1b656c65cca38d5d778)/org/apache/tomcat/tomcat-jni/9.0.25/tomcat-jni-9.0.25.pom(SHA1: 8130b5aa09c240078792908b9f00ea24882d2c5f)/org/apache/tomcat/tomcat-jni/9.0.25/tomcat-jni-9.0.25.jar.asc(SHA1: 9167d60f06e30ed64f369894a3bf2c5be922cb39)/org/apache/tomcat/tomcat-jni/9.0.25/tomcat-jni-9.0.25.jar(SHA1: cfe888a4a1314e33627fd16a2dd9b11e6a0624fc)/org/apache/tomcat/tomcat-jni/9.0.25/tomcat-jni-9.0.25.pom.asc(SHA1: 33cd9c43786e40b70b3d1510dcb5727bdb905ccb)/org/apache/tomcat/tomcat-jni/9.0.25/tomcat-jni-9.0.25-sources.jar.asc(SHA1: bce179c67920780baf846c530d7d633b1de38130)/org/apache/tomcat/tomcat-juli/9.0.25/tomcat-juli-9.0.25.pom(SHA1: d9bb2de30dfa41a433fb074eaf89231691eb1bac)/org/apache/tomcat/tomcat-juli/9.0.25/tomcat-juli-9.0.25.jar(SHA1: 44248bbeaf41a4240f62ec6ecfc4ff7cf05ee64d)/org/apache/tomcat/tomcat-juli/9.0.25/tomcat-juli-9.0.25-sources.jar.asc(SHA1: 792c3bbc66236b2e27a323069e9ec5ad40272984)/org/apache/tomcat/tomcat-juli/9.0.25/tomcat-juli-9.0.25-sources.jar(SHA1: e69c658bfd7566c4d83cc69cd6623db4f26e50b6)/org/apache/tomcat/tomcat-juli/9.0.25/tomcat-juli-9.0.25.pom.asc(SHA1: 0acd248971a0dd2c19b7607af11699a8faa7e705)/org/apache/tomcat/tomcat-juli/9.0.25/tomcat-juli-9.0.25.jar.asc(SHA1: 1e29c1ac8537450201a86e0cc261ed48464d6c2e)/org/apache/tomcat/tomcat-util/9.0.25/tomcat-util-9.0.25-sources.jar.asc(SHA1: 9ff080808c5b11c0722034f83092635d4a66a5a2)/org/apache/tomcat/tomcat-util/9.0.25/tomcat-util-9.0.25.jar(SHA1: 44b175446380044484ec19949d7ab4a30f0493ff)/org/apache/tomcat/tomcat-util/9.0.25/tomcat-util-9.0.25-sources.jar(SHA1: cc695591d73fcbf5aee77646ec827a45074a8b16)/org/apache/tomcat/tomcat-util/9.0.25/tomcat-util-9.0.25.jar.asc(SHA1: 478784bd421427841f6b44d52db5f69eda7f5164)/org/apache/tomcat/tomcat-util/9.0.25/tomcat-util-9.0.25.pom.asc(SHA1: 58276d52ef1f6585e384f91d91b9a67d56e82e74)/org/apache/tomcat/tomcat-util/9.0.25/tomcat-util-9.0.25.pom(SHA1: 381821b911446c0639e97d0919a54a41cf55fecc)/org/apache/tomcat/tomcat-catalina/9.0.25/tomcat-catalina-9.0.25.pom.asc(SHA1: b6fb2fb86186b2484f1fc568da6283c4543889de)/org/apache/tomcat/tomcat-catalina/9.0.25/tomcat-catalina-9.0.25.pom(SHA1: 43c0f616323cdff393cad2406b1e5fb3220a8184)/org/apache/tomcat/tomcat-catalina/9.0.25/tomcat-catalina-9.0.25.jar.asc(SHA1: ec57e6e0c323fffd57b44c6481a938c0de3c4604)/org/apache/tomcat/tomcat-catalina/9.0.25/tomcat-catalina-9.0.25.jar(SHA1: 8e66a404e74f594a19f027cf9f419ea95ccaabae)/org/apache/tomcat/tomcat-catalina/9.0.25/tomcat-catalina-9.0.25-sources.jar(SHA1: a64b6788b9dabc2b571a7ce1b7235c959f20c38b)/org/apache/tomcat/tomcat-catalina/9.0.25/tomcat-catalina-9.0.25-sources.jar.asc(SHA1: 8afc4068ee5fecc397d93ba2177be7551252987e)/org/apache/tomcat/tomcat-i18n-fr/9.0.25/tomcat-i18n-fr-9.0.25.pom(SHA1: b337865d731b245f1d67dbe42d4941f9488bd9fd)/org/apache/tomcat/tomcat-i18n-fr/9.0.25/tomcat-i18n-fr-9.0.25.pom.asc(SHA1: 7a935b07f92a6ae729ff56fc061bdcf456c4548f)/org/apache/tomcat/tomcat-i18n-fr/9.0.25/tomcat-i18n-fr-9.0.25.jar.asc(SHA1: cf56e12f787c39eb03ac71112f740f9f65eb813a)/org/apache/tomcat/tomcat-i18n-fr/9.0.25/tomcat-i18n-fr-9.0.25.jar(SHA1: b9f4e0d2c8c06e92a11dfdb28203d76cbefe770d)/org/apache/tomcat/tomcat-i18n-cs/9.0.25/tomcat-i18n-cs-9.0.25.pom.asc(SHA1: 4bc7534a67b99447df7f84751ac9998b2e76d722)/org/apache/tomcat/tomcat-i18n-cs/9.0.25/tomcat-i18n-cs-9.0.25.jar.asc(SHA1: 293fd9b9b365b9c28d70b13ab7a36e15a84ba926)/org/apache/tomcat/tomcat-i18n-cs/9.0.25/tomcat-i18n-cs-9.0.25.pom(SHA1: af4572c8da4ad999d96f155d362a2447732fbf67)/org/apache/tomcat/tomcat-i18n-cs/9.0.25/tomcat-i18n-cs-9.0.25.jar(SHA1: c5bcf99a2d0d49199651be99f029dbc106ec15bb)/org/apache/tomcat/tomcat-jdbc/9.0.25/tomcat-jdbc-9.0.25-sources.jar(SHA1: 07ac6337e847acf238191b31cc557377a157edcf)/org/apache/tomcat/tomcat-jdbc/9.0.25/tomcat-jdbc-9.0.25-sources.jar.asc(SHA1: 51a6c6223e945e3112e86c7336d15ae857da29f4)/org/apache/tomcat/tomcat-jdbc/9.0.25/tomcat-jdbc-9.0.25.jar(SHA1: e4e2752c4e9a8ffee0d9788c7bcc852cfd7dc122)/org/apache/tomcat/tomcat-jdbc/9.0.25/tomcat-jdbc-9.0.25.pom.asc(SHA1: 2057ebbcad14c7cf59fa4664b11369bf4507376c)/org/apache/tomcat/tomcat-jdbc/9.0.25/tomcat-jdbc-9.0.25.jar.asc(SHA1: c6e72580548a0b33352f3128aeedf03e0ebf439f)/org/apache/tomcat/tomcat-jdbc/9.0.25/tomcat-jdbc-9.0.25.pom(SHA1: 

svn commit: r35885 - in /dev/tomcat/tomcat-9/v9.0.25: ./ bin/ bin/embed/ src/

2019-09-16 Thread markt
Author: markt
Date: Mon Sep 16 12:33:40 2019
New Revision: 35885

Log:
Upload 9.0.25 for voting

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

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

Added: dev/tomcat/tomcat-9/v9.0.25/KEYS
==
--- dev/tomcat/tomcat-9/v9.0.25/KEYS (added)
+++ dev/tomcat/tomcat-9/v9.0.25/KEYS Mon Sep 16 12:33:40 2019
@@ -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] tag 9.0.25 created (now fad275b)

2019-09-16 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


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

 new fad275b  Tag 9.0.25

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



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



[tomcat] 01/01: Tag 9.0.25

2019-09-16 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit fad275b0541595ea89e59f5cb024ada531d5dbe4
Author: Mark Thomas 
AuthorDate: Mon Sep 16 12:54:37 2019 +0100

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

diff --git a/build.properties.default b/build.properties.default
index a47e0e5..727f1c5 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=9
 version.minor=0
 version.build=25
 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 c223a4c..d5328c9 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -1,4 +1,4 @@
-
+
 
-
+
   
 
   


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



[GitHub] [tomcat] markt-asf commented on a change in pull request #207: Fix typos

2019-09-16 Thread GitBox
markt-asf commented on a change in pull request #207: Fix typos
URL: https://github.com/apache/tomcat/pull/207#discussion_r324573610
 
 

 ##
 File path: java/javax/servlet/http/Part.java
 ##
 @@ -48,9 +48,6 @@
 public String getContentType();
 
 /**
- * Obtain the name of the field in the multipart form corresponding to this
- * part.
- *
  * @return The name of the field in the multipart form corresponding to 
this
 
 Review comment:
   -1 to this and all similar changes. The first sentence in the Javadoc is 
used as the method description in the table of methods. By removing this text, 
the description is lost from that table. While I am never a fan of duplication, 
in this case it is better to have the duplication than not.


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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



[GitHub] [tomcat] markt-asf commented on issue #179: PropertySource: Add an environment variable based source

2019-09-16 Thread GitBox
markt-asf commented on issue #179: PropertySource: Add an environment variable 
based source
URL: https://github.com/apache/tomcat/pull/179#issuecomment-531697078
 
 
   Fixed in:
   - master for 9.0.25 onwards
   - 8.5.x for 8.5.46 onwards
   - 7.0.x for 7.0.97 onwards


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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



[GitHub] [tomcat] markt-asf closed pull request #179: PropertySource: Add an environment variable based source

2019-09-16 Thread GitBox
markt-asf closed pull request #179: PropertySource: Add an environment variable 
based source
URL: https://github.com/apache/tomcat/pull/179
 
 
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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



[tomcat] 03/03: Polish. Spacing. Back-port clean-up from 8.5.x. Add Javadoc.

2019-09-16 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 48cc552e31ebf34e87f59f38e1c0b5b94066c214
Author: Mark Thomas 
AuthorDate: Mon Sep 16 10:00:38 2019 +0100

Polish. Spacing. Back-port clean-up from 8.5.x. Add Javadoc.
---
 .../org/apache/tomcat/util/IntrospectionUtils.java | 52 +++---
 java/org/apache/tomcat/util/digester/Digester.java | 23 +++---
 2 files changed, 42 insertions(+), 33 deletions(-)

diff --git a/java/org/apache/tomcat/util/IntrospectionUtils.java 
b/java/org/apache/tomcat/util/IntrospectionUtils.java
index 600d3da..bdce1e4 100644
--- a/java/org/apache/tomcat/util/IntrospectionUtils.java
+++ b/java/org/apache/tomcat/util/IntrospectionUtils.java
@@ -14,7 +14,6 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-
 package org.apache.tomcat.util;
 
 import java.io.File;
@@ -30,6 +29,8 @@ import java.util.Hashtable;
 import java.util.StringTokenizer;
 import java.util.Vector;
 
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.security.PermissionCheck;
 
 /**
@@ -37,9 +38,7 @@ import org.apache.tomcat.util.security.PermissionCheck;
  */
 public final class IntrospectionUtils {
 
-
-private static final org.apache.juli.logging.Log log=
-org.apache.juli.logging.LogFactory.getLog( IntrospectionUtils.class );
+private static final Log log = LogFactory.getLog(IntrospectionUtils.class);
 
 /**
  * Call execute() - any ant-like task should work
@@ -279,6 +278,10 @@ public final class IntrospectionUtils {
  * Find a method with the right name If found, call the method ( if param 
is
  * int or boolean we'll convert value to the right type before) - that 
means
  * you can have setDebug(1).
+ * @param o The object to set a property on
+ * @param name The property name
+ * @param value The property value
+ * @return true if operation was successful
  */
 public static boolean setProperty(Object o, String name, String value) {
 return setProperty(o,name,value,true);
@@ -568,7 +571,9 @@ public final class IntrospectionUtils {
 }
 
 /**
- * Reverse of Introspector.decapitalize
+ * Reverse of Introspector.decapitalize.
+ * @param name The name
+ * @return the capitalized string
  */
 public static String capitalize(String name) {
 if (name == null || name.length() == 0) {
@@ -786,24 +791,19 @@ public final class IntrospectionUtils {
 return methods;
 }
 
-@SuppressWarnings("null") // Neither params nor methodParams can be null
-  // when comparing their lengths
+@SuppressWarnings("null") // params cannot be null when comparing lengths
 public static Method findMethod(Class c, String name,
 Class params[]) {
 Method methods[] = findMethods(c);
-if (methods == null)
-return null;
 for (int i = 0; i < methods.length; i++) {
 if (methods[i].getName().equals(name)) {
 Class methodParams[] = methods[i].getParameterTypes();
-if (methodParams == null)
-if (params == null || params.length == 0)
-return methods[i];
-if (params == null)
-if (methodParams == null || methodParams.length == 0)
-return methods[i];
-if (params.length != methodParams.length)
+if (params == null && methodParams.length == 0) {
+return methods[i];
+}
+if (params.length != methodParams.length) {
 continue;
+}
 boolean found = true;
 for (int j = 0; j < params.length; j++) {
 if (params[j] != methodParams[j]) {
@@ -811,8 +811,9 @@ public final class IntrospectionUtils {
 break;
 }
 }
-if (found)
+if (found) {
 return methods[i];
+}
 }
 }
 return null;
@@ -995,6 +996,23 @@ public final class IntrospectionUtils {
 }
 
 
+/**
+ * Checks to see if the specified class is an instance of or assignable 
from
+ * the specified type. The class clazz, all its superclasses,
+ * interfaces and those superinterfaces are tested for a match against
+ * the type name type.
+ *
+ * This is similar to instanceof or {@link 
Class#isAssignableFrom}
+ * except that the target type will not be resolved into a Class
+ * object, which provides some security and memory benefits.
+ *
+ * @param clazz The class to test for a match.
+ * @param type The name of the type that clazz 

[tomcat] branch 7.0.x updated (dcc59b0 -> 48cc552)

2019-09-16 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 dcc59b0  Fix typo in StringManager class javadoc
 new 86848bb  PropertySource: Add an environment variable based source
 new 927e89f  Additional changes required to enable 
EnvironmentPropertySource
 new 48cc552  Polish. Spacing. Back-port clean-up from 8.5.x. Add Javadoc.

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:
 .../org/apache/tomcat/util/IntrospectionUtils.java | 111 -
 java/org/apache/tomcat/util/digester/Digester.java |  62 
 webapps/docs/changelog.xml |   8 +-
 webapps/docs/config/systemprops.xml|  17 +++-
 4 files changed, 149 insertions(+), 49 deletions(-)


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



[tomcat] 01/03: PropertySource: Add an environment variable based source

2019-09-16 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 86848bbb4cc8da5d8d2f02ecadbff683cdd96a33
Author: Thomas Meyer 
AuthorDate: Sat Jul 20 22:22:42 2019 +0200

PropertySource: Add an environment variable based source

When tomcat runs in an Openshift based container a Secret containing
passwords can be mapped as environment variables (with an additional
prefix).
An webapp containing an embedded context.xml which defines JDBC
datasources and placeholder variables can be used with this new
PropertySource to easily inject configuration from a Secret or
ConfigMap.
---
 java/org/apache/tomcat/util/digester/Digester.java | 15 +++
 webapps/docs/changelog.xml |  8 +++-
 webapps/docs/config/systemprops.xml| 17 +++--
 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/tomcat/util/digester/Digester.java 
b/java/org/apache/tomcat/util/digester/Digester.java
index 8985649..22f9cec 100644
--- a/java/org/apache/tomcat/util/digester/Digester.java
+++ b/java/org/apache/tomcat/util/digester/Digester.java
@@ -169,6 +169,21 @@ public class Digester extends DefaultHandler2 {
 }
 
 
+public class EnvironmentPropertySource implements 
IntrospectionUtils.PropertySource {
+@Override
+public String getProperty(String key) {
+ClassLoader cl = getClassLoader();
+if (cl instanceof PermissionCheck) {
+Permission p = new RuntimePermission("getenv." + key, null);
+if (!((PermissionCheck) cl).check(p)) {
+return null;
+}
+}
+return System.getenv(key);
+}
+}
+
+
 protected IntrospectionUtils.PropertySource source[] = new 
IntrospectionUtils.PropertySource[] {
 new SystemPropertySource() };
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0a75e46..1f8f198 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -103,7 +103,13 @@
 Service is embedded directly (i.e. with no Server) in an applciation
 and JNDI is enabled. Patch provided by S. Ali Tokmen. (markt)
   
- 
+  
+Add a new PropertySource implementation,
+EnvironmentPropertySource, that can be used to do property
+replacement in configuration files with environment variables. Pull
+request provided by Thomas Meyer. (markt)
+  
+
   
   
 
diff --git a/webapps/docs/config/systemprops.xml 
b/webapps/docs/config/systemprops.xml
index fe67649..d35623d 100644
--- a/webapps/docs/config/systemprops.xml
+++ b/webapps/docs/config/systemprops.xml
@@ -43,8 +43,21 @@
   Set this to a fully qualified name of a class that implements
  org.apache.tomcat.util.IntrospectionUtils.PropertySource.
  Required to have a public constructor with no arguments.
-  Use this to add a property source, that will be invoked when 
${parameter}
- denoted parameters are found in the XML files that Tomcat parses.
+  Use this to add a property source, that will be invoked when
+ ${parameter} denoted parameters are found in the XML 
files
+ that Tomcat parses.
+  Property replacement from the specified property source on the JVM
+ system properties can also be done using the
+ REPLACE_SYSTEM_PROPERTIES system property.
+  
org.apache.tomcat.util.digester.Digester$EnvironmentPropertySource
+ can be used to replace parameters from the process' environment
+ variables, e.g. injected ConfigMaps or Secret objects in container
+ based systems like OpenShift or Kubernetes.
+
+
+  Set this boolean system property to true to cause
+ property replacement from the digester property source on the JVM
+ system properties.
 
   
 


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



[tomcat] 02/03: Additional changes required to enable EnvironmentPropertySource

2019-09-16 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 927e89fe23098e29b63f115814f517d4ee7a5c47
Author: Mark Thomas 
AuthorDate: Thu Sep 12 15:31:26 2019 +0100

Additional changes required to enable EnvironmentPropertySource
---
 .../org/apache/tomcat/util/IntrospectionUtils.java | 59 +++---
 java/org/apache/tomcat/util/digester/Digester.java | 32 
 webapps/docs/changelog.xml |  4 +-
 3 files changed, 76 insertions(+), 19 deletions(-)

diff --git a/java/org/apache/tomcat/util/IntrospectionUtils.java 
b/java/org/apache/tomcat/util/IntrospectionUtils.java
index fee02f6..600d3da 100644
--- a/java/org/apache/tomcat/util/IntrospectionUtils.java
+++ b/java/org/apache/tomcat/util/IntrospectionUtils.java
@@ -30,6 +30,8 @@ import java.util.Hashtable;
 import java.util.StringTokenizer;
 import java.util.Vector;
 
+import org.apache.tomcat.util.security.PermissionCheck;
+
 /**
  * Utils for introspection and reflection
  */
@@ -486,10 +488,32 @@ public final class IntrospectionUtils {
 }
 
 /**
- * Replace ${NAME} with the property value
+ * Replace ${NAME} with the property value.
+ * @param value The value
+ * @param staticProp Replacement properties
+ * @param dynamicProp Replacement properties
+ * @return the replacement value
+ * @deprecated Use {@link #replaceProperties(String, Hashtable, 
PropertySource[], ClassLoader)}
  */
+@Deprecated
 public static String replaceProperties(String value,
 Hashtable staticProp, PropertySource dynamicProp[]) 
{
+return replaceProperties(value, staticProp, dynamicProp, null);
+}
+
+/**
+ * Replace ${NAME} with the property value.
+ * @param value The value
+ * @param staticProp Replacement properties
+ * @param dynamicProp Replacement properties
+ * @param classLoader Class loader associated with the code requesting the
+ *property
+ * @return the replacement value
+ */
+public static String replaceProperties(String value,
+Hashtable staticProp, PropertySource dynamicProp[],
+ClassLoader classLoader) {
+
 if (value.indexOf('$') < 0) {
 return value;
 }
@@ -520,8 +544,12 @@ public final class IntrospectionUtils {
 v = (String) staticProp.get(n);
 }
 if (v == null && dynamicProp != null) {
-for (int i = 0; i < dynamicProp.length; i++) {
-v = dynamicProp[i].getProperty(n);
+for (PropertySource propertySource : dynamicProp) {
+if (propertySource instanceof SecurePropertySource) {
+v = ((SecurePropertySource) 
propertySource).getProperty(n, classLoader);
+} else {
+v = propertySource.getProperty(n);
+}
 if (v != null) {
 break;
 }
@@ -992,19 +1020,36 @@ public final class IntrospectionUtils {
 // This provides a layer of abstraction
 
 public static interface PropertySource {
-
 public String getProperty(String key);
+}
+
 
+public static interface SecurePropertySource extends PropertySource {
+
+/**
+ * Obtain a property value, checking that code associated with the
+ * provided class loader has permission to access the property. If the
+ * {@code classLoader} is {@code null} or if {@code classLoader} does
+ * not implement {@link PermissionCheck} then the property value will 
be
+ * looked up without a call to
+ * {@link PermissionCheck#check(java.security.Permission)}
+ *
+ * @param key   The key of the requested property
+ * @param classLoader   The class loader associated with the code that
+ *  trigger the property lookup
+ * @return The property value or {@code null} if it could not be found
+ * or if {@link 
PermissionCheck#check(java.security.Permission)}
+ * fails
+ */
+public String getProperty(String key, ClassLoader classLoader);
 }
 
+
 /**
  * @deprecated Is used only by deprecated method
  */
 @Deprecated
 public static interface AttributeHolder {
-
 public void setAttribute(String key, Object o);
-
 }
-
 }
diff --git a/java/org/apache/tomcat/util/digester/Digester.java 
b/java/org/apache/tomcat/util/digester/Digester.java
index 22f9cec..614b142 100644
--- a/java/org/apache/tomcat/util/digester/Digester.java
+++ b/java/org/apache/tomcat/util/digester/Digester.java
@@ -154,13 +154,19 @@ public class Digester extends DefaultHandler2 {
 // 

[tomcat] branch 8.5.x updated: Polish. Spacing. Back-port clean-up from 9.0.x. Add Javadoc.

2019-09-16 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 6f36dd2  Polish. Spacing. Back-port clean-up from 9.0.x. Add Javadoc.
6f36dd2 is described below

commit 6f36dd2f349eeceb129d210341f7a7ce36100770
Author: Mark Thomas 
AuthorDate: Mon Sep 16 09:59:20 2019 +0100

Polish. Spacing. Back-port clean-up from 9.0.x. Add Javadoc.
---
 .../org/apache/tomcat/util/IntrospectionUtils.java | 39 ++
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/java/org/apache/tomcat/util/IntrospectionUtils.java 
b/java/org/apache/tomcat/util/IntrospectionUtils.java
index 10fafa8..5058088 100644
--- a/java/org/apache/tomcat/util/IntrospectionUtils.java
+++ b/java/org/apache/tomcat/util/IntrospectionUtils.java
@@ -14,7 +14,6 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-
 package org.apache.tomcat.util;
 
 import java.lang.reflect.InvocationTargetException;
@@ -32,7 +31,6 @@ import org.apache.tomcat.util.security.PermissionCheck;
  */
 public final class IntrospectionUtils {
 
-
 private static final Log log = LogFactory.getLog(IntrospectionUtils.class);
 
 /**
@@ -343,24 +341,19 @@ public final class IntrospectionUtils {
 return methods;
 }
 
-@SuppressWarnings("null") // Neither params nor methodParams can be null
-  // when comparing their lengths
+@SuppressWarnings("null") // params cannot be null when comparing lengths
 public static Method findMethod(Class c, String name,
 Class params[]) {
 Method methods[] = findMethods(c);
-if (methods == null)
-return null;
 for (int i = 0; i < methods.length; i++) {
 if (methods[i].getName().equals(name)) {
 Class methodParams[] = methods[i].getParameterTypes();
-if (methodParams == null)
-if (params == null || params.length == 0)
-return methods[i];
-if (params == null)
-if (methodParams == null || methodParams.length == 0)
-return methods[i];
-if (params.length != methodParams.length)
+if (params == null && methodParams.length == 0) {
+return methods[i];
+}
+if (params.length != methodParams.length) {
 continue;
+}
 boolean found = true;
 for (int j = 0; j < params.length; j++) {
 if (params[j] != methodParams[j]) {
@@ -368,8 +361,9 @@ public final class IntrospectionUtils {
 break;
 }
 }
-if (found)
+if (found) {
 return methods[i];
+}
 }
 }
 return null;
@@ -476,6 +470,23 @@ public final class IntrospectionUtils {
 }
 
 
+/**
+ * Checks to see if the specified class is an instance of or assignable 
from
+ * the specified type. The class clazz, all its superclasses,
+ * interfaces and those superinterfaces are tested for a match against
+ * the type name type.
+ *
+ * This is similar to instanceof or {@link 
Class#isAssignableFrom}
+ * except that the target type will not be resolved into a Class
+ * object, which provides some security and memory benefits.
+ *
+ * @param clazz The class to test for a match.
+ * @param type The name of the type that clazz must be.
+ *
+ * @return true if the clazz tested is an
+ * instance of the specified type,
+ * false otherwise.
+ */
 public static boolean isInstance(Class clazz, String type) {
 if (type.equals(clazz.getName())) {
 return true;


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



[tomcat] branch master updated: Polish. Spacing.

2019-09-16 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 2b63932  Polish. Spacing.
2b63932 is described below

commit 2b639322580761fed6b1a91db82aab8d5fa4ee07
Author: Mark Thomas 
AuthorDate: Mon Sep 16 09:58:38 2019 +0100

Polish. Spacing.
---
 java/org/apache/tomcat/util/IntrospectionUtils.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/IntrospectionUtils.java 
b/java/org/apache/tomcat/util/IntrospectionUtils.java
index 71d9504..0c2eb6e 100644
--- a/java/org/apache/tomcat/util/IntrospectionUtils.java
+++ b/java/org/apache/tomcat/util/IntrospectionUtils.java
@@ -14,7 +14,6 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-
 package org.apache.tomcat.util;
 
 import java.lang.reflect.InvocationTargetException;


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



[CONF] Apache Tomcat > Security

2019-09-16 Thread Mark Thomas (Confluence)
Title: Message Title



 
 
 
There's 2 new edits on this page 
 
 
 
 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Security 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

 
 
 
 
Mark Thomas edited this page 
 
 
  
 
 

 
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
Here's the version comment 
 
 
 
 
 
 
 
 
 
 
 
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 

 
 
 
 
Mark Thomas edited at 08:27 AM 
 
 
  
 
 

 
 
 
 
 
 
 
 
 Removed links to deleted pages  
 
 
  
 
 
  
 
 

 
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Here's what changed: 
 
 
 
 
 
 
 
 
 
 
 ... 
 
 How do I use OpenSSL to set up my own Certificate Authority (CA)?  
 Oh no! Port 8005 is available for anyone on localhost to shutdown my tomcat!  
 What about Tomcat running as root?  
 How do I force all my pages to run under HTTPS?  
 What is the default login for the manager and admin app?  
 How do I restrict access by ip address or remote host?  
 How do I use jsvc/procrun to run Tomcat on port 80 securely?  
 Has Tomcat's security been independently analyzed or audited?  
 How do I change the Server header in the response?  
 Why are passwords in plain text?  
 How can I restrict the list of ciphers used for HTTPS?  
 Is Tomcat vulnerable to Heartbleed bug?  
 Is Tomcat vulnerable to POODLE attack?  
 Which cipher suites should I use?  
 ... We have a page dedicated to this topic. FAQ/ Password   
 
 
 
 Anchor 
 
 
 
 
 
 
 
 
 
Q11 
 
 
 
Q11 
 
 
  
 
 
  How can I restrict the list of ciphers used for HTTPS? See HowTo SSLCiphers.  
 
 
 
 Anchor 
 
 
 
 
 
 
 
 
 
Q12 
 
 
 
Q12 
 
 
  
 
 
   Is Tomcat vulnerable to Heartbleed bug?   See Security/Heartbleed.  ...  Is Tomcat vulnerable to POODLE attack?   See Security/POODLE.  ... Which cipher suites should I use? ...  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Go to page history 
 
 
  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
View page 
 
 
  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
Stop watching space
• 
 
 
 
 
 
 
Manage notifications 
 
 
 
 
 
 
 
 
 
 
  
 
 
This message was sent by Atlassian Confluence 6.15.8  
 
 
  
 
 
 
 
 
 
 
 
 




[tomcat] 01/02: PropertySource: Add an environment variable based source

2019-09-16 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 b58f02a0f88fead8ab5210566a396dae476d9362
Author: Thomas Meyer 
AuthorDate: Sat Jul 20 22:22:42 2019 +0200

PropertySource: Add an environment variable based source

When tomcat runs in an Openshift based container a Secret containing 
passwords
can be map as environment variables (with an additional prefix).
An webapp containing an embedded context.xml which defines JDBC datasources 
and
placeholder variables can be used with this new PropertySource to easily 
inject
configuration from a Secret or ConfigMap.
---
 java/org/apache/tomcat/util/digester/Digester.java | 15 +++
 webapps/docs/changelog.xml |  6 ++
 webapps/docs/config/systemprops.xml|  9 +++--
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/tomcat/util/digester/Digester.java 
b/java/org/apache/tomcat/util/digester/Digester.java
index 59d59f0..f31518c 100644
--- a/java/org/apache/tomcat/util/digester/Digester.java
+++ b/java/org/apache/tomcat/util/digester/Digester.java
@@ -139,6 +139,21 @@ public class Digester extends DefaultHandler2 {
 }
 
 
+public class EnvironmentPropertySource implements 
IntrospectionUtils.PropertySource {
+@Override
+public String getProperty(String key) {
+ClassLoader cl = getClassLoader();
+if (cl instanceof PermissionCheck) {
+Permission p = new RuntimePermission("getenv." + key, null);
+if (!((PermissionCheck) cl).check(p)) {
+return null;
+}
+}
+return System.getenv(key);
+}
+}
+
+
 protected IntrospectionUtils.PropertySource source[] = new 
IntrospectionUtils.PropertySource[] {
 new SystemPropertySource() };
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 75c640c..2cf2b54 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -57,6 +57,12 @@
 Service is embedded directly (i.e. with no Server) in an applciation
 and JNDI is enabled. Patch provided by S. Ali Tokmen. (markt)
   
+  
+Add a new PropertySource implementation,
+EnvironmentPropertySource, that can be used to do property
+replacement in configuration files with environment variables. Pull
+request provided by Thomas Meyer. (markt)
+  
 
   
   
diff --git a/webapps/docs/config/systemprops.xml 
b/webapps/docs/config/systemprops.xml
index cb39fb1..5e37c42 100644
--- a/webapps/docs/config/systemprops.xml
+++ b/webapps/docs/config/systemprops.xml
@@ -43,11 +43,16 @@
   Set this to a fully qualified name of a class that implements
  org.apache.tomcat.util.IntrospectionUtils.PropertySource.
  Required to have a public constructor with no arguments.
-  Use this to add a property source, that will be invoked when 
${parameter}
- denoted parameters are found in the XML files that Tomcat parses.
+  Use this to add a property source, that will be invoked when
+ ${parameter} denoted parameters are found in the XML 
files
+ that Tomcat parses.
   Property replacement from the specified property source on the JVM
  system properties can also be done using the
  REPLACE_SYSTEM_PROPERTIES system property.
+  
org.apache.tomcat.util.digester.Digester$EnvironmentPropertySource
+ can be used to replace parameters from the process' environment
+ variables, e.g. injected ConfigMaps or Secret objects in container
+ based systems like OpenShift or Kubernetes.
 
 
   Set this boolean system property to true to cause


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



[tomcat] 02/02: Additional changes required to enable EnvironmentPropertySource

2019-09-16 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 c76bfc27a8c6a027bc4a139f3b07d9c75878f537
Author: Mark Thomas 
AuthorDate: Thu Sep 12 15:31:26 2019 +0100

Additional changes required to enable EnvironmentPropertySource
---
 .../org/apache/tomcat/util/IntrospectionUtils.java | 49 --
 java/org/apache/tomcat/util/digester/Digester.java | 33 ++-
 webapps/docs/changelog.xml |  4 +-
 3 files changed, 69 insertions(+), 17 deletions(-)

diff --git a/java/org/apache/tomcat/util/IntrospectionUtils.java 
b/java/org/apache/tomcat/util/IntrospectionUtils.java
index e3d6c76..10fafa8 100644
--- a/java/org/apache/tomcat/util/IntrospectionUtils.java
+++ b/java/org/apache/tomcat/util/IntrospectionUtils.java
@@ -25,6 +25,7 @@ import java.util.Hashtable;
 
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.security.PermissionCheck;
 
 /**
  * Utils for introspection and reflection
@@ -237,9 +238,27 @@ public final class IntrospectionUtils {
  * @param staticProp Replacement properties
  * @param dynamicProp Replacement properties
  * @return the replacement value
+ * @deprecated Use {@link #replaceProperties(String, Hashtable, 
PropertySource[], ClassLoader)}
  */
+@Deprecated
 public static String replaceProperties(String value,
 Hashtable staticProp, PropertySource dynamicProp[]) 
{
+return replaceProperties(value, staticProp, dynamicProp, null);
+}
+
+/**
+ * Replace ${NAME} with the property value.
+ * @param value The value
+ * @param staticProp Replacement properties
+ * @param dynamicProp Replacement properties
+ * @param classLoader Class loader associated with the code requesting the
+ *property
+ * @return the replacement value
+ */
+public static String replaceProperties(String value,
+Hashtable staticProp, PropertySource dynamicProp[],
+ClassLoader classLoader) {
+
 if (value.indexOf('$') < 0) {
 return value;
 }
@@ -270,8 +289,12 @@ public final class IntrospectionUtils {
 v = (String) staticProp.get(n);
 }
 if (v == null && dynamicProp != null) {
-for (int i = 0; i < dynamicProp.length; i++) {
-v = dynamicProp[i].getProperty(n);
+for (PropertySource propertySource : dynamicProp) {
+if (propertySource instanceof SecurePropertySource) {
+v = ((SecurePropertySource) 
propertySource).getProperty(n, classLoader);
+} else {
+v = propertySource.getProperty(n);
+}
 if (v != null) {
 break;
 }
@@ -478,9 +501,27 @@ public final class IntrospectionUtils {
 // This provides a layer of abstraction
 
 public static interface PropertySource {
-
 public String getProperty(String key);
-
 }
 
+
+public static interface SecurePropertySource extends PropertySource {
+
+/**
+ * Obtain a property value, checking that code associated with the
+ * provided class loader has permission to access the property. If the
+ * {@code classLoader} is {@code null} or if {@code classLoader} does
+ * not implement {@link PermissionCheck} then the property value will 
be
+ * looked up without a call to
+ * {@link PermissionCheck#check(java.security.Permission)}
+ *
+ * @param key   The key of the requested property
+ * @param classLoader   The class loader associated with the code that
+ *  trigger the property lookup
+ * @return The property value or {@code null} if it could not be found
+ * or if {@link 
PermissionCheck#check(java.security.Permission)}
+ * fails
+ */
+public String getProperty(String key, ClassLoader classLoader);
+}
 }
diff --git a/java/org/apache/tomcat/util/digester/Digester.java 
b/java/org/apache/tomcat/util/digester/Digester.java
index f31518c..8466241 100644
--- a/java/org/apache/tomcat/util/digester/Digester.java
+++ b/java/org/apache/tomcat/util/digester/Digester.java
@@ -124,13 +124,19 @@ public class Digester extends DefaultHandler2 {
 // --- Instance Variables
 
 
-private class SystemPropertySource implements 
IntrospectionUtils.PropertySource {
+private static class SystemPropertySource implements 
IntrospectionUtils.SecurePropertySource {
+
 @Override
 public String getProperty(String key) {
-ClassLoader cl = 

[tomcat] branch 8.5.x updated (5ee1614 -> c76bfc2)

2019-09-16 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 5ee1614  Clean-up. Remove unused code. Align with 9.0.x.
 new b58f02a  PropertySource: Add an environment variable based source
 new c76bfc2  Additional changes required to enable 
EnvironmentPropertySource

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:
 .../org/apache/tomcat/util/IntrospectionUtils.java | 49 --
 java/org/apache/tomcat/util/digester/Digester.java | 40 ++
 webapps/docs/changelog.xml |  6 +++
 webapps/docs/config/systemprops.xml|  9 +++-
 4 files changed, 91 insertions(+), 13 deletions(-)


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



[tomcat] branch master updated: PropertySourceSecure -> SecurePropertySource as per Felix's review

2019-09-16 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 cf67739  PropertySourceSecure -> SecurePropertySource as per Felix's 
review
cf67739 is described below

commit cf677393f718274d6612f739bbc58d8e4b9feda1
Author: Mark Thomas 
AuthorDate: Mon Sep 16 09:07:14 2019 +0100

PropertySourceSecure -> SecurePropertySource as per Felix's review
---
 java/org/apache/tomcat/util/IntrospectionUtils.java | 8 
 java/org/apache/tomcat/util/digester/Digester.java  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/tomcat/util/IntrospectionUtils.java 
b/java/org/apache/tomcat/util/IntrospectionUtils.java
index f6ac737..71d9504 100644
--- a/java/org/apache/tomcat/util/IntrospectionUtils.java
+++ b/java/org/apache/tomcat/util/IntrospectionUtils.java
@@ -277,8 +277,8 @@ public final class IntrospectionUtils {
 }
 if (v == null && dynamicProp != null) {
 for (PropertySource propertySource : dynamicProp) {
-if (propertySource instanceof PropertySourceSecure) {
-v = ((PropertySourceSecure) 
propertySource).getProperty(n, classLoader);
+if (propertySource instanceof SecurePropertySource) {
+v = ((SecurePropertySource) 
propertySource).getProperty(n, classLoader);
 } else {
 v = propertySource.getProperty(n);
 }
@@ -503,7 +503,7 @@ public final class IntrospectionUtils {
 }
 
 
-public static interface PropertySourceSecure extends PropertySource {
+public static interface SecurePropertySource extends PropertySource {
 
 /**
  * Obtain a property value, checking that code associated with the
@@ -513,7 +513,7 @@ public final class IntrospectionUtils {
  * looked up without a call to
  * {@link PermissionCheck#check(java.security.Permission)}
  *
- * @param key   The key of the requested property
+ * @param key   The key of the requested property
  * @param classLoader   The class loader associated with the code that
  *  trigger the property lookup
  * @return The property value or {@code null} if it could not be found
diff --git a/java/org/apache/tomcat/util/digester/Digester.java 
b/java/org/apache/tomcat/util/digester/Digester.java
index 610e83c..59a347b 100644
--- a/java/org/apache/tomcat/util/digester/Digester.java
+++ b/java/org/apache/tomcat/util/digester/Digester.java
@@ -123,7 +123,7 @@ public class Digester extends DefaultHandler2 {
 // --- Instance Variables
 
 
-private static class SystemPropertySource implements 
IntrospectionUtils.PropertySourceSecure {
+private static class SystemPropertySource implements 
IntrospectionUtils.SecurePropertySource {
 
 @Override
 public String getProperty(String key) {
@@ -144,7 +144,7 @@ public class Digester extends DefaultHandler2 {
 }
 
 
-public static class EnvironmentPropertySource implements 
IntrospectionUtils.PropertySourceSecure {
+public static class EnvironmentPropertySource implements 
IntrospectionUtils.SecurePropertySource {
 
 @Override
 public String getProperty(String key) {


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