[GitHub] [tomcat] leeyazhou edited a comment on issue #189: Additional translations of Chinese

2019-08-14 Thread GitBox
leeyazhou edited a comment on issue #189: Additional translations of Chinese
URL: https://github.com/apache/tomcat/pull/189#issuecomment-521515402
 
 
   > I'm all in favour of expanding the i18n support in Tomcat and I agree 
adding Chinese translations to 8.5.x is a good next step.
   > 
   > If you aren't already aware, Tomcat uses 
[POEditor](https://poeditor.com/projects/view?id=221603) to manage translations 
for 9.0.x and then back-ports changes to earlier versions.
   > 
   > I think there it should be possible to add significantly more Chinese 
translations than proposed in this PR and to do so in a semi-automated fashion 
that supports additional languages.
   > 
   > There are probably several different ways of doing this. My first idea is 
to use the utilities in org.apache.tomcat.buildutil.translate as a starting 
point, and write some code to support the following:
   > 
   > * For every key in 9.0.x, if the key exists in 8.5.x replace the 8.5.x 
English text with the 9.0.x version
   > * Manually review the diff and revert any changes that don't look right
   > * For every key in 9.0.x, if the key exists in 8.5.x and the English text 
is the same in both versions, copy the text for all other languages supported 
by 8.5.x from 9.0.x to 8.5.x.
   > * Repeat for 8.5.x and 7.0.x
   > 
   > Suggests to improve the process and/or patches to implement it welcome.
   
   Thank u. I'll finish the Chinese translations on  
[POEditor](https://poeditor.com/projects/view?id=221603) first. 


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] leeyazhou closed pull request #189: Additional translations of Chinese

2019-08-14 Thread GitBox
leeyazhou closed pull request #189: Additional translations of Chinese
URL: https://github.com/apache/tomcat/pull/189
 
 
   


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] leeyazhou commented on issue #189: Additional translations of Chinese

2019-08-14 Thread GitBox
leeyazhou commented on issue #189: Additional translations of Chinese
URL: https://github.com/apache/tomcat/pull/189#issuecomment-521515402
 
 
   > I'm all in favour of expanding the i18n support in Tomcat and I agree 
adding Chinese translations to 8.5.x is a good next step.
   > 
   > If you aren't already aware, Tomcat uses 
[POEditor](https://poeditor.com/projects/view?id=221603) to manage translations 
for 9.0.x and then back-ports changes to earlier versions.
   > 
   > I think there it should be possible to add significantly more Chinese 
translations than proposed in this PR and to do so in a semi-automated fashion 
that supports additional languages.
   > 
   > There are probably several different ways of doing this. My first idea is 
to use the utilities in org.apache.tomcat.buildutil.translate as a starting 
point, and write some code to support the following:
   > 
   > * For every key in 9.0.x, if the key exists in 8.5.x replace the 8.5.x 
English text with the 9.0.x version
   > * Manually review the diff and revert any changes that don't look right
   > * For every key in 9.0.x, if the key exists in 8.5.x and the English text 
is the same in both versions, copy the text for all other languages supported 
by 8.5.x from 9.0.x to 8.5.x.
   > * Repeat for 8.5.x and 7.0.x
   > 
   > Suggests to improve the process and/or patches to implement it welcome.
   
   Thank u. I'll finish translations on  
[POEditor](https://poeditor.com/projects/view?id=221603) first. 


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



windows service privilege reduction in 9.0.23/8.5.45

2019-08-14 Thread Guild, Jason A (DOT)
Hi Mark:

Glad to see the privilege reduction.

I don't use the Windows installer.
WRT the change quoted below, I am wondering if this will also be the case for 
Tomcat service installation by tomcat9.exe via the bin\service.bat script.

In that case, will tomcat9.exe will somehow be doing the equivalent of:
sc config my-tomcat-service-name obj= "NT AUTHORITY\LocalService" password= ""

Any info you can provide is appreciated.

Thanks,
Jason

On 8/14/2019 1:45 PM, Mark Thomas wrote:
The major changes compared to the 9.0.22 release are:

- Security improvements to the Windows installer including a change in
   the default user from Local System to Local Service.





[VOTE] Release Apache Tomcat 8.5.45

2019-08-14 Thread Mark Thomas
The proposed Apache Tomcat 8.5.45 release is now available for voting.

The major changes compared to the 8.5.43 release are:

- Expand the HTTP/2 excessive overhead protection to cover various forms
  of abusive client behaviour and close the connection if any such
  behaviour is detected.

- Security improvements to the Windows installer including a change in
  the default user from Local System to Local Service.

- Improve handling of invalid requests so that 400 responses are
  returned to the client rather than 500 responses.

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

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

The tag is:
https://github.com/apache/tomcat/tree/8.5.45
46d444a14cdac3e7e1f011a02cbdac9e5a80631c

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

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



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

2019-08-14 Thread markt
Author: markt
Date: Wed Aug 14 22:46:49 2019
New Revision: 35257

Log:
Upload 8.5.45 for voting

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

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

Added: dev/tomcat/tomcat-8/v8.5.45/KEYS
==
--- dev/tomcat/tomcat-8/v8.5.45/KEYS (added)
+++ dev/tomcat/tomcat-8/v8.5.45/KEYS Wed Aug 14 22:46:49 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: r35257 [2/2] - in /dev/tomcat/tomcat-8/v8.5.45: ./ bin/ bin/embed/ bin/extras/ src/

2019-08-14 Thread markt
Added: dev/tomcat/tomcat-8/v8.5.45/src/apache-tomcat-8.5.45-src.zip.asc
==
--- dev/tomcat/tomcat-8/v8.5.45/src/apache-tomcat-8.5.45-src.zip.asc (added)
+++ dev/tomcat/tomcat-8/v8.5.45/src/apache-tomcat-8.5.45-src.zip.asc Wed Aug 14 
22:46:49 2019
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAl1UivwACgkQEMAcWi9g
+WeejYg//fbFwAcMUBDpl5iNFgQ4rspAF0ZqfYYMNMp+X33OE73uUmxuABjWI9n8u
+3cTWfa8H2S1Shyz/XJVdYpuMLq9GMN4fc02NC/Bu1utUOT8lFIL8OZpYMVcmLKWw
+hNar0tJACvrvi/UFFCWuVhWBFYwCGw9SRgsEqB1b2HUL3tnv7S8ITkhwR4ZY+gl2
+jFg8xV43nrL+bhDMcQEihY/2swYQhr1dSdWuOkb1ovuo3cMQ1za9LHtgnmH9VSSt
+Cz0jRQsKC8dgHSuHl21gxi0r0lo8BKqvvSJE+aUDKeQQJSYqI5QkAGyy7DMjToXi
+SdGh6yzZtYp7wj+IMQMnO+3ZNLP/yyEVTjTmUoAInm7eiOtwLGEJLdE0BlMDaZr3
+i+ea0cYxFoyZc1bLeUVUoEe77vuD7OsxB7FpV/tcMfrqFAoHIWVNLIqx7qs5henR
+gM7BWvknjpcWEGnK+OixRaEghIsHzEFXfYj+iGmmoExU8ONQa7orkIb/Wia5T6t/
++lKGqOZKc7YWIcIkRUYKyzU+1Y3eclL8WRZVxpY0gd3lTZiTPs6fn8ixWUxFaKBz
+2YCpEDW5UxgdgoRXC7+ToZdPYj80mtPTlSKauQ/MwyxxMdKLDZ5ey4Gw4Y1kqz/A
+BJ0oCVUu9TMXSDT+Iv1+4OK8R0v5fpfGcLFaBTt3yyFJg90V8T8=
+=jG9l
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-8/v8.5.45/src/apache-tomcat-8.5.45-src.zip.sha512
==
--- dev/tomcat/tomcat-8/v8.5.45/src/apache-tomcat-8.5.45-src.zip.sha512 (added)
+++ dev/tomcat/tomcat-8/v8.5.45/src/apache-tomcat-8.5.45-src.zip.sha512 Wed Aug 
14 22:46:49 2019
@@ -0,0 +1 @@
+7ecea75e5dea15602c337030814cf23e63fa31af252ce660304a146f589fadaeed300beeaee1cb68cdde97b1de347d739f86c4b4d72014ee872f9b1bb27dcb0a
 *apache-tomcat-8.5.45-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



Nexus: Staging Completed

2019-08-14 Thread Nexus Repository Manager
Message from: https://repository.apache.orgDeployer properties:"userAgent" = "maven-artifact/2.2.1 (Java 1.8.0_212; Windows 7 6.1)""userId" = "markt""ip" = "86.144.250.12"Details:The following artifacts have been staged/org/apache/tomcat/tomcat-jni/8.5.45/tomcat-jni-8.5.45-sources.jar.asc(SHA1: 463c4df68cf1242f71a7c08808527583285383b1)/org/apache/tomcat/tomcat-jni/8.5.45/tomcat-jni-8.5.45.jar.asc(SHA1: 4837da53a8bb7437bbd5d2a2a3d28caa57310153)/org/apache/tomcat/tomcat-jni/8.5.45/tomcat-jni-8.5.45.jar(SHA1: f6ce1b9edff3093f24d4d62b8365fee0c812d558)/org/apache/tomcat/tomcat-jni/8.5.45/tomcat-jni-8.5.45.pom.asc(SHA1: ded34e030f8e305cffd524d90777c27e95940c6e)/org/apache/tomcat/tomcat-jni/8.5.45/tomcat-jni-8.5.45.pom(SHA1: aca05bef46031b1059799dcc7f1b037dfcb2778f)/org/apache/tomcat/tomcat-jni/8.5.45/tomcat-jni-8.5.45-sources.jar(SHA1: 8895b983a190f8ac75e33b3825fd2f4f440c85db)/org/apache/tomcat/tomcat-juli/8.5.45/tomcat-juli-8.5.45.jar(SHA1: 12a1e934786993e166dfcd02c46ec7f8337a8387)/org/apache/tomcat/tomcat-juli/8.5.45/tomcat-juli-8.5.45.pom(SHA1: 10acd0baed45ed951aeb0c54677f71f603b43911)/org/apache/tomcat/tomcat-juli/8.5.45/tomcat-juli-8.5.45.pom.asc(SHA1: b5865c46e84c83f43d20394f355b096d3fc95050)/org/apache/tomcat/tomcat-juli/8.5.45/tomcat-juli-8.5.45-sources.jar(SHA1: 7f1c80f08a0b2d76992cfd0a944cdc61b68121b5)/org/apache/tomcat/tomcat-juli/8.5.45/tomcat-juli-8.5.45-sources.jar.asc(SHA1: b3af7880eb1d96128b03e6eb8b5bd62ba421cbdf)/org/apache/tomcat/tomcat-juli/8.5.45/tomcat-juli-8.5.45.jar.asc(SHA1: 53f6e865571c521ac8017a736e9735284fb3eb35)/org/apache/tomcat/tomcat-util/8.5.45/tomcat-util-8.5.45.pom(SHA1: a52522b834e98c7fcb041668c96a33f18d35431f)/org/apache/tomcat/tomcat-util/8.5.45/tomcat-util-8.5.45-sources.jar.asc(SHA1: c20c12b1c1e02dc661b8e27378a304170659748e)/org/apache/tomcat/tomcat-util/8.5.45/tomcat-util-8.5.45.pom.asc(SHA1: 08a5c4d8fc7a07cffb7ac0cdb27cdd74bbb7bf1c)/org/apache/tomcat/tomcat-util/8.5.45/tomcat-util-8.5.45.jar(SHA1: 07a25a93fefe17b1c9ad3d4a65eb0068d377c078)/org/apache/tomcat/tomcat-util/8.5.45/tomcat-util-8.5.45.jar.asc(SHA1: d2af18b7a736755aa61e08471fe73237a0e5bf0f)/org/apache/tomcat/tomcat-util/8.5.45/tomcat-util-8.5.45-sources.jar(SHA1: b1fe3f1dd026d0ceeb1d7c9e57db316aab0bc72e)/org/apache/tomcat/tomcat-catalina/8.5.45/tomcat-catalina-8.5.45-sources.jar(SHA1: 59d2e1044647625e9bf26ee09478576c21658a04)/org/apache/tomcat/tomcat-catalina/8.5.45/tomcat-catalina-8.5.45.pom(SHA1: 99ceba976abf6e4eedb4a6ee024a12ec6cf79e20)/org/apache/tomcat/tomcat-catalina/8.5.45/tomcat-catalina-8.5.45-sources.jar.asc(SHA1: 6d53cf9bfc8bf6632ac59936c63b220572a52d57)/org/apache/tomcat/tomcat-catalina/8.5.45/tomcat-catalina-8.5.45.pom.asc(SHA1: 1de05e194cfb2bd5e0e6e13809bb2c2f2045192d)/org/apache/tomcat/tomcat-catalina/8.5.45/tomcat-catalina-8.5.45.jar.asc(SHA1: b93408d9ed24a2e947719eaa8f5f069323d690c8)/org/apache/tomcat/tomcat-catalina/8.5.45/tomcat-catalina-8.5.45.jar(SHA1: 25c02c95590b7ec0b76445b8899e0620dcdcf0ec)/org/apache/tomcat/tomcat-catalina-ws/8.5.45/tomcat-catalina-ws-8.5.45.jar(SHA1: 9ba1a2e76ec26d540dc7ff9e463b402a9af22875)/org/apache/tomcat/tomcat-catalina-ws/8.5.45/tomcat-catalina-ws-8.5.45.pom.asc(SHA1: 0f732f0bbaad7b3dd8d7e3cf3c431212c887477e)/org/apache/tomcat/tomcat-catalina-ws/8.5.45/tomcat-catalina-ws-8.5.45.jar.asc(SHA1: 291244691612ec99a9b15d15541a965938961c54)/org/apache/tomcat/tomcat-catalina-ws/8.5.45/tomcat-catalina-ws-8.5.45-sources.jar(SHA1: 091a7dab45a4d52cec38cee1ed6a832dc0836f68)/org/apache/tomcat/tomcat-catalina-ws/8.5.45/tomcat-catalina-ws-8.5.45-sources.jar.asc(SHA1: 43b3e77b659d549745d00b6688f6f960757f6732)/org/apache/tomcat/tomcat-catalina-ws/8.5.45/tomcat-catalina-ws-8.5.45.pom(SHA1: 52de4cffd088c5827e3177d22626493c1daee159)/org/apache/tomcat/tomcat-i18n-fr/8.5.45/tomcat-i18n-fr-8.5.45.pom(SHA1: c1a62b2eb3ee2a79087e91116062afe3ede75ebe)/org/apache/tomcat/tomcat-i18n-fr/8.5.45/tomcat-i18n-fr-8.5.45.pom.asc(SHA1: a37ccf7a5dbbd8d6738b9a80e7b12d66e0b4eb69)/org/apache/tomcat/tomcat-i18n-fr/8.5.45/tomcat-i18n-fr-8.5.45.jar.asc(SHA1: cda354608e584e8ff1957eddeffccb594876174d)/org/apache/tomcat/tomcat-i18n-fr/8.5.45/tomcat-i18n-fr-8.5.45.jar(SHA1: 65262f85d1cb2907a3dd16f0d40dea4d4eea49e5)/org/apache/tomcat/tomcat-jdbc/8.5.45/tomcat-jdbc-8.5.45-sources.jar(SHA1: e805b4d3ef75ed3c95e5adc55a261f556b0672cb)/org/apache/tomcat/tomcat-jdbc/8.5.45/tomcat-jdbc-8.5.45.pom.asc(SHA1: d048d658b5f4e672c32c2eb9333ea3f42b736fa1)/org/apache/tomcat/tomcat-jdbc/8.5.45/tomcat-jdbc-8.5.45.pom(SHA1: 6cd3ff23d279163307d621a41f442b79adf16d75)/org/apache/tomcat/tomcat-jdbc/8.5.45/tomcat-jdbc-8.5.45.jar.asc(SHA1: ea2a644392daa323d630f4ba2b00a25460da)/org/apache/tomcat/tomcat-jdbc/8.5.45/tomcat-jdbc-8.5.45-sources.jar.asc(SHA1: 7b4635bc5e4061f572000cf9b91644e11480c4a2)/org/apache/tomcat/tomcat-jdbc/8.5.45/tomcat-jdbc-8.5.45.jar(SHA1: 864458c290c9a2fae72794ca078bf7012a8e9c31)/org/apache/tomcat/embed/tomcat-embed-core/8.5.45/tomcat-embed-core-8.5.45-sources.jar(SHA1: 

svn commit: r35256 - /dev/tomcat/tomcat-8/v8.5.44/

2019-08-14 Thread markt
Author: markt
Date: Wed Aug 14 22:31:03 2019
New Revision: 35256

Log:
Drop 8.5.44 (vote cancelled)

Removed:
dev/tomcat/tomcat-8/v8.5.44/


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



buildbot success in on tomcat-trunk

2019-08-14 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/4553

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

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch master] f68a26e087760b9d4bb1c101b12d63182d65cc11
Blamelist: Mark Thomas 

Build succeeded!

Sincerely,
 -The Buildbot




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



[tomcat] tag 8.5.45 created (now 46d444a)

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

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


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

 new 46d444a  Tag 8.5.45

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

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

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

commit 46d444a14cdac3e7e1f011a02cbdac9e5a80631c
Author: Mark Thomas 
AuthorDate: Wed Aug 14 23:18:09 2019 +0100

Tag 8.5.45
---
 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 e067b36..9729a39 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=8
 version.minor=5
 version.build=45
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Build control flags -
 # Note enabling validation uses Checkstyle which is LGPL licensed
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2d0cb26..fde879c 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



Re: [VOTE] Release Apache Tomcat 9.0.24

2019-08-14 Thread Mark Thomas
On 14/08/2019 22:56, Guild, Jason A (DOT) wrote:
> Hi Mark:
> 
> Glad to see the privilege reduction.
> 
> I don't use the Windows installer.
> WRT the change below, I am wondering if this will also be the case for 
> service installation by tomcat9.exe via the bin\service.bat script.
> 
> I am hoping the tomcat9.exe will somehow be doing the equivalent of:
> sc config my-tomcat-service-name obj= "NT AUTHORITY\LocalService" 
> password= ""
> 
> Any info you can provide is appreciated.

Yes, the default service user should apply when installed via
service.bat as well as by the Windows installer.

Mark


> 
> Thanks,
> Jason
> 
> On 8/14/2019 1:45 PM, Mark Thomas wrote:
>> The major changes compared to the 9.0.22 release are:
>>
>> - Security improvements to the Windows installer including a change in
>>the default user from Local System to Local Service.
> 
> 
> -
> 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: [VOTE] Release Apache Tomcat 9.0.24

2019-08-14 Thread Guild, Jason A (DOT)
Hi Mark:

Glad to see the privilege reduction.

I don't use the Windows installer.
WRT the change below, I am wondering if this will also be the case for 
service installation by tomcat9.exe via the bin\service.bat script.

I am hoping the tomcat9.exe will somehow be doing the equivalent of:
sc config my-tomcat-service-name obj= "NT AUTHORITY\LocalService" 
password= ""

Any info you can provide is appreciated.

Thanks,
Jason

On 8/14/2019 1:45 PM, Mark Thomas wrote:
> The major changes compared to the 9.0.22 release are:
>
> - Security improvements to the Windows installer including a change in
>the default user from Local System to Local Service.



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

2019-08-14 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 f68a26e  Increment version for next development cycle
f68a26e is described below

commit f68a26e087760b9d4bb1c101b12d63182d65cc11
Author: Mark Thomas 
AuthorDate: Wed Aug 14 22:52:29 2019 +0100

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

diff --git a/build.properties.default b/build.properties.default
index ad3c98d..25e83c3 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=9
 version.minor=0
-version.build=24
+version.build=25
 version.patch=0
 version.suffix=-dev
 
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 0ff148f..7c063fd 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.24
+maven.asf.release.deploy.version=9.0.25
 
 #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 35d57d7..755aa98 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -44,7 +44,9 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
+
+
   
 
   


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



[VOTE] Release Apache Tomcat 9.0.24

2019-08-14 Thread Mark Thomas
The proposed Apache Tomcat 9.0.24 release is now available for voting.

The major changes compared to the 9.0.22 release are:

- Expand Graal native image support to include JNDI, JSPs and JULI

- Expand the HTTP/2 excessive overhead protection to cover various forms
  of abusive client behaviour and close the connection if any such
  behaviour is detected.

- Security improvements to the Windows installer including a change in
  the default user from Local System to Local Service.

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


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

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



svn commit: r35254 - in /dev/tomcat/tomcat-9/v9.0.24: ./ bin/ bin/embed/ src/

2019-08-14 Thread markt
Author: markt
Date: Wed Aug 14 21:43:22 2019
New Revision: 35254

Log:
Upload 9.0.24 for voting

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

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

Added: dev/tomcat/tomcat-9/v9.0.24/KEYS
==
--- dev/tomcat/tomcat-9/v9.0.24/KEYS (added)
+++ dev/tomcat/tomcat-9/v9.0.24/KEYS Wed Aug 14 21:43:22 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

Nexus: Staging Completed

2019-08-14 Thread Nexus Repository Manager
Message from: https://repository.apache.orgDeployer properties:"userAgent" = "maven-artifact/2.2.1 (Java 1.8.0_212; 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.24/tomcat-i18n-de-9.0.24.pom.asc(SHA1: 3ee28a8be55424981cc26ec6b33d08e5e63aa862)/org/apache/tomcat/tomcat-i18n-de/9.0.24/tomcat-i18n-de-9.0.24.pom(SHA1: 46e1ffdf0ba41ec2038a31c5f133881ce14c2c00)/org/apache/tomcat/tomcat-i18n-de/9.0.24/tomcat-i18n-de-9.0.24.jar.asc(SHA1: a272ae98dd9a39f5d5075f02e04dc9fdf25a0fd8)/org/apache/tomcat/tomcat-i18n-de/9.0.24/tomcat-i18n-de-9.0.24.jar(SHA1: 9e677cfb8ea7fb4c61df1f3f0226db629f3b5097)/org/apache/tomcat/tomcat-jni/9.0.24/tomcat-jni-9.0.24.jar(SHA1: 54467193cff6dbe0b0c94f4f9903aaf8e9d549b7)/org/apache/tomcat/tomcat-jni/9.0.24/tomcat-jni-9.0.24.pom(SHA1: 7f145304f050040bae32a0497878fc3500baac05)/org/apache/tomcat/tomcat-jni/9.0.24/tomcat-jni-9.0.24-sources.jar.asc(SHA1: 6f9f547397394fe7e7e0903d6a5614ada682c933)/org/apache/tomcat/tomcat-jni/9.0.24/tomcat-jni-9.0.24.pom.asc(SHA1: 163005b194a64a117c02740301eca312afd1ee48)/org/apache/tomcat/tomcat-jni/9.0.24/tomcat-jni-9.0.24-sources.jar(SHA1: 498a658df2f80dca6f4c9bd938b869dbc334ca45)/org/apache/tomcat/tomcat-jni/9.0.24/tomcat-jni-9.0.24.jar.asc(SHA1: 5f19c7390a635d8ea76b29c22a9631c0400a5800)/org/apache/tomcat/tomcat-juli/9.0.24/tomcat-juli-9.0.24.jar(SHA1: 4a953a7ab57fc520a0fa1b789664662757e785ba)/org/apache/tomcat/tomcat-juli/9.0.24/tomcat-juli-9.0.24-sources.jar.asc(SHA1: 5d6d975fc39aa20b644ce53150e27c34f316d868)/org/apache/tomcat/tomcat-juli/9.0.24/tomcat-juli-9.0.24.jar.asc(SHA1: 78b50c05f193b6e4966c81e52d45fa3a4f19f051)/org/apache/tomcat/tomcat-juli/9.0.24/tomcat-juli-9.0.24.pom.asc(SHA1: 3263a4867958e19ff5abadce41aabf3c22189326)/org/apache/tomcat/tomcat-juli/9.0.24/tomcat-juli-9.0.24.pom(SHA1: 58fd1b7a8ddabb7c19ab6a1801e4e8a2464c7f76)/org/apache/tomcat/tomcat-juli/9.0.24/tomcat-juli-9.0.24-sources.jar(SHA1: 894a0411135d122f3bff381ade9408cb9fc2f60d)/org/apache/tomcat/tomcat-util/9.0.24/tomcat-util-9.0.24.pom.asc(SHA1: 0abea4bfaf00941a5aa447540936091562f9ad71)/org/apache/tomcat/tomcat-util/9.0.24/tomcat-util-9.0.24.jar.asc(SHA1: ccf24343600481d2d1b99f49d1fd5f85d0fd0984)/org/apache/tomcat/tomcat-util/9.0.24/tomcat-util-9.0.24.jar(SHA1: 62f55c8e3f6063259af2c5b42872f2c6f6f76646)/org/apache/tomcat/tomcat-util/9.0.24/tomcat-util-9.0.24.pom(SHA1: fbf575e8fb8f724ae2dad4062dfa064c3ffe8332)/org/apache/tomcat/tomcat-util/9.0.24/tomcat-util-9.0.24-sources.jar(SHA1: 1947c57d12d0e0353e8abf62905f8dcf35f7b648)/org/apache/tomcat/tomcat-util/9.0.24/tomcat-util-9.0.24-sources.jar.asc(SHA1: d55fe75b1895e5750dc805fdcb6e7af652817dad)/org/apache/tomcat/tomcat-catalina/9.0.24/tomcat-catalina-9.0.24-sources.jar(SHA1: ab79cb9c6f7c2f1dbcef52413802579b712bbb09)/org/apache/tomcat/tomcat-catalina/9.0.24/tomcat-catalina-9.0.24-sources.jar.asc(SHA1: 57cdc2d20ecd5739e874940d9054b2f3a2553715)/org/apache/tomcat/tomcat-catalina/9.0.24/tomcat-catalina-9.0.24.jar(SHA1: 7ad66e3ae32333fecc3c081f2329b419412eb0bf)/org/apache/tomcat/tomcat-catalina/9.0.24/tomcat-catalina-9.0.24.pom(SHA1: 5a5ade42ef9292ae6ab8d852444bc846b80d9302)/org/apache/tomcat/tomcat-catalina/9.0.24/tomcat-catalina-9.0.24.jar.asc(SHA1: 0283e53f70806a4eee6af7693105ea08d8a18eaf)/org/apache/tomcat/tomcat-catalina/9.0.24/tomcat-catalina-9.0.24.pom.asc(SHA1: f5cac30f2de1d05e96e015f3b70fcf334809fb89)/org/apache/tomcat/tomcat-i18n-fr/9.0.24/tomcat-i18n-fr-9.0.24.jar(SHA1: 360f0ce570636ad65d9b9270e9166d6285abab2e)/org/apache/tomcat/tomcat-i18n-fr/9.0.24/tomcat-i18n-fr-9.0.24.pom(SHA1: 0fe58be1ed9e51ce52c3e9025cdfe149e51a9a32)/org/apache/tomcat/tomcat-i18n-fr/9.0.24/tomcat-i18n-fr-9.0.24.pom.asc(SHA1: e36b529fbcfd82588229dc3f144badafeb7bed83)/org/apache/tomcat/tomcat-i18n-fr/9.0.24/tomcat-i18n-fr-9.0.24.jar.asc(SHA1: f0638dfd93643d88eebeacc63095b1b6692bafd1)/org/apache/tomcat/tomcat-i18n-cs/9.0.24/tomcat-i18n-cs-9.0.24.jar(SHA1: bd6c48c4e53dcb7c7f409718f13de1e245ba7be0)/org/apache/tomcat/tomcat-i18n-cs/9.0.24/tomcat-i18n-cs-9.0.24.pom.asc(SHA1: 7c71f4c12cfc4429a0d974c59aa076fc8d1e579e)/org/apache/tomcat/tomcat-i18n-cs/9.0.24/tomcat-i18n-cs-9.0.24.jar.asc(SHA1: 1256ac3bffd785c8508d5d37a57d33ed8dda32e6)/org/apache/tomcat/tomcat-i18n-cs/9.0.24/tomcat-i18n-cs-9.0.24.pom(SHA1: c930e05afcb462eb018e4bac4a30caab2218ee35)/org/apache/tomcat/tomcat-jdbc/9.0.24/tomcat-jdbc-9.0.24.pom(SHA1: 0a196f44d384ea083febf603f58e2b81179e6bf7)/org/apache/tomcat/tomcat-jdbc/9.0.24/tomcat-jdbc-9.0.24-sources.jar(SHA1: 3d87662aaf09025331b56c1e7f4205a56764cac9)/org/apache/tomcat/tomcat-jdbc/9.0.24/tomcat-jdbc-9.0.24-sources.jar.asc(SHA1: 2b4e1b8e20ece4bccc897fd2a09072e4f12f748e)/org/apache/tomcat/tomcat-jdbc/9.0.24/tomcat-jdbc-9.0.24.pom.asc(SHA1: 2eacc825d1c3d6f3af1878b6fbbd652d37da9688)/org/apache/tomcat/tomcat-jdbc/9.0.24/tomcat-jdbc-9.0.24.jar.asc(SHA1: 8b9ebe33bb1ad5d0f105e7744f1710b690ce8f82)/org/apache/tomcat/tomcat-jdbc/9.0.24/tomcat-jdbc-9.0.24.jar(SHA1: 

svn commit: r35253 - /dev/tomcat/tomcat-9/v9.0.23/

2019-08-14 Thread markt
Author: markt
Date: Wed Aug 14 21:25:49 2019
New Revision: 35253

Log:
Drop 9.0.23 (vote cancelled)

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


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



Nexus: Staging Repository Dropped

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

Nexus: Staging Repository Dropped

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

[tomcat] tag 9.0.24 created (now 6158eb8)

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

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


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

 new 6158eb8  Tag 9.0.24

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

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

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

commit 6158eb84d9a15565787eda7e37f3e2f220a34a54
Author: Mark Thomas 
AuthorDate: Wed Aug 14 22:14:21 2019 +0100

Tag 9.0.24
---
 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 ad3c98d..c2fe3a3 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=9
 version.minor=0
 version.build=24
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Build control flags -
 # Note enabling validation uses Checkstyle which is LGPL licensed
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 79c3667..83bfed4 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



buildbot failure in on tomcat-trunk

2019-08-14 Thread buildbot
The Buildbot has detected a new failure on builder tomcat-trunk while building 
tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/4552

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

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch master] cac843ff289c08f7a2aad2a72293b46fbaa76485
Blamelist: Mark Thomas 

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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



[tomcat] branch 8.5.x updated: 8.5.44 vote cancelled

2019-08-14 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 f11b95c  8.5.44 vote cancelled
f11b95c is described below

commit f11b95c2ed7daef271cc7f2d4e64be37ef5ab6d2
Author: Mark Thomas 
AuthorDate: Wed Aug 14 21:38:10 2019 +0100

8.5.44 vote cancelled
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 775d1d7..2d0cb26 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -55,7 +55,7 @@
 
   
 
-
+
   
 
   


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



[tomcat] branch master updated: Release vote cancelled

2019-08-14 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 cac843f  Release vote cancelled
cac843f is described below

commit cac843ff289c08f7a2aad2a72293b46fbaa76485
Author: Mark Thomas 
AuthorDate: Wed Aug 14 21:35:30 2019 +0100

Release vote cancelled
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 79c3667..35d57d7 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -55,7 +55,7 @@
 
   
 
-
+
   
 
   


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



[VOTE][CANCELLED] Release Apache Tomcat 9.0.23

2019-08-14 Thread Mark Thomas
I'm cancelling the vote and re-tagging due to an issue with the changelog.

Mark


On 14/08/2019 12:57, Mark Thomas wrote:
> The proposed Apache Tomcat 9.0.23 release is now available for voting.
> 
> The major changes compared to the 9.0.22 release are:
> 
> - Various improvements to the Kubernetes cluster membership service
> 
> - Expand the HTTP/2 excessive overhead protection to cover various forms
>   of abusive client behaviour and close the connection if any such
>   behaviour is detected.
> 
> - Security improvements to the Windows installer including a change in
>   the default user from Local System to Local Service.
> 
> 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.23/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1225/
> The tag is:
> https://github.com/apache/tomcat/tree/9.0.23
> bd48c597e3cb280d73d9c9279babcaf75b6879c0
> 
> The proposed 9.0.23 release is:
> [ ] Broken - do not release
> [ ] Stable - go ahead and release as 9.0.23
> 
> -
> 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



[VOTE][CANCELLED] Release Apache Tomcat 8.5.44

2019-08-14 Thread Mark Thomas
I'm cancelling the vote and re-tagging due to an issue with the changelog.

Mark


On 14/08/2019 17:38, Mark Thomas wrote:
> The proposed Apache Tomcat 8.5.44 release is now available for voting.
> 
> The major changes compared to the 8.5.43 release are:
> 
> - Expand the HTTP/2 excessive overhead protection to cover various forms
>   of abusive client behaviour and close the connection if any such
>   behaviour is detected.
> 
> - Security improvements to the Windows installer including a change in
>   the default user from Local System to Local Service.
> 
> - Improve handling of invalid requests so that 400 responses are
>   returned to the client rather than 500 responses.
> 
> 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.44/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1226/
> 
> The tag is:
> https://github.com/apache/tomcat/tree/8.5.44
> 593f3797c2de532988387692bb5f9a283c6182c5
> 
> The proposed 8.5.44 release is:
> [ ] Broken - do not release
> [ ] Stable - go ahead and release as 8.5.44
> 
> -
> 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.23

2019-08-14 Thread Mark Thomas
On 14/08/2019 18:48, Rainer Jung wrote:
> Hi there,
> 
> this commit introduced a BOM at the beginning of the changelog.xml file,
> which leads to a checkstyle validation failure during building 9.0.23
> (when validation is actiive).
> 
> The BOM isn't shown in the below mail, but one can see the leading ef bb
> bf wit any binary editor. I first thought the failure was due to the
> checkstyle update, but it is just the BOM.
> 
> That's no functional problem, but people trying to build 9.0.23 with
> validation on will fail and wonder. Not sure whether that warrants a
> retag. I can see the BOM in the 8.5.44 file as well.

I'll re-tag both of them.

I think I edited the file with notepad rather than vi this time around
which is probably how this happened.

Apologies for the hassle.

Mark

> 
> Regards,
> 
> Rainer
> 
> Am 14.08.2019 um 13:10 schrieb ma...@apache.org:
>> This is an automated email from the ASF dual-hosted git repository.
>>
>> markt pushed a commit to tag 9.0.23
>> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>>
>> commit bd48c597e3cb280d73d9c9279babcaf75b6879c0
>> Author: Mark Thomas 
>> AuthorDate: Wed Aug 14 12:10:06 2019 +0100
>>
>>  Tag 9.0.23
>> ---
>>   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 14ef092..3146ccb 100644
>> --- a/build.properties.default
>> +++ b/build.properties.default
>> @@ -27,7 +27,7 @@ version.major=9
>>   version.minor=0
>>   version.build=23
>>   version.patch=0
>> -version.suffix=-dev
>> +version.suffix=
>>     # - Build control flags -
>>   # Note enabling validation uses Checkstyle which is LGPL licensed
>> diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
>> index 0cbf970..15646db 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
> 


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



Re: [VOTE] Release Apache Tomcat 9.0.23

2019-08-14 Thread Rémy Maucherat
On Wed, Aug 14, 2019 at 1:57 PM Mark Thomas  wrote:

> The proposed Apache Tomcat 9.0.23 release is now available for voting.
>
> The major changes compared to the 9.0.22 release are:
>
> - Various improvements to the Kubernetes cluster membership service
>

The changes there are trivial and not worth mentioning IMO. Maybe the Graal
native image support could be mentioned instead ?


>
> - Expand the HTTP/2 excessive overhead protection to cover various forms
>   of abusive client behaviour and close the connection if any such
>   behaviour is detected.
>
> - Security improvements to the Windows installer including a change in
>   the default user from Local System to Local Service.
>
> 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.23/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1225/
> The tag is:
> https://github.com/apache/tomcat/tree/9.0.23
> bd48c597e3cb280d73d9c9279babcaf75b6879c0
>
> The proposed 9.0.23 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 9.0.23
>
> Note: basic testing as I'm on vacation.

Rémy


Re: HTTP/2 DoS issues announced today - Impact for Apache Tomcat

2019-08-14 Thread tomcat

On 13.08.2019 19:48, Mark Thomas wrote:

Today Netflix has published a report highlighting various potential DoS
attacks against HTTP/2 implementations [1].

No immediate action is required for Tomcat users since none of the
described attacks result in a DoS with Apache Tomcat.

The Tomcat Security Team has reviewed the impact on Tomcat of each of
these attacks. The load generated by the attacks is comparable to the
load generated by a similar amount of valid client traffic. Therefore,
these requests are not viewed as a DoS by the Tomcat Security Team. We
did look a little harder at the CVE-2019-9513 "Resource Loop" attack as
came closest to exceeding the load generated by valid traffic.

While we do not consider the described attacks to represent a DoS for
Apache Tomcat, they do all represent abusive client behaviour. In
response to these reports we will be expanding the overhead protection
already in place to detect these abusive behaviours and to close the
connection when they are detected.

The expanded overhead detection will be configurable, including the
option to disable it. The configuration will be provided with what we
consider to be reasonable defaults although there is the possibility
that these defaults will be adjusted based on user feedback in future
versions.

This additional protection will be in the next releases of 9.0.x and
8.5.x, currently expected to be 9.0.23 and 8.5.44. The release process
for these versions is expected to start later today.

Mark
on behalf of the Tomcat Security Team



Hi.

I believe that any sysadmin responsible for several webservers open to the Internet would 
agree with me, that such attacks are quite common, and extremely annoying to say the very 
least; and that any of these same sysadmins has already had many undisclosable wishes 
regarding the ultimate fate of the perpetrators. And I believe that many of them are quite 
annoyed by the fact that so far, the only defense has seemed to be to install additional 
patches, and to present the other cheek.


This was just some background for the suggestion which follows.
It is in fact not an alternative solution, but only an amendment (or an augmentation), to 
the scheme proposed above. Here it goes..


Instead of just closing the connection when malicious behaviour is detected, would it not 
be more effective, in the long run, to provide a (optional) way to keep this connection 
open for some variable and adjustable time (without doing anything resource-intensive, but 
ignoring what the attacker may be sending on it), in order to use up the resources of the 
attacker, for a change ?
Whoever wanted to indeed close the connection right away, could set up his server to do 
just that. But whoever wanted to participate to the collective self-defense scheme which 
is suggested here, would also be able to do that.


I mention collective self-defense, because I am convinced that if such a scheme was 
somewhat widely adopted, it would quickly become uneconomical for perpetrators in general 
to even try their schemes. After all, any DoS (or other similar) attack on a webserver, 
requires an agent, which itself uses resources and thus has a cost. If such an agent can 
quickly determine that its attack doesn't work (as when its connection is immediately 
closed), it can just as quickly move on to the next target and start annoying someone 
else. But if the target reacts in such a way that the agent cannot determine if this is 
just a normal server-busy/network delay or "the scheme", then it cannot move on, and has 
to continue using up its own resources on the current target (ultimately to no avail, but 
that is just the point); which means that to attack a similar number of targets, an 
attacker ultimately has to put more and more resources in play. That's the economic 
argument (*).


Some random delay, with inferior and superior adjustable limits, might just do 
that.
To be most effective, this should be the default tomcat configuration, with possibility 
for the sysadmin to disable it for edge cases (or just because they are unbelievers).
As people update their tomcats over time, it should be so that at some point, the 
worldwide percentage population of tomcat servers applying this form of defense would 
render it uneconomical for potential attackers to target them, leading to the population 
of perpetrators itself to decline.  Which would be a universal benefit not only to tomcat 
admins, but to webserver admins in general. So it would act a bit like a vaccine..

That might be worth an IgNobel prize, wouldn't it ?

I am leaving the implementation details to my colleagues here who can really program Java 
and Tomcat..


Having proposed a similar scheme to the Apache httpd list a few years ago (unsuccesfully, 
I must admit), I am quite familiar with some of the counter-arguments. I'm curious to see 
if the same ones occur here and now.


(*) The basic observation is : if the average server closes the connection within 

Re: [tomcat] 01/01: Tag 9.0.23

2019-08-14 Thread Rainer Jung

Hi there,

this commit introduced a BOM at the beginning of the changelog.xml file, 
which leads to a checkstyle validation failure during building 9.0.23 
(when validation is actiive).


The BOM isn't shown in the below mail, but one can see the leading ef 
bb bf wit any binary editor. I first thought the failure was due to the 
checkstyle update, but it is just the BOM.


That's no functional problem, but people trying to build 9.0.23 with 
validation on will fail and wonder. Not sure whether that warrants a 
retag. I can see the BOM in the 8.5.44 file as well.


Regards,

Rainer

Am 14.08.2019 um 13:10 schrieb ma...@apache.org:

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

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

commit bd48c597e3cb280d73d9c9279babcaf75b6879c0
Author: Mark Thomas 
AuthorDate: Wed Aug 14 12:10:06 2019 +0100

 Tag 9.0.23
---
  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 14ef092..3146ccb 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=9
  version.minor=0
  version.build=23
  version.patch=0
-version.suffix=-dev
+version.suffix=
  
  # - Build control flags -

  # Note enabling validation uses Checkstyle which is LGPL licensed
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0cbf970..15646db 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



[CONF] Apache Tomcat > All about bugs

2019-08-14 Thread Timothy A. Funk (Confluence)
Title: Message Title



 
 
 
There's 1 new edit on this page 
 
 
 
 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
All about bugs 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

 
 
 
 
Timothy A. Funk edited this page 
 
 
  
 
 

 
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
Here's the version comment 
 
 
 
 
 
 
 
 
 
 
 
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 

 
 
 
 
Timothy A. Funk edited at 05:06 PM 
 
 
  
 
 

 
 
 
 
 
 
 
 
 Link cleanup  
 
 
  
 
 
  
 
 

 
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Here's what changed: 
 
 
 
 
 
 
 
 
 
 
 ... If you think you found a bug, please first read read  this page this page. Questions 
 
 I have a bug, what do I do?  
 Why does feature ABC work in Servlet Container XYZ but not in Tomcat?  
 I submitted a bug, why is it ignored?  
 What does it mean to contact the user list?  
 ... There could be a good chance that the other servlet container could be implementing the spec wrong. For help, please consult the Tomcat user list.   
 
 
 
 Anchor 
 
 
 
 
 
 
 
 
 
Q3 
 
 
 
Q3 
 
 
  
 
 
 I submitted a bug, why is it ignored?  ...  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Go to page history 
 
 
  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
View page 
 
 
  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
Stop watching space
• 
 
 
 
 
 
 
Manage notifications 
 
 
 
 
 
 
 
 
 
 
  
 
 
This message was sent by Atlassian Confluence 6.15.2  
 
 
  
 
 
 
 
 
 
 
 
 




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

2019-08-14 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 0424263  Remove unnecessary code
0424263 is described below

commit 0424263b9109c79a43c5e6b9d70a16d4f3fad872
Author: Mark Thomas 
AuthorDate: Wed Aug 14 17:47:08 2019 +0100

Remove unnecessary code

All currently supported versions of Windows support large pollsets
---
 java/org/apache/tomcat/util/net/AprEndpoint.java | 14 ++
 webapps/docs/changelog.xml   |  5 +
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java 
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index ba54c1d..4d8fd25 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -2161,25 +2161,15 @@ public class AprEndpoint extends AbstractEndpoint 
{
 private volatile boolean sendfileRunning = true;
 
 /**
- * Create the sendfile poller. With some versions of APR, the maximum
- * poller size will be 62 (recompiling APR is necessary to remove this
- * limitation).
+ * Create the sendfile poller.
  */
 protected void init() {
 pool = Pool.create(serverSockPool);
 int size = sendfileSize;
 if (size <= 0) {
-size = (OS.IS_WIN32 || OS.IS_WIN64) ? (1 * 1024) : (16 * 1024);
+size = 16 * 1024;
 }
 sendfilePollset = allocatePoller(size, pool, getSoTimeout());
-if (sendfilePollset == 0 && size > 1024) {
-size = 1024;
-sendfilePollset = allocatePoller(size, pool, getSoTimeout());
-}
-if (sendfilePollset == 0) {
-size = 62;
-sendfilePollset = allocatePoller(size, pool, getSoTimeout());
-}
 desc = new long[size * 2];
 sendfileData = new HashMap(size);
 addS = new ArrayList();
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7c98806..f49f6d2 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,11 @@
 63578: Improve handling of invalid requests so that 400
 responses are returned to the client rather than 500 responses. (markt)
   
+  
+Remove the code in the sendfile poller that ensured smaller pollsets
+were used with older, no longer supported versions of Windows that
+could not support larger pollsets. (markt)
+  
 
   
   


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



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

2019-08-14 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 d8f6235  Remove unnecessary code
d8f6235 is described below

commit d8f62357bf2f34c375702f0f44f083abb222c61e
Author: Mark Thomas 
AuthorDate: Wed Aug 14 17:47:08 2019 +0100

Remove unnecessary code

All currently supported versions of Windows support large pollsets
---
 java/org/apache/tomcat/util/net/AprEndpoint.java | 14 ++
 webapps/docs/changelog.xml   |  9 +
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java 
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index b0a14bf..4c1ca49 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -1790,25 +1790,15 @@ public class AprEndpoint extends AbstractEndpoint 
implements SNICallBack {
 private volatile boolean sendfileRunning = true;
 
 /**
- * Create the sendfile poller. With some versions of APR, the maximum
- * poller size will be 62 (recompiling APR is necessary to remove this
- * limitation).
+ * Create the sendfile poller.
  */
 protected void init() {
 pool = Pool.create(serverSockPool);
 int size = sendfileSize;
 if (size <= 0) {
-size = (OS.IS_WIN32 || OS.IS_WIN64) ? (1 * 1024) : (16 * 1024);
+size = 16 * 1024;
 }
 sendfilePollset = allocatePoller(size, pool, 
getConnectionTimeout());
-if (sendfilePollset == 0 && size > 1024) {
-size = 1024;
-sendfilePollset = allocatePoller(size, pool, 
getConnectionTimeout());
-}
-if (sendfilePollset == 0) {
-size = 62;
-sendfilePollset = allocatePoller(size, pool, 
getConnectionTimeout());
-}
 desc = new long[size * 2];
 sendfileData = new HashMap<>(size);
 addS = new ArrayList<>();
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0175601..775d1d7 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -45,6 +45,15 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Remove the code in the sendfile poller that ensured smaller pollsets
+were used with older, no longer supported versions of Windows that
+could not support larger pollsets. (markt)
+  
+
+  
 
 
   


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



[tomcat] branch master updated: Remove unnecessary code

2019-08-14 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 93b8894  Remove unnecessary code
93b8894 is described below

commit 93b8894360a93c41f5c5afc406924b70a5d8c18f
Author: Mark Thomas 
AuthorDate: Wed Aug 14 17:47:08 2019 +0100

Remove unnecessary code

All currently supported versions of Windows support large pollsets
---
 java/org/apache/tomcat/util/net/AprEndpoint.java | 14 ++
 webapps/docs/changelog.xml   |  9 +
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java 
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 2075783..46c7047 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -1639,25 +1639,15 @@ public class AprEndpoint extends 
AbstractEndpoint implements SNICallB
 private volatile boolean sendfileRunning = true;
 
 /**
- * Create the sendfile poller. With some versions of APR, the maximum
- * poller size will be 62 (recompiling APR is necessary to remove this
- * limitation).
+ * Create the sendfile poller.
  */
 protected void init() {
 pool = Pool.create(serverSockPool);
 int size = sendfileSize;
 if (size <= 0) {
-size = (OS.IS_WIN32 || OS.IS_WIN64) ? (1 * 1024) : (16 * 1024);
+size = 16 * 1024;
 }
 sendfilePollset = allocatePoller(size, pool, 
getConnectionTimeout());
-if (sendfilePollset == 0 && size > 1024) {
-size = 1024;
-sendfilePollset = allocatePoller(size, pool, 
getConnectionTimeout());
-}
-if (sendfilePollset == 0) {
-size = 62;
-sendfilePollset = allocatePoller(size, pool, 
getConnectionTimeout());
-}
 desc = new long[size * 2];
 sendfileData = new HashMap<>(size);
 addS = new ArrayList<>();
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 678a821..79c3667 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -45,6 +45,15 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Remove the code in the sendfile poller that ensured smaller pollsets
+were used with older, no longer supported versions of Windows that
+could not support larger pollsets. (markt)
+  
+
+  
 
 
   


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

2019-08-14 Thread Mark Thomas
The proposed Apache Tomcat 8.5.44 release is now available for voting.

The major changes compared to the 8.5.43 release are:

- Expand the HTTP/2 excessive overhead protection to cover various forms
  of abusive client behaviour and close the connection if any such
  behaviour is detected.

- Security improvements to the Windows installer including a change in
  the default user from Local System to Local Service.

- Improve handling of invalid requests so that 400 responses are
  returned to the client rather than 500 responses.

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

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

The tag is:
https://github.com/apache/tomcat/tree/8.5.44
593f3797c2de532988387692bb5f9a283c6182c5

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

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



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

2019-08-14 Thread markt
Author: markt
Date: Wed Aug 14 16:34:10 2019
New Revision: 35245

Log:
Upload 8.5.44 for voting

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

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

Added: dev/tomcat/tomcat-8/v8.5.44/KEYS
==
--- dev/tomcat/tomcat-8/v8.5.44/KEYS (added)
+++ dev/tomcat/tomcat-8/v8.5.44/KEYS Wed Aug 14 16:34:10 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: r35245 [2/2] - in /dev/tomcat/tomcat-8/v8.5.44: ./ bin/ bin/embed/ bin/extras/ src/

2019-08-14 Thread markt
Added: dev/tomcat/tomcat-8/v8.5.44/src/apache-tomcat-8.5.44-src.zip.asc
==
--- dev/tomcat/tomcat-8/v8.5.44/src/apache-tomcat-8.5.44-src.zip.asc (added)
+++ dev/tomcat/tomcat-8/v8.5.44/src/apache-tomcat-8.5.44-src.zip.asc Wed Aug 14 
16:34:10 2019
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAl1UMukACgkQEMAcWi9g
+WedbtBAAu0Y0JFEWS6E8av5rrLQLdBmrzcMXYEjY/d/ZHUk/QmYkex3CK70v9Tlv
+8SDfMJZl/CHOQN+NhUrdeoTPswYL+U9E1DNuSSyRLIUWqcCV2OubzV2bB07w9qub
+KcbIzZWCeiZk7FAzwGdrLFGA/y4/mx829p1wyasWh4gDWBjMqnjypCqjgdcWu63N
+bg9qgcu0oZwn+qJ6+Os8bisp90LQbDdiCvhwcXuvKEJSHx+tsQ0JNmkeHel+P5Rj
+vnWTW73TPaHSVT7xzYTKfv68OCeeWUpxTJb41cnvMNG1OYcwpXWLubvn+KkJTXbG
+AczBS1CL6chKOykPXMbj6MEKM9oYTc9U2qZxBmQYOO1GbqgvgnuEAoNnghS9EoTA
+EzTOG3PB7OFg2g9U9HBE+N3X4/A5Z6+vBMo9LAStR6SFoO++9etJT0AA2RNzY3n5
+At7AbcrCu6VMCLn27X2XrVn1sq8+AQIbaHWmrb/jie/2lVukACygnZUj1gOZBAC1
+y47zj+sO766I3si+7yy65dFcY7VHDzcBg30Q49GHczNfZYW105JTYccQ7aZbSraq
+lkUYU0zIQbKNM7JwrFBaPeW0b7HuKHrzAfAQVMsEAkE+FSCeyC9/aiTYO7cm+hKO
+Nti0+e8MI32yP25j0ow1GvCrHEJMOXmPLG4igU01z3l2vP75peU=
+=u/Ca
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-8/v8.5.44/src/apache-tomcat-8.5.44-src.zip.sha512
==
--- dev/tomcat/tomcat-8/v8.5.44/src/apache-tomcat-8.5.44-src.zip.sha512 (added)
+++ dev/tomcat/tomcat-8/v8.5.44/src/apache-tomcat-8.5.44-src.zip.sha512 Wed Aug 
14 16:34:10 2019
@@ -0,0 +1 @@
+2bfcc0055daee25de7e3d34a2851431c3dc9a852a677e3bb18bb0928443d4f0ab26e69aed408eb4dbac78054816b258bdfff8ed5973e3a6a6e553b35c26251c6
 *apache-tomcat-8.5.44-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



Nexus: Staging Completed

2019-08-14 Thread Nexus Repository Manager
Message from: https://repository.apache.orgDeployer properties:"userAgent" = "maven-artifact/2.2.1 (Java 1.8.0_212; Windows 7 6.1)""userId" = "markt""ip" = "109.148.147.127"Details:The following artifacts have been staged/org/apache/tomcat/tomcat-jni/8.5.44/tomcat-jni-8.5.44.jar.asc(SHA1: 3fc14ca22ee72f894e0b65fedc6474b95c8ce034)/org/apache/tomcat/tomcat-jni/8.5.44/tomcat-jni-8.5.44-sources.jar.asc(SHA1: 88e160f5a6f1b129d18d34b443e9303a02164b42)/org/apache/tomcat/tomcat-jni/8.5.44/tomcat-jni-8.5.44-sources.jar(SHA1: 60e2521be2ada1e10ce57ed0b7d49b55d19fba99)/org/apache/tomcat/tomcat-jni/8.5.44/tomcat-jni-8.5.44.pom(SHA1: 98957ac879396e6af84aca8e23b101388d092c44)/org/apache/tomcat/tomcat-jni/8.5.44/tomcat-jni-8.5.44.pom.asc(SHA1: 1546f53ae9e7ec64496f534495d2b2ca01b1997b)/org/apache/tomcat/tomcat-jni/8.5.44/tomcat-jni-8.5.44.jar(SHA1: aa63e20137ce61039f3e92e667ff9022c57a7266)/org/apache/tomcat/tomcat-juli/8.5.44/tomcat-juli-8.5.44.pom(SHA1: b8e60b8cc7e75c1073f4352946cc07bb1758f0d6)/org/apache/tomcat/tomcat-juli/8.5.44/tomcat-juli-8.5.44-sources.jar.asc(SHA1: 6b3e41c9690d7f8e89d9fb1c3cedaf59bde0d80d)/org/apache/tomcat/tomcat-juli/8.5.44/tomcat-juli-8.5.44.jar(SHA1: dd315baf1aeb747b498b3d2e284db46187c2cdb0)/org/apache/tomcat/tomcat-juli/8.5.44/tomcat-juli-8.5.44.pom.asc(SHA1: ffe01846f9a2dd9b4b77c7fa84b7c8e1f0603006)/org/apache/tomcat/tomcat-juli/8.5.44/tomcat-juli-8.5.44.jar.asc(SHA1: 2ee166137a862aceade583794e03774e9b986337)/org/apache/tomcat/tomcat-juli/8.5.44/tomcat-juli-8.5.44-sources.jar(SHA1: 6f1dca0d14054669e46042f990b074ef35f16df9)/org/apache/tomcat/tomcat-util/8.5.44/tomcat-util-8.5.44-sources.jar.asc(SHA1: 8236ab9f60c89c8b2db1f92a414f64964010e470)/org/apache/tomcat/tomcat-util/8.5.44/tomcat-util-8.5.44.jar(SHA1: 3506b94724203352852849dbea32091f657df83a)/org/apache/tomcat/tomcat-util/8.5.44/tomcat-util-8.5.44.pom(SHA1: 26f5b6a52b1c6b8762ac4e1ddfc6fe351804c92c)/org/apache/tomcat/tomcat-util/8.5.44/tomcat-util-8.5.44.jar.asc(SHA1: ed628b373061c81adc6486d90358c1bcf3f22ee2)/org/apache/tomcat/tomcat-util/8.5.44/tomcat-util-8.5.44.pom.asc(SHA1: 118747836b2ece21d8cc154334d34de74383e75f)/org/apache/tomcat/tomcat-util/8.5.44/tomcat-util-8.5.44-sources.jar(SHA1: afccddd3841a45d1f3004e11c5369aef57ae20e7)/org/apache/tomcat/tomcat-catalina/8.5.44/tomcat-catalina-8.5.44-sources.jar.asc(SHA1: f518db791aab71f7e228f8900cd2dc0b4871deeb)/org/apache/tomcat/tomcat-catalina/8.5.44/tomcat-catalina-8.5.44.jar(SHA1: 874f4e3a5fc569f5b38b6c2d2fccb267fbe9e5c9)/org/apache/tomcat/tomcat-catalina/8.5.44/tomcat-catalina-8.5.44.pom.asc(SHA1: 748592e3a84b891895d4a8b19958dbc477b2e527)/org/apache/tomcat/tomcat-catalina/8.5.44/tomcat-catalina-8.5.44-sources.jar(SHA1: 6c94a16a49e51a362ad649e3cf06e25ad2a7cdfe)/org/apache/tomcat/tomcat-catalina/8.5.44/tomcat-catalina-8.5.44.jar.asc(SHA1: 36a10bf3c2aff1e74e7a43ca9baea76b868ed8e3)/org/apache/tomcat/tomcat-catalina/8.5.44/tomcat-catalina-8.5.44.pom(SHA1: 1e857ebbaf71592b60ac8d1cdce16e9e934af9c3)/org/apache/tomcat/tomcat-catalina-ws/8.5.44/tomcat-catalina-ws-8.5.44.jar(SHA1: 18089632680b1c554a9607ac18df5da40062315a)/org/apache/tomcat/tomcat-catalina-ws/8.5.44/tomcat-catalina-ws-8.5.44.jar.asc(SHA1: a6e01afdf2c4c4792f6113eacd0d3159ca95ab10)/org/apache/tomcat/tomcat-catalina-ws/8.5.44/tomcat-catalina-ws-8.5.44.pom.asc(SHA1: b9655778082b6217ffcd07b925df9c653b87f240)/org/apache/tomcat/tomcat-catalina-ws/8.5.44/tomcat-catalina-ws-8.5.44-sources.jar.asc(SHA1: f737f674df5f1f68e20421bb6ff40d931d702aad)/org/apache/tomcat/tomcat-catalina-ws/8.5.44/tomcat-catalina-ws-8.5.44-sources.jar(SHA1: ed2c3a91316694b5c1eddac720df0aa4117828bb)/org/apache/tomcat/tomcat-catalina-ws/8.5.44/tomcat-catalina-ws-8.5.44.pom(SHA1: 96e3baf14f0409578612408a9c93e9af6f13f81c)/org/apache/tomcat/tomcat-i18n-fr/8.5.44/tomcat-i18n-fr-8.5.44.pom.asc(SHA1: 5776bfde305ad87c4ef794d1f652ae0537252577)/org/apache/tomcat/tomcat-i18n-fr/8.5.44/tomcat-i18n-fr-8.5.44.pom(SHA1: 0f108565fd23113aad7ac5e5f21d37237d8793b4)/org/apache/tomcat/tomcat-i18n-fr/8.5.44/tomcat-i18n-fr-8.5.44.jar.asc(SHA1: c00c99f07dbda17e4c6c14ecd00cdcd1254b9973)/org/apache/tomcat/tomcat-i18n-fr/8.5.44/tomcat-i18n-fr-8.5.44.jar(SHA1: a21b7d03044d7848db168c38345280377a8b6282)/org/apache/tomcat/tomcat-jdbc/8.5.44/tomcat-jdbc-8.5.44-sources.jar.asc(SHA1: b83ffec4e23aa6ba90cc5c344a5adb4056f7c6e2)/org/apache/tomcat/tomcat-jdbc/8.5.44/tomcat-jdbc-8.5.44.jar.asc(SHA1: 91052a84ae3fa508b6046d7ac3b02f7550f411b4)/org/apache/tomcat/tomcat-jdbc/8.5.44/tomcat-jdbc-8.5.44.pom.asc(SHA1: bd2cc7b30dacb1df6745980975c8dca70765c6b8)/org/apache/tomcat/tomcat-jdbc/8.5.44/tomcat-jdbc-8.5.44.jar(SHA1: e5f9d41415adfa45ccd4f4921b83e49c44cf73fd)/org/apache/tomcat/tomcat-jdbc/8.5.44/tomcat-jdbc-8.5.44-sources.jar(SHA1: f105b31da82c86033988f2dfa05c399c7dd9eab3)/org/apache/tomcat/tomcat-jdbc/8.5.44/tomcat-jdbc-8.5.44.pom(SHA1: e386af7df424892b5f07dd54ec0bf1299549b046)/org/apache/tomcat/embed/tomcat-embed-core/8.5.44/tomcat-embed-core-8.5.44.pom(SHA1: 

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

2019-08-14 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 f50d654  Increment version number for next development cycle
f50d654 is described below

commit f50d654795d58218229885f8e7b49809f8d22eee
Author: Mark Thomas 
AuthorDate: Wed Aug 14 17:24:39 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 78f9231..e067b36 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=8
 version.minor=5
-version.build=44
+version.build=45
 version.patch=0
 version.suffix=-dev
 
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 3c020b3..66a9337 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.44
+maven.asf.release.deploy.version=8.5.45
 
 #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 01b3b9b..0175601 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



Re: [VOTE] Release Apache Tomcat 9.0.23

2019-08-14 Thread Mark Thomas
On 14/08/2019 12:57, Mark Thomas wrote:



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

The unit tests pass on Windows, Linux and MacOS for NIO, NIO2 and
APR/Native with Tomcat Native 1.2.23

Mark

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

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

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

commit 593f3797c2de532988387692bb5f9a283c6182c5
Author: Mark Thomas 
AuthorDate: Wed Aug 14 17:04:52 2019 +0100

Tag 8.5.44
---
 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 78f9231..efca0ba 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=8
 version.minor=5
 version.build=44
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Build control flags -
 # Note enabling validation uses Checkstyle which is LGPL licensed
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 01b3b9b..275a3c0 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



[tomcat] tag 8.5.44 created (now 593f379)

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

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


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

 new 593f379  Tag 8.5.44

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



Re: [VOTE] Release Apache Tomcat 9.0.23

2019-08-14 Thread Martin Grigorov
Hi,

On Wed, Aug 14, 2019 at 2:57 PM Mark Thomas  wrote:

> The proposed Apache Tomcat 9.0.23 release is now available for voting.
>
> The major changes compared to the 9.0.22 release are:
>
> - Various improvements to the Kubernetes cluster membership service
>
> - Expand the HTTP/2 excessive overhead protection to cover various forms
>   of abusive client behaviour and close the connection if any such
>   behaviour is detected.
>
> - Security improvements to the Windows installer including a change in
>   the default user from Local System to Local Service.
>
> 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.23/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1225/
> The tag is:
> https://github.com/apache/tomcat/tree/9.0.23
> bd48c597e3cb280d73d9c9279babcaf75b6879c0
>
> The proposed 9.0.23 release is:
> [ ] Broken - do not release
> [ X ] Stable - go ahead and release as 9.0.23
>
>
Regards,
Martin


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


[GitHub] [tomcat] KangZhiDong opened a new pull request #190: Fix typo for prefect

2019-08-14 Thread GitBox
KangZhiDong opened a new pull request #190: Fix typo for prefect
URL: https://github.com/apache/tomcat/pull/190
 
 
   Fix typo for prefect


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 #189: Additional translations of Chinese

2019-08-14 Thread GitBox
markt-asf commented on issue #189: Additional translations of Chinese
URL: https://github.com/apache/tomcat/pull/189#issuecomment-521241008
 
 
   I've completed the first two bullets for 9.0.x->8.5.x. There was only one 
change required to fix a key that had been added out of order.


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] branch 8.5.x updated: The digital signature for the Windows installer now uses SHA-256.

2019-08-14 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 f6b4f64  The digital signature for the Windows installer now uses 
SHA-256.
f6b4f64 is described below

commit f6b4f649d08102b4c61b4f10f102c83b4508eedc
Author: Mark Thomas 
AuthorDate: Wed Aug 14 12:55:59 2019 +0100

The digital signature for the Windows installer now uses SHA-256.
---
 webapps/docs/changelog.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 72af857..01b3b9b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -188,6 +188,10 @@
 building with Java 7. (markt)
   
   
+62696: The digital signature for the Windows installer now
+uses SHA-256 for hashes. (markt)
+  
+  
 63310: Update to Commons Daemon 1.2.0. This provides 
improved
 support for Java 11. This also changes the user configured by the
 Windows installer for the Windows service from Local 
System


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

2019-08-14 Thread Mark Thomas
The proposed Apache Tomcat 9.0.23 release is now available for voting.

The major changes compared to the 9.0.22 release are:

- Various improvements to the Kubernetes cluster membership service

- Expand the HTTP/2 excessive overhead protection to cover various forms
  of abusive client behaviour and close the connection if any such
  behaviour is detected.

- Security improvements to the Windows installer including a change in
  the default user from Local System to Local Service.

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

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

-
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-08-14 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 f3b4c3aef417439d3c3b75c581997c4463fbd46e
Author: Mark Thomas 
AuthorDate: Wed Aug 14 12:32:44 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 14ef092..ad3c98d 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=9
 version.minor=0
-version.build=23
+version.build=24
 version.patch=0
 version.suffix=-dev
 
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 29f0d5b..0ff148f 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.23
+maven.asf.release.deploy.version=9.0.24
 
 #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 0cbf970..2c7feab 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -44,7 +44,9 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
+
+
   
 
   


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



[tomcat] branch master updated (050c6bd -> 8a519de)

2019-08-14 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 050c6bd  Add a tool for back-porting English translations
 new f3b4c3a  Increment version for next dev cycle
 new 8a519de  Add hash update now it is confirmed.

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   | 8 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)


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



[tomcat] 02/02: Add hash update now it is confirmed.

2019-08-14 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 8a519de7a408e2947635efac029355bdc35966d4
Author: Mark Thomas 
AuthorDate: Wed Aug 14 12:53:59 2019 +0100

Add hash update now it is confirmed.

This entry was added after the 9.0.23 tag but the fix is in 9.0.23 so
the location of this entry is correct.
---
 webapps/docs/changelog.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2c7feab..678a821 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -211,6 +211,10 @@
 Update Checkstyle to 8.22. (markt)
   
   
+62696: The digital signature for the Windows installer now
+uses SHA-256 for hashes. (markt)
+  
+  
 63310: Update to Commons Daemon 1.2.0. This provides 
improved
 support for Java 11. This also changes the user configured by the
 Windows installer for the Windows service from Local 
System


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



svn commit: r35240 - in /dev/tomcat/tomcat-9/v9.0.23: ./ bin/ bin/embed/ src/

2019-08-14 Thread markt
Author: markt
Date: Wed Aug 14 11:52:02 2019
New Revision: 35240

Log:
Upload 9.0.23 for voting

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

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

Added: dev/tomcat/tomcat-9/v9.0.23/KEYS
==
--- dev/tomcat/tomcat-9/v9.0.23/KEYS (added)
+++ dev/tomcat/tomcat-9/v9.0.23/KEYS Wed Aug 14 11:52:02 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

[Bug 62696] Consider use of sha256 for signing of .exe files of Tomcat installer.

2019-08-14 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62696

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #7 from Mark Thomas  ---
The signing service has been updated to use SHA-256 for all Windows .exe
signings.

The updated service will be used for 9.0.23 onwards and 8.5.44 onwards.

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



Nexus: Staging Completed

2019-08-14 Thread Nexus Repository Manager
Message from: https://repository.apache.orgDeployer properties:"userAgent" = "maven-artifact/2.2.1 (Java 1.8.0_212; Windows 7 6.1)""userId" = "markt""ip" = "109.148.147.127"Details:The following artifacts have been staged/org/apache/tomcat/tomcat-i18n-de/9.0.23/tomcat-i18n-de-9.0.23.jar(SHA1: e03ceb89666493d688b5b77c8051bd6a6a3c8d94)/org/apache/tomcat/tomcat-i18n-de/9.0.23/tomcat-i18n-de-9.0.23.jar.asc(SHA1: 4b3865538084eca773958829a21217aa0d740b51)/org/apache/tomcat/tomcat-i18n-de/9.0.23/tomcat-i18n-de-9.0.23.pom.asc(SHA1: 7dfda492d0392700d83b224fb7b43c9db6e11a74)/org/apache/tomcat/tomcat-i18n-de/9.0.23/tomcat-i18n-de-9.0.23.pom(SHA1: 09d6bc6692cdbe72c826f0fb0d8fabf072e2dcf3)/org/apache/tomcat/tomcat-jni/9.0.23/tomcat-jni-9.0.23.jar(SHA1: c4c2a1d82d5315e0923986b766b6ff8ed64880ac)/org/apache/tomcat/tomcat-jni/9.0.23/tomcat-jni-9.0.23.jar.asc(SHA1: 8a9d606de06b5fba6bc886b4e1dd189ff194ec8b)/org/apache/tomcat/tomcat-jni/9.0.23/tomcat-jni-9.0.23-sources.jar(SHA1: 04ad9760ed578a29853fbca9b2dfee400caded86)/org/apache/tomcat/tomcat-jni/9.0.23/tomcat-jni-9.0.23.pom(SHA1: 51e7b52864145fecce216f49e1fad94a6fd96fe2)/org/apache/tomcat/tomcat-jni/9.0.23/tomcat-jni-9.0.23.pom.asc(SHA1: c8445f094ea8795f50b64356ce8c63159f1530f2)/org/apache/tomcat/tomcat-jni/9.0.23/tomcat-jni-9.0.23-sources.jar.asc(SHA1: 6dce23239e675dd4193319e840863accf59a658d)/org/apache/tomcat/tomcat-juli/9.0.23/tomcat-juli-9.0.23-sources.jar.asc(SHA1: 1c6f187371afe45e45fd70bd6c18abd9f2b00ad3)/org/apache/tomcat/tomcat-juli/9.0.23/tomcat-juli-9.0.23-sources.jar(SHA1: 14470a15f65e5a351c326734b1b2169c8fcebe85)/org/apache/tomcat/tomcat-juli/9.0.23/tomcat-juli-9.0.23.pom(SHA1: b430df77de41fd242065700cb56a759114a09ad8)/org/apache/tomcat/tomcat-juli/9.0.23/tomcat-juli-9.0.23.pom.asc(SHA1: 2b7052d74d1f40fdbd1c2c0f32568a28d383c7bf)/org/apache/tomcat/tomcat-juli/9.0.23/tomcat-juli-9.0.23.jar(SHA1: 90339df796e4f7c35f22e46ce2fdf2736bce1868)/org/apache/tomcat/tomcat-juli/9.0.23/tomcat-juli-9.0.23.jar.asc(SHA1: 0276c8f152ac8ea266b749ef4b2248c5532db05a)/org/apache/tomcat/tomcat-util/9.0.23/tomcat-util-9.0.23-sources.jar(SHA1: 685df9b95701179573ee49419f314b23c6c0f629)/org/apache/tomcat/tomcat-util/9.0.23/tomcat-util-9.0.23.pom(SHA1: ab52096fd2fffa1adf739b91e9295a30db1951aa)/org/apache/tomcat/tomcat-util/9.0.23/tomcat-util-9.0.23.pom.asc(SHA1: 2166acd40de914818d12654736de9398f135f4fb)/org/apache/tomcat/tomcat-util/9.0.23/tomcat-util-9.0.23.jar.asc(SHA1: b56870f53265881c0cc06b64246c01b827a321fa)/org/apache/tomcat/tomcat-util/9.0.23/tomcat-util-9.0.23-sources.jar.asc(SHA1: 351492e0f7693a788f3283980abcab0a2d3c2e5b)/org/apache/tomcat/tomcat-util/9.0.23/tomcat-util-9.0.23.jar(SHA1: 265c0d1f03b90d6596100a244b976d680c738d48)/org/apache/tomcat/tomcat-catalina/9.0.23/tomcat-catalina-9.0.23.pom.asc(SHA1: 298ca549724727deb6258766b4a6ad1b6e6c410d)/org/apache/tomcat/tomcat-catalina/9.0.23/tomcat-catalina-9.0.23-sources.jar(SHA1: 0bb35cb89deda9e54be89850d3a9b52bd30a0fe8)/org/apache/tomcat/tomcat-catalina/9.0.23/tomcat-catalina-9.0.23.pom(SHA1: de9fe487a18709ce90c2c45641628cd605a241c5)/org/apache/tomcat/tomcat-catalina/9.0.23/tomcat-catalina-9.0.23.jar(SHA1: 6131e560192a0d8e36a2cf2578dd1e889afe9680)/org/apache/tomcat/tomcat-catalina/9.0.23/tomcat-catalina-9.0.23.jar.asc(SHA1: b96ee15742a6b8e21c6d0c32c052720660711451)/org/apache/tomcat/tomcat-catalina/9.0.23/tomcat-catalina-9.0.23-sources.jar.asc(SHA1: 3a462bcffb1f64b41b0cf91e6f77c7a710386f69)/org/apache/tomcat/tomcat-i18n-fr/9.0.23/tomcat-i18n-fr-9.0.23.jar(SHA1: 4f79ab0032cf146d5927231a24eea108a37aa537)/org/apache/tomcat/tomcat-i18n-fr/9.0.23/tomcat-i18n-fr-9.0.23.jar.asc(SHA1: 4f3b303eb98c431c6b3976fc2ea8d72762b352f9)/org/apache/tomcat/tomcat-i18n-fr/9.0.23/tomcat-i18n-fr-9.0.23.pom.asc(SHA1: 699ee7d5fd37bed94d310b156db5b49b85792c77)/org/apache/tomcat/tomcat-i18n-fr/9.0.23/tomcat-i18n-fr-9.0.23.pom(SHA1: 05f550878ebdf6cd1a97e665759192157a64e822)/org/apache/tomcat/tomcat-i18n-cs/9.0.23/tomcat-i18n-cs-9.0.23.pom(SHA1: 22cd6825dd8a8930a50f64275ab2978a8233a48e)/org/apache/tomcat/tomcat-i18n-cs/9.0.23/tomcat-i18n-cs-9.0.23.jar.asc(SHA1: 275f60db29baa49f82896b4c6e8e2a488adc98f7)/org/apache/tomcat/tomcat-i18n-cs/9.0.23/tomcat-i18n-cs-9.0.23.pom.asc(SHA1: d8ae34f5523ec0c4e7d48cb315a6e3161a504390)/org/apache/tomcat/tomcat-i18n-cs/9.0.23/tomcat-i18n-cs-9.0.23.jar(SHA1: 5456deeb66f0ed313cff14c0537bddc5206d9e59)/org/apache/tomcat/tomcat-jdbc/9.0.23/tomcat-jdbc-9.0.23.jar.asc(SHA1: 7c3f88e37ee5b222edee08dd1f54044523f39845)/org/apache/tomcat/tomcat-jdbc/9.0.23/tomcat-jdbc-9.0.23.pom.asc(SHA1: a80b55b0fb4b084fb4590364bef4d148fd777b63)/org/apache/tomcat/tomcat-jdbc/9.0.23/tomcat-jdbc-9.0.23-sources.jar.asc(SHA1: 88de2dc692e510b0250bae3e9658430d53a8a463)/org/apache/tomcat/tomcat-jdbc/9.0.23/tomcat-jdbc-9.0.23-sources.jar(SHA1: 745baf69009f027fd21b0d12ca56bbd6900bdfc2)/org/apache/tomcat/tomcat-jdbc/9.0.23/tomcat-jdbc-9.0.23.jar(SHA1: c51c517ea2333d38a969011208775090e81756c7)/org/apache/tomcat/tomcat-jdbc/9.0.23/tomcat-jdbc-9.0.23.pom(SHA1: 

svn commit: r35239 - in /release/tomcat: tomcat-8/v8.5.41/ tomcat-8/v8.5.42/ tomcat-9/v9.0.20/ tomcat-9/v9.0.21/

2019-08-14 Thread markt
Author: markt
Date: Wed Aug 14 11:36:34 2019
New Revision: 35239

Log:
Remove old versions from mirror network

Removed:
release/tomcat/tomcat-8/v8.5.41/
release/tomcat/tomcat-8/v8.5.42/
release/tomcat/tomcat-9/v9.0.20/
release/tomcat/tomcat-9/v9.0.21/


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



[tomcat] tag 9.0.23 created (now bd48c59)

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

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


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

 new bd48c59  Tag 9.0.23

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

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

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

commit bd48c597e3cb280d73d9c9279babcaf75b6879c0
Author: Mark Thomas 
AuthorDate: Wed Aug 14 12:10:06 2019 +0100

Tag 9.0.23
---
 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 14ef092..3146ccb 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=9
 version.minor=0
 version.build=23
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Build control flags -
 # Note enabling validation uses Checkstyle which is LGPL licensed
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0cbf970..15646db 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



[tomcat] branch 8.5.x updated: Fix alphabetical order

2019-08-14 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 c9ab761  Fix alphabetical order
c9ab761 is described below

commit c9ab7618438ffafae250334203ac61134c8565d6
Author: Mark Thomas 
AuthorDate: Wed Aug 14 11:12:40 2019 +0100

Fix alphabetical order
---
 java/org/apache/catalina/realm/LocalStrings.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/realm/LocalStrings.properties 
b/java/org/apache/catalina/realm/LocalStrings.properties
index 5a8aee3..09d0408 100644
--- a/java/org/apache/catalina/realm/LocalStrings.properties
+++ b/java/org/apache/catalina/realm/LocalStrings.properties
@@ -91,8 +91,8 @@ realmBase.cannotGetRoles=Cannot get roles from principal [{0}]
 realmBase.createUsernameRetriever.ClassCastException=Class [{0}] is not an 
X509UsernameRetriever.
 realmBase.createUsernameRetriever.newInstance=Cannot create object of type 
[{0}].
 realmBase.credentialHandler.customCredentialHandler=Unable to set the property 
[{0}] to value [{1}] as a custom CredentialHandler has been configured
-realmBase.delegatedCredentialFail=Unable to obtain delegated credential for 
user [{0}]
 realmBase.credentialNotDelegated=Credential for user [{0}] has not been 
delegated though storing was requested
+realmBase.delegatedCredentialFail=Unable to obtain delegated credential for 
user [{0}]
 realmBase.digest=Error digesting user credentials
 realmBase.forbidden=Access to the requested resource has been denied
 realmBase.gotX509Username=Got user name from X509 certificate: [{0}]


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



[tomcat] branch master updated (8a81e7a -> 050c6bd)

2019-08-14 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 8a81e7a  Fix test observed to fail consistently with NIO2 + Win + Java 
8u212
 new 21aa776  Refactor i18n export tool to make re-use easier.
 new 75dc80b  More refactoring for re-use
 new 050c6bd  Add a tool for back-porting English translations

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:
 .../buildutil/translate/BackportEnglish.java   | 71 +
 .../apache/tomcat/buildutil/translate/Export.java  | 93 ++
 .../apache/tomcat/buildutil/translate/Utils.java   | 72 +
 3 files changed, 148 insertions(+), 88 deletions(-)
 create mode 100644 
java/org/apache/tomcat/buildutil/translate/BackportEnglish.java


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



[tomcat] 02/03: More refactoring for re-use

2019-08-14 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 75dc80b2b214ed66e19363be641010e2f2422659
Author: Mark Thomas 
AuthorDate: Wed Aug 14 11:16:45 2019 +0100

More refactoring for re-use
---
 .../apache/tomcat/buildutil/translate/Export.java  | 28 +++--
 .../apache/tomcat/buildutil/translate/Utils.java   | 36 --
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/java/org/apache/tomcat/buildutil/translate/Export.java 
b/java/org/apache/tomcat/buildutil/translate/Export.java
index 2b963d1..b05ee13 100644
--- a/java/org/apache/tomcat/buildutil/translate/Export.java
+++ b/java/org/apache/tomcat/buildutil/translate/Export.java
@@ -17,12 +17,7 @@
 package org.apache.tomcat.buildutil.translate;
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
@@ -35,10 +30,11 @@ public class Export {
 
 private static final Map translations = new HashMap<>();
 
-public static void main(String... args) {
+public static void main(String... args) throws IOException {
+File root = new File(".");
 for (String dir : Constants.SEARCH_DIRS) {
-File root = new File(dir);
-Utils.processDirectory(root, translations);
+File directory = new File(dir);
+Utils.processDirectory(root, directory, translations);
 }
 
 outputTranslations();
@@ -53,21 +49,7 @@ public class Export {
 }
 
 for (Map.Entry translationEntry : 
translations.entrySet()) {
-Properties translation = translationEntry.getValue();
-
-String language = translationEntry.getKey();
-
-File out = new File(storageDir, Constants.L10N_PREFIX + language + 
Constants.L10N_SUFFIX);
-try (FileOutputStream fos = new FileOutputStream(out);
-Writer w = new OutputStreamWriter(fos, 
StandardCharsets.UTF_8)) {
-String[] keys = translation.keySet().toArray(new String[0]);
-Arrays.sort(keys);
-for (Object key : keys) {
-w.write(key + "=" + 
Utils.formatValue(translation.getProperty((String) key)) + "\n");
-}
-} catch (IOException ioe) {
-ioe.printStackTrace();
-}
+ Utils.export(translationEntry.getKey(), 
translationEntry.getValue(), storageDir);
 }
 }
 }
diff --git a/java/org/apache/tomcat/buildutil/translate/Utils.java 
b/java/org/apache/tomcat/buildutil/translate/Utils.java
index d441c35..8b69c79 100644
--- a/java/org/apache/tomcat/buildutil/translate/Utils.java
+++ b/java/org/apache/tomcat/buildutil/translate/Utils.java
@@ -18,10 +18,14 @@ package org.apache.tomcat.buildutil.translate;
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
 import java.io.Reader;
+import java.io.Writer;
 import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
 import java.util.Map;
 import java.util.Properties;
 import java.util.regex.Pattern;
@@ -73,18 +77,18 @@ public class Utils {
 }
 
 
-static void processDirectory(File dir, Map 
translations) {
+static void processDirectory(File root, File dir, Map 
translations) throws IOException {
 for (File f : dir.listFiles()) {
 if (f.isDirectory()) {
-processDirectory(f, translations);
+processDirectory(root, f, translations);
 } else if (f.isFile()) {
-processFile(f, translations);
+processFile(root, f, translations);
 }
 }
 }
 
 
-static void processFile(File f, Map translations) {
+static void processFile(File root, File f, Map 
translations) throws IOException {
 String name = f.getName();
 
 // non-l10n files
@@ -95,7 +99,7 @@ public class Utils {
 // Determine language
 String language = Utils.getLanguage(name);
 
-String keyPrefix = getKeyPrefix(f);
+String keyPrefix = getKeyPrefix(root, f);
 Properties props = Utils.load(f);
 
 // Create a Map for the language if one does not exist.
@@ -116,12 +120,26 @@ public class Utils {
 }
 
 
-static String getKeyPrefix(File f) {
-File wd = new File(".");
-String prefix = f.getParentFile().getAbsolutePath();
-prefix = prefix.substring(wd.getAbsolutePath().length() - 1);
+static String getKeyPrefix(File root, File f) throws IOException {
+String prefix = f.getParentFile().getCanonicalPath();
+  

[tomcat] 01/03: Refactor i18n export tool to make re-use easier.

2019-08-14 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 21aa776a63912e1d32d0c6e4da5ed6a7b1ac0096
Author: Mark Thomas 
AuthorDate: Wed Aug 14 10:30:49 2019 +0100

Refactor i18n export tool to make re-use easier.
---
 .../apache/tomcat/buildutil/translate/Export.java  | 69 +-
 .../apache/tomcat/buildutil/translate/Utils.java   | 54 +
 2 files changed, 56 insertions(+), 67 deletions(-)

diff --git a/java/org/apache/tomcat/buildutil/translate/Export.java 
b/java/org/apache/tomcat/buildutil/translate/Export.java
index a4d73b8..2b963d1 100644
--- a/java/org/apache/tomcat/buildutil/translate/Export.java
+++ b/java/org/apache/tomcat/buildutil/translate/Export.java
@@ -37,79 +37,14 @@ public class Export {
 
 public static void main(String... args) {
 for (String dir : Constants.SEARCH_DIRS) {
-processRoot(dir);
+File root = new File(dir);
+Utils.processDirectory(root, translations);
 }
 
 outputTranslations();
 }
 
 
-private static void processRoot(String dir) {
-// Run from within IDE so working dir is root of project.
-File root = new File(dir);
-
-// Assumes no l18n files directly in roots
-for (File f : root.listFiles()) {
-if (f.isDirectory()) {
-processDirectory(f);
-}
-}
-}
-
-
-private static void processDirectory(File dir) {
-for (File f : dir.listFiles()) {
-if (f.isDirectory()) {
-processDirectory(f);
-} else if (f.isFile()) {
-processFile(f);
-}
-}
-}
-
-
-private static void processFile(File f) {
-String name = f.getName();
-
-// non-l10n files
-if (!name.startsWith(Constants.L10N_PREFIX)) {
-return;
-}
-
-// Determine language
-String language = Utils.getLanguage(name);
-
-String keyPrefix = getKeyPrefix(f);
-Properties props = Utils.load(f);
-
-// Create a Map for the language if one does not exist.
-Properties translation = translations.get(language);
-if (translation == null) {
-translation = new Properties();
-translations.put(language, translation);
-}
-
-// Add the properties from this file to the combined file, prefixing 
the
-// key with the package name to ensure uniqueness.
-for (Object obj : props.keySet()) {
-String key = (String) obj;
-String value = props.getProperty(key);
-
-translation.put(keyPrefix + key, value);
-}
-}
-
-
-private static String getKeyPrefix(File f) {
-File wd = new File(".");
-String prefix = f.getParentFile().getAbsolutePath();
-prefix = prefix.substring(wd.getAbsolutePath().length() - 1);
-prefix = prefix.replace(File.separatorChar, '.');
-prefix = prefix + Constants.END_PACKAGE_MARKER;
-return prefix;
-}
-
-
 private static void outputTranslations() {
 
 File storageDir = new File(Constants.STORAGE_DIR);
diff --git a/java/org/apache/tomcat/buildutil/translate/Utils.java 
b/java/org/apache/tomcat/buildutil/translate/Utils.java
index 9a5f5d7..d441c35 100644
--- a/java/org/apache/tomcat/buildutil/translate/Utils.java
+++ b/java/org/apache/tomcat/buildutil/translate/Utils.java
@@ -22,6 +22,7 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.nio.charset.StandardCharsets;
+import java.util.Map;
 import java.util.Properties;
 import java.util.regex.Pattern;
 
@@ -70,4 +71,57 @@ public class Utils {
 }
 return result;
 }
+
+
+static void processDirectory(File dir, Map 
translations) {
+for (File f : dir.listFiles()) {
+if (f.isDirectory()) {
+processDirectory(f, translations);
+} else if (f.isFile()) {
+processFile(f, translations);
+}
+}
+}
+
+
+static void processFile(File f, Map translations) {
+String name = f.getName();
+
+// non-l10n files
+if (!name.startsWith(Constants.L10N_PREFIX)) {
+return;
+}
+
+// Determine language
+String language = Utils.getLanguage(name);
+
+String keyPrefix = getKeyPrefix(f);
+Properties props = Utils.load(f);
+
+// Create a Map for the language if one does not exist.
+Properties translation = translations.get(language);
+if (translation == null) {
+translation = new Properties();
+translations.put(language, translation);
+}
+
+// Add the properties from this file to the combined file, prefixing 
the
+// key with the package name to ensure uniqueness.

[tomcat] 03/03: Add a tool for back-porting English translations

2019-08-14 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 050c6bdf79442931a5cfed5ff0b4931735929ba2
Author: Mark Thomas 
AuthorDate: Wed Aug 14 11:17:05 2019 +0100

Add a tool for back-porting English translations
---
 .../buildutil/translate/BackportEnglish.java   | 71 ++
 1 file changed, 71 insertions(+)

diff --git a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java 
b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
new file mode 100644
index 000..180be8f
--- /dev/null
+++ b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
@@ -0,0 +1,71 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License.  You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package org.apache.tomcat.buildutil.translate;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * Generates a set of English property files to back-port updates to a previous
+ * version. Where a key exists in the source and target versions the value is
+ * copied from the source to the target, overwriting the value in the target.
+ * The expectation is that the changes will be manually reviewed before
+ * committing them.
+ */
+public class BackportEnglish {
+
+private static final Map sourceTranslations = new 
HashMap<>();
+private static final Map targetTranslations = new 
HashMap<>();
+
+public static void main(String... args) throws IOException {
+if (args.length != 1) {
+throw new IllegalArgumentException("Missing back-port target");
+}
+File targetRoot = new File(args[0]);
+
+if (!targetRoot.isDirectory()) {
+throw new IllegalArgumentException("Back-port target not a 
directory");
+}
+
+File sourceRoot = new File(".");
+for (String dir : Constants.SEARCH_DIRS) {
+File directory = new File(dir);
+Utils.processDirectory(sourceRoot, directory, sourceTranslations);
+}
+
+for (String dir : Constants.SEARCH_DIRS) {
+File directory = new File(targetRoot, dir);
+Utils.processDirectory(targetRoot, directory, targetTranslations);
+}
+
+Properties sourceEnglish = sourceTranslations.get("");
+Properties targetEnglish = targetTranslations.get("");
+
+for (Object key : sourceEnglish.keySet()) {
+if (targetEnglish.containsKey(key)) {
+targetEnglish.put(key, sourceEnglish.get(key));
+}
+}
+
+File storageDir = new File(targetRoot, Constants.STORAGE_DIR);
+
+Utils.export("", targetEnglish, storageDir);
+}
+}


-
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 #189: Additional translations of Chinese

2019-08-14 Thread GitBox
markt-asf commented on issue #189: Additional translations of Chinese
URL: https://github.com/apache/tomcat/pull/189#issuecomment-521162534
 
 
   I'm all in favour of expanding the i18n support in Tomcat and I agree adding 
Chinese translations to 8.5.x is a good next step.
   
   If you aren't already aware, Tomcat uses 
[POEditor](https://poeditor.com/projects/view?id=221603) to manage translations 
for 9.0.x and then back-ports changes to earlier versions.
   
   I think there it should be possible to add significantly more Chinese 
translations than proposed in this PR and to do so in a semi-automated fashion 
that supports additional languages.
   
   There are probably several different ways of doing this. My first idea is to 
use the utilities in org.apache.tomcat.buildutil.translate as a starting point, 
and write some code to support the following:
   
   - For every key in 9.0.x, if the key exists in 8.5.x replace the 8.5.x 
English text with the 9.0.x version
   - Manually review the diff and revert any changes that don't look right
   - For every key in 9.0.x, if the key exists in 8.5.x and the English text is 
the same in both versions, copy the text for all other languages supported by 
8.5.x from 9.0.x to 8.5.x.
   - Repeat for 8.5.x and 7.0.x
   
   Suggests to improve the process and/or patches to implement it welcome.


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] branch 8.5.x updated: Fix test observed to fail consistently with NIO2 + Win + Java 8u212

2019-08-14 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 494fcaf  Fix test observed to fail consistently with NIO2 + Win + Java 
8u212
494fcaf is described below

commit 494fcafe83d0082c03e990a56146a7a2211815c2
Author: Mark Thomas 
AuthorDate: Wed Aug 14 08:24:53 2019 +0100

Fix test observed to fail consistently with NIO2 + Win + Java 8u212
---
 test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java 
b/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
index d7cb18f..503e1cd 100644
--- a/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
+++ b/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
@@ -391,8 +391,12 @@ public class TestChunkedInputFilter extends TomcatBaseTest 
{
 request += SimpleHttpClient.CRLF + chunks + "0" + SimpleHttpClient.CRLF
 + SimpleHttpClient.CRLF;
 
-TrailerClient client = new TrailerClient(tomcat.getConnector()
-.getLocalPort());
+TrailerClient client = new 
TrailerClient(tomcat.getConnector().getLocalPort());
+// Need to use the content length here as variations in Connector and
+// JVM+OS behaviour mean that in some circumstances the client may see
+// an IOException rather than the response body when the server closes
+// the connection.
+client.setUseContentLength(true);
 client.setRequest(new String[] { request });
 
 Exception processException = null;


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



[tomcat] branch 7.0.x updated: Fix test observed to fail consistently with NIO2 + Win + Java 8u212

2019-08-14 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 773f215  Fix test observed to fail consistently with NIO2 + Win + Java 
8u212
773f215 is described below

commit 773f215b4c9ebc4e64e50f5e2120db8e181fef2d
Author: Mark Thomas 
AuthorDate: Wed Aug 14 08:24:53 2019 +0100

Fix test observed to fail consistently with NIO2 + Win + Java 8u212
---
 test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java 
b/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
index 425ed8c..6a656c0 100644
--- a/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
+++ b/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
@@ -392,8 +392,12 @@ public class TestChunkedInputFilter extends TomcatBaseTest 
{
 request += SimpleHttpClient.CRLF + chunks + "0" + SimpleHttpClient.CRLF
 + SimpleHttpClient.CRLF;
 
-TrailerClient client = new TrailerClient(tomcat.getConnector()
-.getLocalPort());
+TrailerClient client = new 
TrailerClient(tomcat.getConnector().getLocalPort());
+// Need to use the content length here as variations in Connector and
+// JVM+OS behaviour mean that in some circumstances the client may see
+// an IOException rather than the response body when the server closes
+// the connection.
+client.setUseContentLength(true);
 client.setRequest(new String[] { request });
 
 Exception processException = null;


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



[tomcat] branch master updated: Fix test observed to fail consistently with NIO2 + Win + Java 8u212

2019-08-14 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 8a81e7a  Fix test observed to fail consistently with NIO2 + Win + Java 
8u212
8a81e7a is described below

commit 8a81e7a8db4337190464240e7e72fa3314356a40
Author: Mark Thomas 
AuthorDate: Wed Aug 14 08:24:53 2019 +0100

Fix test observed to fail consistently with NIO2 + Win + Java 8u212
---
 test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java 
b/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
index 91ec506..86e574e 100644
--- a/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
+++ b/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
@@ -392,8 +392,12 @@ public class TestChunkedInputFilter extends TomcatBaseTest 
{
 request += SimpleHttpClient.CRLF + chunks + "0" + SimpleHttpClient.CRLF
 + SimpleHttpClient.CRLF;
 
-TrailerClient client = new TrailerClient(tomcat.getConnector()
-.getLocalPort());
+TrailerClient client = new 
TrailerClient(tomcat.getConnector().getLocalPort());
+// Need to use the content length here as variations in Connector and
+// JVM+OS behaviour mean that in some circumstances the client may see
+// an IOException rather than the response body when the server closes
+// the connection.
+client.setUseContentLength(true);
 client.setRequest(new String[] { request });
 
 Exception processException = null;


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