svn commit: r48231 - in /dev/tomcat/tomcat-9/v9.0.47: ./ bin/ bin/embed/ src/

2021-06-08 Thread remm 
Author: remm
Date: Tue Jun  8 20:08:06 2021
New Revision: 48231

Log:
Upload Tomcat 9.0.47

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

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

Added: dev/tomcat/tomcat-9/v9.0.47/KEYS
==
--- dev/tomcat/tomcat-9/v9.0.47/KEYS (added)
+++ dev/tomcat/tomcat-9/v9.0.47/KEYS Tue Jun  8 20:08:06 2021
@@ -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

[tomcat] 01/01: Tag 9.0.47

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

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

commit e2febebd2fffc10764f70bdd7a3c879f571b3795
Author: Mark Thomas 
AuthorDate: Tue Jun 8 19:34:12 2021 +0100

Tag 9.0.47
---
 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 1394534..03e7cdc 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=9
 version.minor=0
 version.build=47
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Reproducible builds -
 # Uncomment and set to current time for reproducible builds
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9ab586b..adfbd45 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,7 +104,7 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
   
 
   

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

[tomcat] tag 9.0.47 created (now e2febeb)

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

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


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

 new e2febeb  Tag 9.0.47

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


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

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

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

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new e832205  Increment version for next development cycle
e832205 is described below

commit e832205bd58bce6f987ec4628176782b6b8f66a9
Author: Mark Thomas 
AuthorDate: Tue Jun 8 19:32:02 2021 +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 eb4e4ce..1d7309a 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=10
 version.minor=0
-version.build=7
+version.build=8
 version.patch=0
 version.suffix=-dev
 
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 8a1a666..3497712 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -39,7 +39,7 @@ 
maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d
 maven.asf.release.repo.repositoryId=apache.releases.https
 
 # Release version info
-maven.asf.release.deploy.version=10.0.7
+maven.asf.release.deploy.version=10.0.8
 
 #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 93b186d..7ad4315 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,7 +104,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 10.0.7

2021-06-08 Thread Mark Thomas 

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

Apache Tomcat 10.x implements Jakarta EE 9 and, as such, the primary
package for all the specification APIs has changed from javax.* to jakarta.*

Applications that run on Tomcat 9 will not run on Tomcat 10 without 
changes. Java EE applications designed for Tomcat 9 and earlier may be 
placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will 
automatically convert them to Jakarta EE and copy them to the webapps 
directory


The notable changes compared to 10.0.6 are:

- Improve robustness of HTTP/2 HPACK decoding

- Improvements to the handling of the Transfer-Encoding header

- Review code used to generate Java source from JSPs and tags and remove
  code found to be unnecessary.

Along with lots of other bug fixes and improvements.

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

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.0.7/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1313
The tag is:
https://github.com/apache/tomcat/tree/10.0.7
f0213194669c0d6ac9d60d564f198e3fcf47cbf9

The proposed 10.0.7 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 10.0.7 (stable)

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

[tomcat] branch 9.0.x updated: Fix typo

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

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


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

commit 0ccd9643ce9017b23599b69fe788dc0f83f7759e
Author: Mark Thomas 
AuthorDate: Tue Jun 8 18:45:12 2021 +0100

Fix typo
---
 webapps/docs/changelog.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 60b76d9..a183965 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -295,8 +295,8 @@
   
 65362: Correct a regression in the previous release. The
 change to create OSGi Require-Capability sections in
-manifests for Jakarta API JARs manually rather bnd annotations did not
-add the necessary manual entries to the embedded JARs. (markt)
+manifests for Jakarta API JARs manually rather than with bnd 
annotations
+did not add the necessary manual entries to the embedded JARs. (markt)
   
   
 Update the packaged version of the Tomcat Native Library to 1.2.30. 
Also

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

[tomcat] branch 10.0.x updated: Fix typo

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

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


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

commit 50184c877b721be4766e1f9f612342947f195399
Author: Mark Thomas 
AuthorDate: Tue Jun 8 18:45:12 2021 +0100

Fix typo
---
 webapps/docs/changelog.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 77d0ad5..93b186d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -287,8 +287,8 @@
   
 65362: Correct a regression in the previous release. The
 change to create OSGi Require-Capability sections in
-manifests for Jakarta API JARs manually rather bnd annotations did not
-add the necessary manual entries to the embedded JARs. (markt)
+manifests for Jakarta API JARs manually rather than with bnd 
annotations
+did not add the necessary manual entries to the embedded JARs. (markt)
   
   
 Update the packaged version of the Tomcat Native Library to 1.2.30. 
Also

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

[tomcat] branch main updated: Fix typo

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

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


The following commit(s) were added to refs/heads/main by this push:
 new 6ec028e  Fix typo
6ec028e is described below

commit 6ec028edc5ca1b6e928fb3395e993b272c814292
Author: Mark Thomas 
AuthorDate: Tue Jun 8 18:45:12 2021 +0100

Fix typo
---
 webapps/docs/changelog.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8e87097..809d65e3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -324,8 +324,8 @@
   
 65362: Correct a regression in the previous release. The
 change to create OSGi Require-Capability sections in
-manifests for Jakarta API JARs manually rather bnd annotations did not
-add the necessary manual entries to the embedded JARs. (markt)
+manifests for Jakarta API JARs manually rather than with bnd 
annotations
+did not add the necessary manual entries to the embedded JARs. (markt)
   
   
 Update the packaged version of the Tomcat Native Library to 1.2.30. 
Also

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

[tomcat] branch 10.0.x updated: Fix typo

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

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


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

commit a8c03a4ca64962b4ebe3c9f7933f7a0fc7b8ef78
Author: Mark Thomas 
AuthorDate: Tue Jun 8 18:43:03 2021 +0100

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

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0dfccaa..77d0ad5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -258,7 +258,7 @@
   
   
 Update the web-fragment.xml included in
-tomcat-websocket.jarto use the Servlet 5.0 schema. (markt)
+tomcat-websocket.jar to use the Servlet 5.0 schema. 
(markt)
   
   
 65342: Correct a regression introduced with the fix for

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

[tomcat] branch main updated: Fix typo

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

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


The following commit(s) were added to refs/heads/main by this push:
 new e0192fd  Fix typo
e0192fd is described below

commit e0192fd862ab94e9524714bb7c585670edd4b857
Author: Mark Thomas 
AuthorDate: Tue Jun 8 18:43:03 2021 +0100

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

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c891553..8e87097 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -295,7 +295,7 @@
   
   
 Update the web-fragment.xml included in
-tomcat-websocket.jarto use the Servlet 5.0 schema. (markt)
+tomcat-websocket.jar to use the Servlet 5.0 schema. 
(markt)
   
   
 65342: Correct a regression introduced with the fix for

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

2021-06-08 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 143a8e6  Fix typos
143a8e6 is described below

commit 143a8e638513763e69784773233f738e2d87a172
Author: Mark Thomas 
AuthorDate: Tue Jun 8 18:39:17 2021 +0100

Fix typos
---
 webapps/docs/changelog.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d6fcb6d..c338159 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -153,7 +153,7 @@
 an inner class that extends GenericPrincipal. (remm)
   
   
-Enable the default doHead()) implementation in
+Enable the default doHead() implementation in
 HttpServlet to correctly handle responses where the 
content
 length needs to be represented as a long since it is larger than the
 maximum value that can be represented by an int. (markt)
@@ -163,13 +163,13 @@
 UserDatabase. (remm)
   
   
-Fix the default doHead()) implementation in
+Fix the default doHead() implementation in
 HttpServlet to correctly handle responses where the 
Servlet
 calls ServletResponse.reset() and/or
 ServletResponse.resetBuffer(). (markt)
   
   
-Fix the default doHead()) implementation in
+Fix the default doHead() implementation in
 HttpServlet to correctly handle responses generated using
 the Servlet non-blocking API. (markt)
   

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

[tomcat] branch 9.0.x updated: Fix typos

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 81d5e0d  Fix typos
81d5e0d is described below

commit 81d5e0dd5be948ada37750b92eb21c58a44c6173
Author: Mark Thomas 
AuthorDate: Tue Jun 8 18:39:17 2021 +0100

Fix typos
---
 webapps/docs/changelog.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9ab586b..60b76d9 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -153,7 +153,7 @@
 an inner class that extends GenericPrincipal. (remm)
   
   
-Enable the default doHead()) implementation in
+Enable the default doHead() implementation in
 HttpServlet to correctly handle responses where the 
content
 length needs to be represented as a long since it is larger than the
 maximum value that can be represented by an int. (markt)
@@ -163,13 +163,13 @@
 UserDatabase. (remm)
   
   
-Fix the default doHead()) implementation in
+Fix the default doHead() implementation in
 HttpServlet to correctly handle responses where the 
Servlet
 calls ServletResponse.reset() and/or
 ServletResponse.resetBuffer(). (markt)
   
   
-Fix the default doHead()) implementation in
+Fix the default doHead() implementation in
 HttpServlet to correctly handle responses generated using
 the Servlet non-blocking API. (markt)
   

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

[tomcat] branch 10.0.x updated: Fix typos

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

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new b9890f6  Fix typos
b9890f6 is described below

commit b9890f6a658a00b0f9f4a08f6675357565bd
Author: Mark Thomas 
AuthorDate: Tue Jun 8 18:39:17 2021 +0100

Fix typos
---
 webapps/docs/changelog.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f64177c..0dfccaa 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -144,7 +144,7 @@
 an inner class that extends GenericPrincipal. (remm)
   
   
-Enable the default doHead()) implementation in
+Enable the default doHead() implementation in
 HttpServlet to correctly handle responses where the 
content
 length needs to be represented as a long since it is larger than the
 maximum value that can be represented by an int. (markt)
@@ -154,13 +154,13 @@
 UserDatabase. (remm)
   
   
-Fix the default doHead()) implementation in
+Fix the default doHead() implementation in
 HttpServlet to correctly handle responses where the 
Servlet
 calls ServletResponse.reset() and/or
 ServletResponse.resetBuffer(). (markt)
   
   
-Fix the default doHead()) implementation in
+Fix the default doHead() implementation in
 HttpServlet to correctly handle responses generated using
 the Servlet non-blocking API. (markt)
   

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

[tomcat] branch main updated: Fix typos

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

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


The following commit(s) were added to refs/heads/main by this push:
 new 49daff5  Fix typos
49daff5 is described below

commit 49daff598d716441d0f948f9f04169a3624e2829
Author: Mark Thomas 
AuthorDate: Tue Jun 8 18:39:17 2021 +0100

Fix typos
---
 webapps/docs/changelog.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index da89878..c891553 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -167,7 +167,7 @@
 an inner class that extends GenericPrincipal. (remm)
   
   
-Enable the default doHead()) implementation in
+Enable the default doHead() implementation in
 HttpServlet to correctly handle responses where the 
content
 length needs to be represented as a long since it is larger than the
 maximum value that can be represented by an int. (markt)
@@ -177,13 +177,13 @@
 UserDatabase. (remm)
   
   
-Fix the default doHead()) implementation in
+Fix the default doHead() implementation in
 HttpServlet to correctly handle responses where the 
Servlet
 calls ServletResponse.reset() and/or
 ServletResponse.resetBuffer(). (markt)
   
   
-Fix the default doHead()) implementation in
+Fix the default doHead() implementation in
 HttpServlet to correctly handle responses generated using
 the Servlet non-blocking API. (markt)
   

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

svn commit: r48227 - in /dev/tomcat/tomcat-10/v10.0.7: ./ bin/ bin/embed/ src/

2021-06-08 Thread markt 
Author: markt
Date: Tue Jun  8 17:29:03 2021
New Revision: 48227

Log:
Upload 10.0.7 for voting

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

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

Added: dev/tomcat/tomcat-10/v10.0.7/KEYS
==
--- dev/tomcat/tomcat-10/v10.0.7/KEYS (added)
+++ dev/tomcat/tomcat-10/v10.0.7/KEYS Tue Jun  8 17:29:03 2021
@@ -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

buildbot success in on tomcat-8.5.x

2021-06-08 Thread buildbot 
The Buildbot has detected a restored build on builder tomcat-8.5.x while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-8.5.x/builds/22

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

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8.5-commit' 
triggered this build
Build Source Stamp: [branch 8.5.x] d1cc88ccbd89660e76e59962b21edec15474b75a
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] 01/01: Tag 10.0.7

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

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

commit f0213194669c0d6ac9d60d564f198e3fcf47cbf9
Author: Mark Thomas 
AuthorDate: Tue Jun 8 17:24:30 2021 +0100

Tag 10.0.7
---
 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 eb4e4ce..7ca6b21 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=10
 version.minor=0
 version.build=7
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Reproducible builds -
 # Uncomment and set to current time for reproducible builds
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f64177c..682b570 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,7 +104,7 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
   
 
   

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

[tomcat] tag 10.0.7 created (now f021319)

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

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


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

 new f021319  Tag 10.0.7

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


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

buildbot success in on tomcat-10.0.x

2021-06-08 Thread buildbot 
The Buildbot has detected a restored build on builder tomcat-10.0.x while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-10.0.x/builds/39

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

Buildslave for this Build: asf946_ubuntu

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

Build succeeded!

Sincerely,
 -The Buildbot




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

[tomcat] branch main updated: Increment version number of next development cycle

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

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


The following commit(s) were added to refs/heads/main by this push:
 new fb4dc46  Increment version number of next development cycle
fb4dc46 is described below

commit fb4dc46dc32f2f82bfdaa0b0ed67b2d36159cc43
Author: Mark Thomas 
AuthorDate: Tue Jun 8 17:13:57 2021 +0100

Increment version number of 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 dd9db1c..7572888 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=10
 version.minor=1
 version.build=0
 version.patch=0
-version.suffix=-M1-dev
+version.suffix=-M2-dev
 
 # - Reproducible builds -
 # Uncomment and set to current time for reproducible builds
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index cd72824..bdfe8ec 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -39,7 +39,7 @@ 
maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d
 maven.asf.release.repo.repositoryId=apache.releases.https
 
 # Release version info
-maven.asf.release.deploy.version=10.1.0-M1
+maven.asf.release.deploy.version=10.1.0-M2
 
 #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 5e670b2..da89878 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,7 +104,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 10.1.0-M1

2021-06-08 Thread Mark Thomas 

The proposed Apache Tomcat 10.1.0-M1 release is now available for
voting.

Applications that run on Tomcat 9 and earlier will not run on Tomcat 10 
without changes. Java EE applications designed for Tomcat 9 and earlier 
may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat 
will automatically convert them to Jakarta EE and copy them to the 
webapps directory.


This is the first milestone release of the 10.1.x branch.

The notable changes compared to 10.0.x are:

- Remove code (but not the APR/Native Connector) previously marked for
  removal in 10.1.x The APR/Native Connector will almost certainly be
  removed in a future milestone.

- Align the Servlet API implementation with the current Servlet API
  development branch.

- Align the EL API implementation with the current El API development
  branch.

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

It can be obtained from:
f2ab9ac8bc3f40ee9b2cb50b030c99df927f0429
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1312
The tag is:
https://github.com/apache/tomcat/tree/10.1.0-M1
f2ab9ac8bc3f40ee9b2cb50b030c99df927f0429

The proposed 10.1.0-M1 release is:
[ ] Broken - do not release
[ ] Alpha - go ahead and release as 10.1.0-M1 (alpha)

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

svn commit: r48224 - in /dev/tomcat/tomcat-10/v10.1.0-M1: ./ bin/ bin/embed/ src/

2021-06-08 Thread markt 
Author: markt
Date: Tue Jun  8 15:18:16 2021
New Revision: 48224

Log:
Upload 10.1.0-M1 for voting

Added:
dev/tomcat/tomcat-10/v10.1.0-M1/
dev/tomcat/tomcat-10/v10.1.0-M1/KEYS
dev/tomcat/tomcat-10/v10.1.0-M1/README.html
dev/tomcat/tomcat-10/v10.1.0-M1/RELEASE-NOTES
dev/tomcat/tomcat-10/v10.1.0-M1/bin/
dev/tomcat/tomcat-10/v10.1.0-M1/bin/README.html
dev/tomcat/tomcat-10/v10.1.0-M1/bin/apache-tomcat-10.1.0-M1-deployer.tar.gz 
  (with props)

dev/tomcat/tomcat-10/v10.1.0-M1/bin/apache-tomcat-10.1.0-M1-deployer.tar.gz.asc

dev/tomcat/tomcat-10/v10.1.0-M1/bin/apache-tomcat-10.1.0-M1-deployer.tar.gz.sha512
dev/tomcat/tomcat-10/v10.1.0-M1/bin/apache-tomcat-10.1.0-M1-deployer.zip   
(with props)
dev/tomcat/tomcat-10/v10.1.0-M1/bin/apache-tomcat-10.1.0-M1-deployer.zip.asc

dev/tomcat/tomcat-10/v10.1.0-M1/bin/apache-tomcat-10.1.0-M1-deployer.zip.sha512
dev/tomcat/tomcat-10/v10.1.0-M1/bin/apache-tomcat-10.1.0-M1-fulldocs.tar.gz 
  (with props)

dev/tomcat/tomcat-10/v10.1.0-M1/bin/apache-tomcat-10.1.0-M1-fulldocs.tar.gz.asc

dev/tomcat/tomcat-10/v10.1.0-M1/bin/apache-tomcat-10.1.0-M1-fulldocs.tar.gz.sha512
dev/tomcat/tomcat-10/v10.1.0-M1/bin/apache-tomcat-10.1.0-M1-windows-x64.zip 
  (with props)

dev/tomcat/tomcat-10/v10.1.0-M1/bin/apache-tomcat-10.1.0-M1-windows-x64.zip.asc

dev/tomcat/tomcat-10/v10.1.0-M1/bin/apache-tomcat-10.1.0-M1-windows-x64.zip.sha512
dev/tomcat/tomcat-10/v10.1.0-M1/bin/apache-tomcat-10.1.0-M1-windows-x86.zip 
  (with props)

dev/tomcat/tomcat-10/v10.1.0-M1/bin/apache-tomcat-10.1.0-M1-windows-x86.zip.asc

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

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

dev/tomcat/tomcat-10/v10.1.0-M1/bin/embed/apache-tomcat-10.1.0-M1-embed.tar.gz.asc

dev/tomcat/tomcat-10/v10.1.0-M1/bin/embed/apache-tomcat-10.1.0-M1-embed.tar.gz.sha512
dev/tomcat/tomcat-10/v10.1.0-M1/bin/embed/apache-tomcat-10.1.0-M1-embed.zip 
  (with props)

dev/tomcat/tomcat-10/v10.1.0-M1/bin/embed/apache-tomcat-10.1.0-M1-embed.zip.asc

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

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

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

[tomcat] 01/01: Tag 10.1.0-M1

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

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

commit f2ab9ac8bc3f40ee9b2cb50b030c99df927f0429
Author: Mark Thomas 
AuthorDate: Tue Jun 8 13:53:30 2021 +0100

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

diff --git a/build.properties.default b/build.properties.default
index dd9db1c..49195ec 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=10
 version.minor=1
 version.build=0
 version.patch=0
-version.suffix=-M1-dev
+version.suffix=-M1
 
 # - Reproducible builds -
 # Uncomment and set to current time for reproducible builds
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5e670b2..693df58 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,7 +104,7 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
   
 
   

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

[tomcat] tag 10.1.0-M1 created (now f2ab9ac)

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

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


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

 new f2ab9ac  Tag 10.1.0-M1

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


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

[tomcat] branch 9.0.x updated: remm has volunteered to RM this release

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new f59515a  remm has volunteered to RM this release
f59515a is described below

commit f59515accbb350b85ebf1bc7b00adb231989fa1a
Author: Mark Thomas 
AuthorDate: Tue Jun 8 13:53:00 2021 +0100

remm has volunteered to RM this release
---
 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 513afaf..9ab586b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,7 +104,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: Tagging 10.1.x, 10.0.x, 9.0.x and 8.5.x

2021-06-08 Thread Mark Thomas 

On 08/06/2021 12:22, Rémy Maucherat wrote:

On Fri, Jun 4, 2021 at 8:14 PM Mark Thomas  wrote:


On 04/06/2021 18:35, Rémy Maucherat wrote:

On Fri, Jun 4, 2021 at 7:09 PM Mark Thomas  wrote:


Hi all,

It looks like the mirrors are going to need a little more time for
1.2.30 to replicate before I can update the release branches to use the
new release. I also still have a few odds and ends I want to finish off
before tagging so it is looking like the tags will happen on Monday 7th
June.

Chris, how are you getting on with getting set up to release 8.5.x? Can
I help at all?

Remy, did you make a decision on being RM for 9.0.x?



Let's do this. Do I get a support hotline for the first one ? My last one
was 6.0.20 ...


Absolutely. Let me just get a premium rate phone number set up... ;)

Seriously, ping me off-list or on the Tomcat slack channel if you have
any questions.



Since you seem to be about to tag, can you also tag the 9.0 branch ? I
don't want it to be treated differently from the three others this time
around, and I'll (try to) handle it from there.


Will do. I'm just following up on a test failure on Windows. It is 
likely timing related as screen saver kicked in while the test was 
running and the VM seems to slow down when that happens. Assuming I find 
nothing of concern, I should be able to tag in the next hour or so.


Mark

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

Re: Tagging 10.1.x, 10.0.x, 9.0.x and 8.5.x

2021-06-08 Thread Rémy Maucherat 
On Fri, Jun 4, 2021 at 8:14 PM Mark Thomas  wrote:

> On 04/06/2021 18:35, Rémy Maucherat wrote:
> > On Fri, Jun 4, 2021 at 7:09 PM Mark Thomas  wrote:
> >
> >> Hi all,
> >>
> >> It looks like the mirrors are going to need a little more time for
> >> 1.2.30 to replicate before I can update the release branches to use the
> >> new release. I also still have a few odds and ends I want to finish off
> >> before tagging so it is looking like the tags will happen on Monday 7th
> >> June.
> >>
> >> Chris, how are you getting on with getting set up to release 8.5.x? Can
> >> I help at all?
> >>
> >> Remy, did you make a decision on being RM for 9.0.x?
> >>
> >
> > Let's do this. Do I get a support hotline for the first one ? My last one
> > was 6.0.20 ...
>
> Absolutely. Let me just get a premium rate phone number set up... ;)
>
> Seriously, ping me off-list or on the Tomcat slack channel if you have
> any questions.
>

Since you seem to be about to tag, can you also tag the 9.0 branch ? I
don't want it to be treated differently from the three others this time
around, and I'll (try to) handle it from there.

Rémy


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

[Bug 65332] AccessControlException when using Ant instead of ECJ to compile JSPs at runtime

2021-06-08 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=65332

--- Comment #3 from Coty Sutherland  ---
Thanks Mark! Sorry for the delayed reply, it was on my todo list to resolve
today :)

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

[tomcat] branch 9.0.x updated: Update timestamp for reproducible builds

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 21dcdad  Update timestamp for reproducible builds
21dcdad is described below

commit 21dcdadc3381953611da50112f74187b9798eaf1
Author: Mark Thomas 
AuthorDate: Tue Jun 8 12:09:54 2021 +0100

Update timestamp for reproducible builds
---
 build.properties.default | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 79e40b3..1394534 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -31,8 +31,8 @@ version.suffix=-dev
 
 # - Reproducible builds -
 # Uncomment and set to current time for reproducible builds
-#2021-05-08T15:00:00Z
-#ant.tstamp.now=1620482400
+#2021-06-08T12:00:00Z
+#ant.tstamp.now=1623153600
 
 # - Source control flags -
 git.branch=9.0.x

-
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: Update timestamp for reproducible builds

2021-06-08 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 d1cc88c  Update timestamp for reproducible builds
d1cc88c is described below

commit d1cc88ccbd89660e76e59962b21edec15474b75a
Author: Mark Thomas 
AuthorDate: Tue Jun 8 12:09:54 2021 +0100

Update timestamp for reproducible builds
---
 build.properties.default | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index dd478e5..53ad4e3 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -31,8 +31,8 @@ version.suffix=-dev
 
 # - Reproducible builds -
 # Uncomment and set to current time for reproducible builds
-#2021-05-08T15:00:00Z
-#ant.tstamp.now=1620482400
+#2021-06-08T12:00:00Z
+#ant.tstamp.now=1623153600
 
 # - Source control flags -
 git.branch=8.5.x

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

[tomcat] branch 10.0.x updated: Update timestamp for reproducible builds

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

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new e872349  Update timestamp for reproducible builds
e872349 is described below

commit e87234939075a66cf0b157ff6f677597ccc5ce1a
Author: Mark Thomas 
AuthorDate: Tue Jun 8 12:09:54 2021 +0100

Update timestamp for reproducible builds
---
 build.properties.default | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index b42d483..eb4e4ce 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -31,8 +31,8 @@ version.suffix=-dev
 
 # - Reproducible builds -
 # Uncomment and set to current time for reproducible builds
-#2021-05-08T15:00:00Z
-#ant.tstamp.now=1620482400
+#2021-06-08T12:00:00Z
+#ant.tstamp.now=1623153600
 
 # - Source control flags -
 git.branch=main

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

[tomcat] branch main updated: Update timestamp for reproducible builds

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

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


The following commit(s) were added to refs/heads/main by this push:
 new 796d2d6  Update timestamp for reproducible builds
796d2d6 is described below

commit 796d2d6174938b8fa1fa9dbb536482f40de9382b
Author: Mark Thomas 
AuthorDate: Tue Jun 8 12:09:54 2021 +0100

Update timestamp for reproducible builds
---
 build.properties.default | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 4bb4928..dd9db1c 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -31,8 +31,8 @@ version.suffix=-M1-dev
 
 # - Reproducible builds -
 # Uncomment and set to current time for reproducible builds
-#2021-05-08T15:00:00Z
-#ant.tstamp.now=1620482400
+#2021-06-08T12:00:00Z
+#ant.tstamp.now=1623153600
 
 # - Source control flags -
 git.branch=main

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

[tomcat] 02/03: Process T-E header from both HTTP 1.0 and HTTP 1.1. clients

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

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

commit da0e7cb093cf68b052d9175e469dbd0464441b0b
Author: Mark Thomas 
AuthorDate: Mon May 10 21:59:44 2021 +0100

Process T-E header from both HTTP 1.0 and HTTP 1.1. clients
---
 java/org/apache/coyote/http11/Http11Processor.java |  4 +++-
 .../apache/coyote/http11/TestHttp11Processor.java  | 28 ++
 webapps/docs/changelog.xml |  4 
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/http11/Http11Processor.java 
b/java/org/apache/coyote/http11/Http11Processor.java
index 14fb1d6..1eb678c 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -992,7 +992,9 @@ public class Http11Processor extends AbstractProcessor {
 InputFilter[] inputFilters = inputBuffer.getFilters();
 
 // Parse transfer-encoding header
-if (http11) {
+// HTTP specs say an HTTP 1.1 server should accept any recognised
+// HTTP 1.x header from a 1.x client unless the specs says otherwise.
+if (!http09) {
 MessageBytes transferEncodingValueMB = 
headers.getValue("transfer-encoding");
 if (transferEncodingValueMB != null) {
 List encodingNames = new ArrayList<>();
diff --git a/test/org/apache/coyote/http11/TestHttp11Processor.java 
b/test/org/apache/coyote/http11/TestHttp11Processor.java
index 3a5bb1f..bd49273 100644
--- a/test/org/apache/coyote/http11/TestHttp11Processor.java
+++ b/test/org/apache/coyote/http11/TestHttp11Processor.java
@@ -1920,4 +1920,32 @@ public class TestHttp11Processor extends TomcatBaseTest {
 
 Assert.assertTrue(client.isResponse501());
 }
+
+
+@Test
+public void testWithTEChunkedHttp10() throws Exception {
+
+getTomcatInstanceTestWebapp(false, true);
+
+String request =
+"POST /test/echo-params.jsp HTTP/1.0" + SimpleHttpClient.CRLF +
+"Host: any" + SimpleHttpClient.CRLF +
+"Transfer-encoding: chunked" + SimpleHttpClient.CRLF +
+"Content-Type: application/x-www-form-urlencoded" +
+SimpleHttpClient.CRLF +
+"Connection: close" + SimpleHttpClient.CRLF +
+SimpleHttpClient.CRLF +
+"9" + SimpleHttpClient.CRLF +
+"test=data" + SimpleHttpClient.CRLF +
+"0" + SimpleHttpClient.CRLF +
+SimpleHttpClient.CRLF;
+
+Client client = new Client(getPort());
+client.setRequest(new String[] {request});
+
+client.connect();
+client.processRequest();
+Assert.assertTrue(client.isResponse200());
+Assert.assertTrue(client.getResponseBody().contains("test - data"));
+}
 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 47e9ee5..df3371f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -212,6 +212,10 @@
 in 2001. Requests using this transfer encoding will now receive a 501
 response. (markt)
   
+  
+Process transfer encoding headers from both HTTP 1.0 and HTTP 1.1
+clients. (markt)
+  
 
   
   

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

[tomcat] 03/03: Ensure chunked, if present, is the last encoding in the list

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

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

commit 8874fa02e9b36baa9ca6b226c0882c0190ca5a02
Author: Mark Thomas 
AuthorDate: Mon May 10 22:14:18 2021 +0100

Ensure chunked, if present, is the last encoding in the list
---
 java/org/apache/coyote/http11/Http11Processor.java | 13 +-
 .../apache/coyote/http11/TestHttp11Processor.java  | 28 +++---
 webapps/docs/changelog.xml |  5 
 3 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/coyote/http11/Http11Processor.java 
b/java/org/apache/coyote/http11/Http11Processor.java
index 1eb678c..bfc033f 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -451,9 +451,20 @@ public class Http11Processor extends AbstractProcessor {
  * supported, a 501 response will be returned to the client.
  */
 private void addInputFilter(InputFilter[] inputFilters, String 
encodingName) {
+if (contentDelimitation) {
+// Chunked has already been specified and it must be the final
+// encoding.
+// 400 - Bad request
+response.setStatus(400);
+setErrorState(ErrorState.CLOSE_CLEAN, null);
+if (log.isDebugEnabled()) {
+log.debug(sm.getString("http11processor.request.prepare") +
+  " Tranfer encoding lists chunked before [" + 
encodingName + "]");
+}
+return;
+}
 
 // Parsing trims and converts to lower case.
-
 if (encodingName.equals("chunked")) {
 
inputBuffer.addActiveFilter(inputFilters[Constants.CHUNKED_FILTER]);
 contentDelimitation = true;
diff --git a/test/org/apache/coyote/http11/TestHttp11Processor.java 
b/test/org/apache/coyote/http11/TestHttp11Processor.java
index bd49273..ca7db29 100644
--- a/test/org/apache/coyote/http11/TestHttp11Processor.java
+++ b/test/org/apache/coyote/http11/TestHttp11Processor.java
@@ -1854,47 +1854,53 @@ public class TestHttp11Processor extends TomcatBaseTest 
{
 
 @Test
 public void testTEHeaderUnknown01() throws Exception {
-doTestTEHeaderUnknown("identity");
+doTestTEHeaderInvalid("identity", false);
 }
 
 
 @Test
 public void testTEHeaderUnknown02() throws Exception {
-doTestTEHeaderUnknown("identity, chunked");
+doTestTEHeaderInvalid("identity, chunked", false);
 }
 
 
 @Test
 public void testTEHeaderUnknown03() throws Exception {
-doTestTEHeaderUnknown("unknown, chunked");
+doTestTEHeaderInvalid("unknown, chunked", false);
 }
 
 
 @Test
 public void testTEHeaderUnknown04() throws Exception {
-doTestTEHeaderUnknown("void");
+doTestTEHeaderInvalid("void", false);
 }
 
 
 @Test
 public void testTEHeaderUnknown05() throws Exception {
-doTestTEHeaderUnknown("void, chunked");
+doTestTEHeaderInvalid("void, chunked", false);
 }
 
 
 @Test
 public void testTEHeaderUnknown06() throws Exception {
-doTestTEHeaderUnknown("void, identity");
+doTestTEHeaderInvalid("void, identity", false);
 }
 
 
 @Test
 public void testTEHeaderUnknown07() throws Exception {
-doTestTEHeaderUnknown("identity, void");
+doTestTEHeaderInvalid("identity, void", false);
 }
 
 
-private void doTestTEHeaderUnknown(String headerValue) throws Exception {
+@Test
+public void testTEHeaderChunkedNotLast01() throws Exception {
+doTestTEHeaderInvalid("chunked, void", true);
+}
+
+
+private void doTestTEHeaderInvalid(String headerValue, boolean badRequest) 
throws Exception {
 Tomcat tomcat = getTomcatInstance();
 
 // No file system docBase required
@@ -1918,7 +1924,11 @@ public class TestHttp11Processor extends TomcatBaseTest {
 client.connect();
 client.processRequest(false);
 
-Assert.assertTrue(client.isResponse501());
+if (badRequest) {
+Assert.assertTrue(client.isResponse400());
+} else {
+Assert.assertTrue(client.isResponse501());
+}
 }
 
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index df3371f..d6fcb6d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -216,6 +216,11 @@
 Process transfer encoding headers from both HTTP 1.0 and HTTP 1.1
 clients. (markt)
   
+  
+Ensure that if the transfer encoding header contains the
+chunked, that the chunked encoding is the
+final encoding listed. (markt)
+  
 
   
   

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

[tomcat] 01/03: Remove support for the identity T-E header value

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

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

commit 3202703e6d635e39b74262e81f0cb4bcbe2170dc
Author: Mark Thomas 
AuthorDate: Mon May 10 21:20:46 2021 +0100

Remove support for the identity T-E header value
---
 java/org/apache/coyote/http11/Http11Processor.java |  8 +-
 .../apache/coyote/http11/TestHttp11Processor.java  | 95 --
 webapps/docs/changelog.xml |  6 ++
 3 files changed, 78 insertions(+), 31 deletions(-)

diff --git a/java/org/apache/coyote/http11/Http11Processor.java 
b/java/org/apache/coyote/http11/Http11Processor.java
index 8c3148f..14fb1d6 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -454,11 +454,8 @@ public class Http11Processor extends AbstractProcessor {
 
 // Parsing trims and converts to lower case.
 
-if (encodingName.equals("identity")) {
-// Skip
-} else if (encodingName.equals("chunked")) {
-inputBuffer.addActiveFilter
-(inputFilters[Constants.CHUNKED_FILTER]);
+if (encodingName.equals("chunked")) {
+
inputBuffer.addActiveFilter(inputFilters[Constants.CHUNKED_FILTER]);
 contentDelimitation = true;
 } else {
 for (int i = pluggableFilterIndex; i < inputFilters.length; i++) {
@@ -1001,7 +998,6 @@ public class Http11Processor extends AbstractProcessor {
 List encodingNames = new ArrayList<>();
 if 
(TokenList.parseTokenList(headers.values("transfer-encoding"), encodingNames)) {
 for (String encodingName : encodingNames) {
-// "identity" codings are ignored
 addInputFilter(inputFilters, encodingName);
 }
 } else {
diff --git a/test/org/apache/coyote/http11/TestHttp11Processor.java 
b/test/org/apache/coyote/http11/TestHttp11Processor.java
index 089be58..3a5bb1f 100644
--- a/test/org/apache/coyote/http11/TestHttp11Processor.java
+++ b/test/org/apache/coyote/http11/TestHttp11Processor.java
@@ -256,31 +256,6 @@ public class TestHttp11Processor extends TomcatBaseTest {
 
 
 @Test
-public void testWithTEIdentity() throws Exception {
-getTomcatInstanceTestWebapp(false, true);
-
-String request =
-"POST /test/echo-params.jsp HTTP/1.1" + SimpleHttpClient.CRLF +
-"Host: any" + SimpleHttpClient.CRLF +
-"Transfer-encoding: identity" + SimpleHttpClient.CRLF +
-"Content-Length: 9" + SimpleHttpClient.CRLF +
-"Content-Type: application/x-www-form-urlencoded" +
-SimpleHttpClient.CRLF +
-"Connection: close" + SimpleHttpClient.CRLF +
-SimpleHttpClient.CRLF +
-"test=data";
-
-Client client = new Client(getPort());
-client.setRequest(new String[] {request});
-
-client.connect();
-client.processRequest();
-Assert.assertTrue(client.isResponse200());
-Assert.assertTrue(client.getResponseBody().contains("test - data"));
-}
-
-
-@Test
 public void testWithTESavedRequest() throws Exception {
 getTomcatInstanceTestWebapp(false, true);
 
@@ -1875,4 +1850,74 @@ public class TestHttp11Processor extends TomcatBaseTest {
 // NO-OP
 }
 }
+
+
+@Test
+public void testTEHeaderUnknown01() throws Exception {
+doTestTEHeaderUnknown("identity");
+}
+
+
+@Test
+public void testTEHeaderUnknown02() throws Exception {
+doTestTEHeaderUnknown("identity, chunked");
+}
+
+
+@Test
+public void testTEHeaderUnknown03() throws Exception {
+doTestTEHeaderUnknown("unknown, chunked");
+}
+
+
+@Test
+public void testTEHeaderUnknown04() throws Exception {
+doTestTEHeaderUnknown("void");
+}
+
+
+@Test
+public void testTEHeaderUnknown05() throws Exception {
+doTestTEHeaderUnknown("void, chunked");
+}
+
+
+@Test
+public void testTEHeaderUnknown06() throws Exception {
+doTestTEHeaderUnknown("void, identity");
+}
+
+
+@Test
+public void testTEHeaderUnknown07() throws Exception {
+doTestTEHeaderUnknown("identity, void");
+}
+
+
+private void doTestTEHeaderUnknown(String headerValue) throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+// No file system docBase required
+Context ctx = tomcat.addContext("", null);
+
+// Add servlet
+Tomcat.addServlet(ctx, "TesterServlet", new TesterServlet(false));
+ctx.addServletMappingDecoded("/foo", "TesterServlet");
+
+tomcat.start();
+
+String request =
+"GET /foo HTTP/1.1" + SimpleHttpClient.CRLF +
+"Host: localhost:" + getPort() +

[tomcat] branch 8.5.x updated (1971c76 -> 8874fa0)

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

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


from 1971c76  Treat empty token at end the same way as empty token at 
start/middle
 new 3202703  Remove support for the identity T-E header value
 new da0e7cb  Process T-E header from both HTTP 1.0 and HTTP 1.1. clients
 new 8874fa0  Ensure chunked, if present, is the last encoding in the list

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


Summary of changes:
 java/org/apache/coyote/http11/Http11Processor.java |  25 ++--
 .../apache/coyote/http11/TestHttp11Processor.java  | 133 +
 webapps/docs/changelog.xml |  15 +++
 3 files changed, 140 insertions(+), 33 deletions(-)

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

[tomcat] 02/03: Process T-E header from both HTTP 1.0 and HTTP 1.1. clients

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

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

commit 05f9e8b00f5d9251fcd3c95dcfd6cf84177f46c8
Author: Mark Thomas 
AuthorDate: Mon May 10 21:59:44 2021 +0100

Process T-E header from both HTTP 1.0 and HTTP 1.1. clients
---
 java/org/apache/coyote/http11/Http11Processor.java |  4 +++-
 .../apache/coyote/http11/TestHttp11Processor.java  | 28 ++
 webapps/docs/changelog.xml |  4 
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/http11/Http11Processor.java 
b/java/org/apache/coyote/http11/Http11Processor.java
index 02c9c58..e2d01f3 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -750,7 +750,9 @@ public class Http11Processor extends AbstractProcessor {
 InputFilter[] inputFilters = inputBuffer.getFilters();
 
 // Parse transfer-encoding header
-if (http11) {
+// HTTP specs say an HTTP 1.1 server should accept any recognised
+// HTTP 1.x header from a 1.x client unless the specs says otherwise.
+if (!http09) {
 MessageBytes transferEncodingValueMB = 
headers.getValue("transfer-encoding");
 if (transferEncodingValueMB != null) {
 List encodingNames = new ArrayList<>();
diff --git a/test/org/apache/coyote/http11/TestHttp11Processor.java 
b/test/org/apache/coyote/http11/TestHttp11Processor.java
index 74024b4..fe42c3a 100644
--- a/test/org/apache/coyote/http11/TestHttp11Processor.java
+++ b/test/org/apache/coyote/http11/TestHttp11Processor.java
@@ -1904,4 +1904,32 @@ public class TestHttp11Processor extends TomcatBaseTest {
 
 Assert.assertTrue(client.isResponse501());
 }
+
+
+@Test
+public void testWithTEChunkedHttp10() throws Exception {
+
+getTomcatInstanceTestWebapp(false, true);
+
+String request =
+"POST /test/echo-params.jsp HTTP/1.0" + SimpleHttpClient.CRLF +
+"Host: any" + SimpleHttpClient.CRLF +
+"Transfer-encoding: chunked" + SimpleHttpClient.CRLF +
+"Content-Type: application/x-www-form-urlencoded" +
+SimpleHttpClient.CRLF +
+"Connection: close" + SimpleHttpClient.CRLF +
+SimpleHttpClient.CRLF +
+"9" + SimpleHttpClient.CRLF +
+"test=data" + SimpleHttpClient.CRLF +
+"0" + SimpleHttpClient.CRLF +
+SimpleHttpClient.CRLF;
+
+Client client = new Client(getPort());
+client.setRequest(new String[] {request});
+
+client.connect();
+client.processRequest();
+Assert.assertTrue(client.isResponse200());
+Assert.assertTrue(client.getResponseBody().contains("test - data"));
+}
 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3cd3676..76f5b27 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -224,6 +224,10 @@
 in 2001. Requests using this transfer encoding will now receive a 501
 response. (markt)
   
+  
+Process transfer encoding headers from both HTTP 1.0 and HTTP 1.1
+clients. (markt)
+  
 
   
   

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

[tomcat] 01/03: Remove support for the identity T-E header value

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

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

commit 45d70a86a901cbd534f8f570bed2aec9f7f7b88e
Author: Mark Thomas 
AuthorDate: Mon May 10 21:20:46 2021 +0100

Remove support for the identity T-E header value
---
 java/org/apache/coyote/http11/Http11Processor.java |  8 +-
 .../apache/coyote/http11/TestHttp11Processor.java  | 95 --
 webapps/docs/changelog.xml |  6 ++
 3 files changed, 78 insertions(+), 31 deletions(-)

diff --git a/java/org/apache/coyote/http11/Http11Processor.java 
b/java/org/apache/coyote/http11/Http11Processor.java
index b338916..02c9c58 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -212,11 +212,8 @@ public class Http11Processor extends AbstractProcessor {
 
 // Parsing trims and converts to lower case.
 
-if (encodingName.equals("identity")) {
-// Skip
-} else if (encodingName.equals("chunked")) {
-inputBuffer.addActiveFilter
-(inputFilters[Constants.CHUNKED_FILTER]);
+if (encodingName.equals("chunked")) {
+
inputBuffer.addActiveFilter(inputFilters[Constants.CHUNKED_FILTER]);
 contentDelimitation = true;
 } else {
 for (int i = pluggableFilterIndex; i < inputFilters.length; i++) {
@@ -759,7 +756,6 @@ public class Http11Processor extends AbstractProcessor {
 List encodingNames = new ArrayList<>();
 if 
(TokenList.parseTokenList(headers.values("transfer-encoding"), encodingNames)) {
 for (String encodingName : encodingNames) {
-// "identity" codings are ignored
 addInputFilter(inputFilters, encodingName);
 }
 } else {
diff --git a/test/org/apache/coyote/http11/TestHttp11Processor.java 
b/test/org/apache/coyote/http11/TestHttp11Processor.java
index c2bc25a..74024b4 100644
--- a/test/org/apache/coyote/http11/TestHttp11Processor.java
+++ b/test/org/apache/coyote/http11/TestHttp11Processor.java
@@ -254,31 +254,6 @@ public class TestHttp11Processor extends TomcatBaseTest {
 
 
 @Test
-public void testWithTEIdentity() throws Exception {
-getTomcatInstanceTestWebapp(false, true);
-
-String request =
-"POST /test/echo-params.jsp HTTP/1.1" + SimpleHttpClient.CRLF +
-"Host: any" + SimpleHttpClient.CRLF +
-"Transfer-encoding: identity" + SimpleHttpClient.CRLF +
-"Content-Length: 9" + SimpleHttpClient.CRLF +
-"Content-Type: application/x-www-form-urlencoded" +
-SimpleHttpClient.CRLF +
-"Connection: close" + SimpleHttpClient.CRLF +
-SimpleHttpClient.CRLF +
-"test=data";
-
-Client client = new Client(getPort());
-client.setRequest(new String[] {request});
-
-client.connect();
-client.processRequest();
-Assert.assertTrue(client.isResponse200());
-Assert.assertTrue(client.getResponseBody().contains("test - data"));
-}
-
-
-@Test
 public void testWithTESavedRequest() throws Exception {
 getTomcatInstanceTestWebapp(false, true);
 
@@ -1859,4 +1834,74 @@ public class TestHttp11Processor extends TomcatBaseTest {
 // NO-OP
 }
 }
+
+
+@Test
+public void testTEHeaderUnknown01() throws Exception {
+doTestTEHeaderUnknown("identity");
+}
+
+
+@Test
+public void testTEHeaderUnknown02() throws Exception {
+doTestTEHeaderUnknown("identity, chunked");
+}
+
+
+@Test
+public void testTEHeaderUnknown03() throws Exception {
+doTestTEHeaderUnknown("unknown, chunked");
+}
+
+
+@Test
+public void testTEHeaderUnknown04() throws Exception {
+doTestTEHeaderUnknown("void");
+}
+
+
+@Test
+public void testTEHeaderUnknown05() throws Exception {
+doTestTEHeaderUnknown("void, chunked");
+}
+
+
+@Test
+public void testTEHeaderUnknown06() throws Exception {
+doTestTEHeaderUnknown("void, identity");
+}
+
+
+@Test
+public void testTEHeaderUnknown07() throws Exception {
+doTestTEHeaderUnknown("identity, void");
+}
+
+
+private void doTestTEHeaderUnknown(String headerValue) throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+// No file system docBase required
+Context ctx = tomcat.addContext("", null);
+
+// Add servlet
+Tomcat.addServlet(ctx, "TesterServlet", new TesterServlet(false));
+ctx.addServletMappingDecoded("/foo", "TesterServlet");
+
+tomcat.start();
+
+String request =
+"GET /foo HTTP/1.1" + SimpleHttpClient.CRLF +
+"Host: localhost:" + getPort() +

[tomcat] 03/03: Ensure chunked, if present, is the last encoding in the list

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

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

commit a2c3dc4c96168743ac0bab613709a5bbdaec41d0
Author: Mark Thomas 
AuthorDate: Mon May 10 22:14:18 2021 +0100

Ensure chunked, if present, is the last encoding in the list
---
 java/org/apache/coyote/http11/Http11Processor.java | 13 +-
 .../apache/coyote/http11/TestHttp11Processor.java  | 28 +++---
 webapps/docs/changelog.xml |  5 
 3 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/coyote/http11/Http11Processor.java 
b/java/org/apache/coyote/http11/Http11Processor.java
index e2d01f3..34ee0e1 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -209,9 +209,20 @@ public class Http11Processor extends AbstractProcessor {
  * supported, a 501 response will be returned to the client.
  */
 private void addInputFilter(InputFilter[] inputFilters, String 
encodingName) {
+if (contentDelimitation) {
+// Chunked has already been specified and it must be the final
+// encoding.
+// 400 - Bad request
+response.setStatus(400);
+setErrorState(ErrorState.CLOSE_CLEAN, null);
+if (log.isDebugEnabled()) {
+log.debug(sm.getString("http11processor.request.prepare") +
+  " Tranfer encoding lists chunked before [" + 
encodingName + "]");
+}
+return;
+}
 
 // Parsing trims and converts to lower case.
-
 if (encodingName.equals("chunked")) {
 
inputBuffer.addActiveFilter(inputFilters[Constants.CHUNKED_FILTER]);
 contentDelimitation = true;
diff --git a/test/org/apache/coyote/http11/TestHttp11Processor.java 
b/test/org/apache/coyote/http11/TestHttp11Processor.java
index fe42c3a..aaad981 100644
--- a/test/org/apache/coyote/http11/TestHttp11Processor.java
+++ b/test/org/apache/coyote/http11/TestHttp11Processor.java
@@ -1838,47 +1838,53 @@ public class TestHttp11Processor extends TomcatBaseTest 
{
 
 @Test
 public void testTEHeaderUnknown01() throws Exception {
-doTestTEHeaderUnknown("identity");
+doTestTEHeaderInvalid("identity", false);
 }
 
 
 @Test
 public void testTEHeaderUnknown02() throws Exception {
-doTestTEHeaderUnknown("identity, chunked");
+doTestTEHeaderInvalid("identity, chunked", false);
 }
 
 
 @Test
 public void testTEHeaderUnknown03() throws Exception {
-doTestTEHeaderUnknown("unknown, chunked");
+doTestTEHeaderInvalid("unknown, chunked", false);
 }
 
 
 @Test
 public void testTEHeaderUnknown04() throws Exception {
-doTestTEHeaderUnknown("void");
+doTestTEHeaderInvalid("void", false);
 }
 
 
 @Test
 public void testTEHeaderUnknown05() throws Exception {
-doTestTEHeaderUnknown("void, chunked");
+doTestTEHeaderInvalid("void, chunked", false);
 }
 
 
 @Test
 public void testTEHeaderUnknown06() throws Exception {
-doTestTEHeaderUnknown("void, identity");
+doTestTEHeaderInvalid("void, identity", false);
 }
 
 
 @Test
 public void testTEHeaderUnknown07() throws Exception {
-doTestTEHeaderUnknown("identity, void");
+doTestTEHeaderInvalid("identity, void", false);
 }
 
 
-private void doTestTEHeaderUnknown(String headerValue) throws Exception {
+@Test
+public void testTEHeaderChunkedNotLast01() throws Exception {
+doTestTEHeaderInvalid("chunked, void", true);
+}
+
+
+private void doTestTEHeaderInvalid(String headerValue, boolean badRequest) 
throws Exception {
 Tomcat tomcat = getTomcatInstance();
 
 // No file system docBase required
@@ -1902,7 +1908,11 @@ public class TestHttp11Processor extends TomcatBaseTest {
 client.connect();
 client.processRequest(false);
 
-Assert.assertTrue(client.isResponse501());
+if (badRequest) {
+Assert.assertTrue(client.isResponse400());
+} else {
+Assert.assertTrue(client.isResponse501());
+}
 }
 
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 76f5b27..513afaf 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -228,6 +228,11 @@
 Process transfer encoding headers from both HTTP 1.0 and HTTP 1.1
 clients. (markt)
   
+  
+Ensure that if the transfer encoding header contains the
+chunked, that the chunked encoding is the
+final encoding listed. (markt)
+  
 
   
   

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

[tomcat] branch 9.0.x updated (869b403 -> a2c3dc4)

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

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


from 869b403  Treat empty token at end the same way as empty token at 
start/middle
 new 45d70a8  Remove support for the identity T-E header value
 new 05f9e8b  Process T-E header from both HTTP 1.0 and HTTP 1.1. clients
 new a2c3dc4  Ensure chunked, if present, is the last encoding in the list

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


Summary of changes:
 java/org/apache/coyote/http11/Http11Processor.java |  25 ++--
 .../apache/coyote/http11/TestHttp11Processor.java  | 133 +
 webapps/docs/changelog.xml |  15 +++
 3 files changed, 140 insertions(+), 33 deletions(-)

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

[tomcat] 02/03: Process T-E header from both HTTP 1.0 and HTTP 1.1. clients

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

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

commit 506134f957a4be2c5b4a9334f7b3435fc954dbc1
Author: Mark Thomas 
AuthorDate: Mon May 10 21:59:44 2021 +0100

Process T-E header from both HTTP 1.0 and HTTP 1.1. clients
---
 java/org/apache/coyote/http11/Http11Processor.java |  4 +++-
 .../apache/coyote/http11/TestHttp11Processor.java  | 28 ++
 webapps/docs/changelog.xml |  4 
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/http11/Http11Processor.java 
b/java/org/apache/coyote/http11/Http11Processor.java
index 3b8ed2f..2aad58a 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -750,7 +750,9 @@ public class Http11Processor extends AbstractProcessor {
 InputFilter[] inputFilters = inputBuffer.getFilters();
 
 // Parse transfer-encoding header
-if (http11) {
+// HTTP specs say an HTTP 1.1 server should accept any recognised
+// HTTP 1.x header from a 1.x client unless the specs says otherwise.
+if (!http09) {
 MessageBytes transferEncodingValueMB = 
headers.getValue("transfer-encoding");
 if (transferEncodingValueMB != null) {
 List encodingNames = new ArrayList<>();
diff --git a/test/org/apache/coyote/http11/TestHttp11Processor.java 
b/test/org/apache/coyote/http11/TestHttp11Processor.java
index 3287127..1c7d3cc 100644
--- a/test/org/apache/coyote/http11/TestHttp11Processor.java
+++ b/test/org/apache/coyote/http11/TestHttp11Processor.java
@@ -1904,4 +1904,32 @@ public class TestHttp11Processor extends TomcatBaseTest {
 
 Assert.assertTrue(client.isResponse501());
 }
+
+
+@Test
+public void testWithTEChunkedHttp10() throws Exception {
+
+getTomcatInstanceTestWebapp(false, true);
+
+String request =
+"POST /test/echo-params.jsp HTTP/1.0" + SimpleHttpClient.CRLF +
+"Host: any" + SimpleHttpClient.CRLF +
+"Transfer-encoding: chunked" + SimpleHttpClient.CRLF +
+"Content-Type: application/x-www-form-urlencoded" +
+SimpleHttpClient.CRLF +
+"Connection: close" + SimpleHttpClient.CRLF +
+SimpleHttpClient.CRLF +
+"9" + SimpleHttpClient.CRLF +
+"test=data" + SimpleHttpClient.CRLF +
+"0" + SimpleHttpClient.CRLF +
+SimpleHttpClient.CRLF;
+
+Client client = new Client(getPort());
+client.setRequest(new String[] {request});
+
+client.connect();
+client.processRequest();
+Assert.assertTrue(client.isResponse200());
+Assert.assertTrue(client.getResponseBody().contains("test - data"));
+}
 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 05c2ade..a4dc50c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -198,6 +198,10 @@
 in 2001. Requests using this transfer encoding will now receive a 501
 response. (markt)
   
+  
+Process transfer encoding headers from both HTTP 1.0 and HTTP 1.1
+clients. (markt)
+  
 
   
   

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

[tomcat] 03/03: Ensure chunked, if present, is the last encoding in the list

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

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

commit 19d11556d0db99df291df33605f137976d152475
Author: Mark Thomas 
AuthorDate: Mon May 10 22:14:18 2021 +0100

Ensure chunked, if present, is the last encoding in the list
---
 java/org/apache/coyote/http11/Http11Processor.java | 13 +-
 .../apache/coyote/http11/TestHttp11Processor.java  | 28 +++---
 webapps/docs/changelog.xml |  5 
 3 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/coyote/http11/Http11Processor.java 
b/java/org/apache/coyote/http11/Http11Processor.java
index 2aad58a..1886f22 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -209,9 +209,20 @@ public class Http11Processor extends AbstractProcessor {
  * supported, a 501 response will be returned to the client.
  */
 private void addInputFilter(InputFilter[] inputFilters, String 
encodingName) {
+if (contentDelimitation) {
+// Chunked has already been specified and it must be the final
+// encoding.
+// 400 - Bad request
+response.setStatus(400);
+setErrorState(ErrorState.CLOSE_CLEAN, null);
+if (log.isDebugEnabled()) {
+log.debug(sm.getString("http11processor.request.prepare") +
+  " Tranfer encoding lists chunked before [" + 
encodingName + "]");
+}
+return;
+}
 
 // Parsing trims and converts to lower case.
-
 if (encodingName.equals("chunked")) {
 
inputBuffer.addActiveFilter(inputFilters[Constants.CHUNKED_FILTER]);
 contentDelimitation = true;
diff --git a/test/org/apache/coyote/http11/TestHttp11Processor.java 
b/test/org/apache/coyote/http11/TestHttp11Processor.java
index 1c7d3cc..cad207b 100644
--- a/test/org/apache/coyote/http11/TestHttp11Processor.java
+++ b/test/org/apache/coyote/http11/TestHttp11Processor.java
@@ -1838,47 +1838,53 @@ public class TestHttp11Processor extends TomcatBaseTest 
{
 
 @Test
 public void testTEHeaderUnknown01() throws Exception {
-doTestTEHeaderUnknown("identity");
+doTestTEHeaderInvalid("identity", false);
 }
 
 
 @Test
 public void testTEHeaderUnknown02() throws Exception {
-doTestTEHeaderUnknown("identity, chunked");
+doTestTEHeaderInvalid("identity, chunked", false);
 }
 
 
 @Test
 public void testTEHeaderUnknown03() throws Exception {
-doTestTEHeaderUnknown("unknown, chunked");
+doTestTEHeaderInvalid("unknown, chunked", false);
 }
 
 
 @Test
 public void testTEHeaderUnknown04() throws Exception {
-doTestTEHeaderUnknown("void");
+doTestTEHeaderInvalid("void", false);
 }
 
 
 @Test
 public void testTEHeaderUnknown05() throws Exception {
-doTestTEHeaderUnknown("void, chunked");
+doTestTEHeaderInvalid("void, chunked", false);
 }
 
 
 @Test
 public void testTEHeaderUnknown06() throws Exception {
-doTestTEHeaderUnknown("void, identity");
+doTestTEHeaderInvalid("void, identity", false);
 }
 
 
 @Test
 public void testTEHeaderUnknown07() throws Exception {
-doTestTEHeaderUnknown("identity, void");
+doTestTEHeaderInvalid("identity, void", false);
 }
 
 
-private void doTestTEHeaderUnknown(String headerValue) throws Exception {
+@Test
+public void testTEHeaderChunkedNotLast01() throws Exception {
+doTestTEHeaderInvalid("chunked, void", true);
+}
+
+
+private void doTestTEHeaderInvalid(String headerValue, boolean badRequest) 
throws Exception {
 Tomcat tomcat = getTomcatInstance();
 
 // No file system docBase required
@@ -1902,7 +1908,11 @@ public class TestHttp11Processor extends TomcatBaseTest {
 client.connect();
 client.processRequest(false);
 
-Assert.assertTrue(client.isResponse501());
+if (badRequest) {
+Assert.assertTrue(client.isResponse400());
+} else {
+Assert.assertTrue(client.isResponse501());
+}
 }
 
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a4dc50c..f64177c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -202,6 +202,11 @@
 Process transfer encoding headers from both HTTP 1.0 and HTTP 1.1
 clients. (markt)
   
+  
+Ensure that if the transfer encoding header contains the
+chunked, that the chunked encoding is the
+final encoding listed. (markt)
+  
 
   
   

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

[tomcat] 01/03: Remove support for the identity T-E header value

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

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

commit eee0d024c1b3171560c92eaba79dd6eb8eb11bcd
Author: Mark Thomas 
AuthorDate: Mon May 10 21:20:46 2021 +0100

Remove support for the identity T-E header value
---
 java/org/apache/coyote/http11/Http11Processor.java |  8 +-
 .../apache/coyote/http11/TestHttp11Processor.java  | 95 --
 webapps/docs/changelog.xml |  6 ++
 3 files changed, 78 insertions(+), 31 deletions(-)

diff --git a/java/org/apache/coyote/http11/Http11Processor.java 
b/java/org/apache/coyote/http11/Http11Processor.java
index f43efe1..3b8ed2f 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -212,11 +212,8 @@ public class Http11Processor extends AbstractProcessor {
 
 // Parsing trims and converts to lower case.
 
-if (encodingName.equals("identity")) {
-// Skip
-} else if (encodingName.equals("chunked")) {
-inputBuffer.addActiveFilter
-(inputFilters[Constants.CHUNKED_FILTER]);
+if (encodingName.equals("chunked")) {
+
inputBuffer.addActiveFilter(inputFilters[Constants.CHUNKED_FILTER]);
 contentDelimitation = true;
 } else {
 for (int i = pluggableFilterIndex; i < inputFilters.length; i++) {
@@ -759,7 +756,6 @@ public class Http11Processor extends AbstractProcessor {
 List encodingNames = new ArrayList<>();
 if 
(TokenList.parseTokenList(headers.values("transfer-encoding"), encodingNames)) {
 for (String encodingName : encodingNames) {
-// "identity" codings are ignored
 addInputFilter(inputFilters, encodingName);
 }
 } else {
diff --git a/test/org/apache/coyote/http11/TestHttp11Processor.java 
b/test/org/apache/coyote/http11/TestHttp11Processor.java
index b6f7a6b..3287127 100644
--- a/test/org/apache/coyote/http11/TestHttp11Processor.java
+++ b/test/org/apache/coyote/http11/TestHttp11Processor.java
@@ -254,31 +254,6 @@ public class TestHttp11Processor extends TomcatBaseTest {
 
 
 @Test
-public void testWithTEIdentity() throws Exception {
-getTomcatInstanceTestWebapp(false, true);
-
-String request =
-"POST /test/echo-params.jsp HTTP/1.1" + SimpleHttpClient.CRLF +
-"Host: any" + SimpleHttpClient.CRLF +
-"Transfer-encoding: identity" + SimpleHttpClient.CRLF +
-"Content-Length: 9" + SimpleHttpClient.CRLF +
-"Content-Type: application/x-www-form-urlencoded" +
-SimpleHttpClient.CRLF +
-"Connection: close" + SimpleHttpClient.CRLF +
-SimpleHttpClient.CRLF +
-"test=data";
-
-Client client = new Client(getPort());
-client.setRequest(new String[] {request});
-
-client.connect();
-client.processRequest();
-Assert.assertTrue(client.isResponse200());
-Assert.assertTrue(client.getResponseBody().contains("test - data"));
-}
-
-
-@Test
 public void testWithTESavedRequest() throws Exception {
 getTomcatInstanceTestWebapp(false, true);
 
@@ -1859,4 +1834,74 @@ public class TestHttp11Processor extends TomcatBaseTest {
 // NO-OP
 }
 }
+
+
+@Test
+public void testTEHeaderUnknown01() throws Exception {
+doTestTEHeaderUnknown("identity");
+}
+
+
+@Test
+public void testTEHeaderUnknown02() throws Exception {
+doTestTEHeaderUnknown("identity, chunked");
+}
+
+
+@Test
+public void testTEHeaderUnknown03() throws Exception {
+doTestTEHeaderUnknown("unknown, chunked");
+}
+
+
+@Test
+public void testTEHeaderUnknown04() throws Exception {
+doTestTEHeaderUnknown("void");
+}
+
+
+@Test
+public void testTEHeaderUnknown05() throws Exception {
+doTestTEHeaderUnknown("void, chunked");
+}
+
+
+@Test
+public void testTEHeaderUnknown06() throws Exception {
+doTestTEHeaderUnknown("void, identity");
+}
+
+
+@Test
+public void testTEHeaderUnknown07() throws Exception {
+doTestTEHeaderUnknown("identity, void");
+}
+
+
+private void doTestTEHeaderUnknown(String headerValue) throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+// No file system docBase required
+Context ctx = tomcat.addContext("", null);
+
+// Add servlet
+Tomcat.addServlet(ctx, "TesterServlet", new TesterServlet(false));
+ctx.addServletMappingDecoded("/foo", "TesterServlet");
+
+tomcat.start();
+
+String request =
+"GET /foo HTTP/1.1" + SimpleHttpClient.CRLF +
+"Host: localhost:" + getPort() +

[tomcat] branch 10.0.x updated (5be9cff -> 19d1155)

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

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


from 5be9cff  Treat empty token at end the same way as empty token at 
start/middle
 new eee0d02  Remove support for the identity T-E header value
 new 506134f  Process T-E header from both HTTP 1.0 and HTTP 1.1. clients
 new 19d1155  Ensure chunked, if present, is the last encoding in the list

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


Summary of changes:
 java/org/apache/coyote/http11/Http11Processor.java |  25 ++--
 .../apache/coyote/http11/TestHttp11Processor.java  | 133 +
 webapps/docs/changelog.xml |  15 +++
 3 files changed, 140 insertions(+), 33 deletions(-)

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

[tomcat] 02/03: Process T-E header from both HTTP 1.0 and HTTP 1.1. clients

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

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

commit 1692e4e5b1cf810187c5a323e4f4718264519527
Author: Mark Thomas 
AuthorDate: Mon May 10 21:59:44 2021 +0100

Process T-E header from both HTTP 1.0 and HTTP 1.1. clients
---
 java/org/apache/coyote/http11/Http11Processor.java |  4 +++-
 .../apache/coyote/http11/TestHttp11Processor.java  | 28 ++
 webapps/docs/changelog.xml |  4 
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/http11/Http11Processor.java 
b/java/org/apache/coyote/http11/Http11Processor.java
index 3b8ed2f..2aad58a 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -750,7 +750,9 @@ public class Http11Processor extends AbstractProcessor {
 InputFilter[] inputFilters = inputBuffer.getFilters();
 
 // Parse transfer-encoding header
-if (http11) {
+// HTTP specs say an HTTP 1.1 server should accept any recognised
+// HTTP 1.x header from a 1.x client unless the specs says otherwise.
+if (!http09) {
 MessageBytes transferEncodingValueMB = 
headers.getValue("transfer-encoding");
 if (transferEncodingValueMB != null) {
 List encodingNames = new ArrayList<>();
diff --git a/test/org/apache/coyote/http11/TestHttp11Processor.java 
b/test/org/apache/coyote/http11/TestHttp11Processor.java
index 3287127..1c7d3cc 100644
--- a/test/org/apache/coyote/http11/TestHttp11Processor.java
+++ b/test/org/apache/coyote/http11/TestHttp11Processor.java
@@ -1904,4 +1904,32 @@ public class TestHttp11Processor extends TomcatBaseTest {
 
 Assert.assertTrue(client.isResponse501());
 }
+
+
+@Test
+public void testWithTEChunkedHttp10() throws Exception {
+
+getTomcatInstanceTestWebapp(false, true);
+
+String request =
+"POST /test/echo-params.jsp HTTP/1.0" + SimpleHttpClient.CRLF +
+"Host: any" + SimpleHttpClient.CRLF +
+"Transfer-encoding: chunked" + SimpleHttpClient.CRLF +
+"Content-Type: application/x-www-form-urlencoded" +
+SimpleHttpClient.CRLF +
+"Connection: close" + SimpleHttpClient.CRLF +
+SimpleHttpClient.CRLF +
+"9" + SimpleHttpClient.CRLF +
+"test=data" + SimpleHttpClient.CRLF +
+"0" + SimpleHttpClient.CRLF +
+SimpleHttpClient.CRLF;
+
+Client client = new Client(getPort());
+client.setRequest(new String[] {request});
+
+client.connect();
+client.processRequest();
+Assert.assertTrue(client.isResponse200());
+Assert.assertTrue(client.getResponseBody().contains("test - data"));
+}
 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3b68e94..c852c95 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -219,6 +219,10 @@
 in 2001. Requests using this transfer encoding will now receive a 501
 response. (markt)
   
+  
+Process transfer encoding headers from both HTTP 1.0 and HTTP 1.1
+clients. (markt)
+  
 
   
   

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

[tomcat] 01/03: Remove support for the identity T-E header value

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

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

commit c3bd168427cadc1b860791c1f2204fe03c2cb740
Author: Mark Thomas 
AuthorDate: Mon May 10 21:20:46 2021 +0100

Remove support for the identity T-E header value
---
 java/org/apache/coyote/http11/Http11Processor.java |  8 +-
 .../apache/coyote/http11/TestHttp11Processor.java  | 95 --
 webapps/docs/changelog.xml |  6 ++
 3 files changed, 78 insertions(+), 31 deletions(-)

diff --git a/java/org/apache/coyote/http11/Http11Processor.java 
b/java/org/apache/coyote/http11/Http11Processor.java
index f43efe1..3b8ed2f 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -212,11 +212,8 @@ public class Http11Processor extends AbstractProcessor {
 
 // Parsing trims and converts to lower case.
 
-if (encodingName.equals("identity")) {
-// Skip
-} else if (encodingName.equals("chunked")) {
-inputBuffer.addActiveFilter
-(inputFilters[Constants.CHUNKED_FILTER]);
+if (encodingName.equals("chunked")) {
+
inputBuffer.addActiveFilter(inputFilters[Constants.CHUNKED_FILTER]);
 contentDelimitation = true;
 } else {
 for (int i = pluggableFilterIndex; i < inputFilters.length; i++) {
@@ -759,7 +756,6 @@ public class Http11Processor extends AbstractProcessor {
 List encodingNames = new ArrayList<>();
 if 
(TokenList.parseTokenList(headers.values("transfer-encoding"), encodingNames)) {
 for (String encodingName : encodingNames) {
-// "identity" codings are ignored
 addInputFilter(inputFilters, encodingName);
 }
 } else {
diff --git a/test/org/apache/coyote/http11/TestHttp11Processor.java 
b/test/org/apache/coyote/http11/TestHttp11Processor.java
index b6f7a6b..3287127 100644
--- a/test/org/apache/coyote/http11/TestHttp11Processor.java
+++ b/test/org/apache/coyote/http11/TestHttp11Processor.java
@@ -254,31 +254,6 @@ public class TestHttp11Processor extends TomcatBaseTest {
 
 
 @Test
-public void testWithTEIdentity() throws Exception {
-getTomcatInstanceTestWebapp(false, true);
-
-String request =
-"POST /test/echo-params.jsp HTTP/1.1" + SimpleHttpClient.CRLF +
-"Host: any" + SimpleHttpClient.CRLF +
-"Transfer-encoding: identity" + SimpleHttpClient.CRLF +
-"Content-Length: 9" + SimpleHttpClient.CRLF +
-"Content-Type: application/x-www-form-urlencoded" +
-SimpleHttpClient.CRLF +
-"Connection: close" + SimpleHttpClient.CRLF +
-SimpleHttpClient.CRLF +
-"test=data";
-
-Client client = new Client(getPort());
-client.setRequest(new String[] {request});
-
-client.connect();
-client.processRequest();
-Assert.assertTrue(client.isResponse200());
-Assert.assertTrue(client.getResponseBody().contains("test - data"));
-}
-
-
-@Test
 public void testWithTESavedRequest() throws Exception {
 getTomcatInstanceTestWebapp(false, true);
 
@@ -1859,4 +1834,74 @@ public class TestHttp11Processor extends TomcatBaseTest {
 // NO-OP
 }
 }
+
+
+@Test
+public void testTEHeaderUnknown01() throws Exception {
+doTestTEHeaderUnknown("identity");
+}
+
+
+@Test
+public void testTEHeaderUnknown02() throws Exception {
+doTestTEHeaderUnknown("identity, chunked");
+}
+
+
+@Test
+public void testTEHeaderUnknown03() throws Exception {
+doTestTEHeaderUnknown("unknown, chunked");
+}
+
+
+@Test
+public void testTEHeaderUnknown04() throws Exception {
+doTestTEHeaderUnknown("void");
+}
+
+
+@Test
+public void testTEHeaderUnknown05() throws Exception {
+doTestTEHeaderUnknown("void, chunked");
+}
+
+
+@Test
+public void testTEHeaderUnknown06() throws Exception {
+doTestTEHeaderUnknown("void, identity");
+}
+
+
+@Test
+public void testTEHeaderUnknown07() throws Exception {
+doTestTEHeaderUnknown("identity, void");
+}
+
+
+private void doTestTEHeaderUnknown(String headerValue) throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+// No file system docBase required
+Context ctx = tomcat.addContext("", null);
+
+// Add servlet
+Tomcat.addServlet(ctx, "TesterServlet", new TesterServlet(false));
+ctx.addServletMappingDecoded("/foo", "TesterServlet");
+
+tomcat.start();
+
+String request =
+"GET /foo HTTP/1.1" + SimpleHttpClient.CRLF +
+"Host: localhost:" + getPort() +

[tomcat] 03/03: Ensure chunked, if present, is the last encoding in the list

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

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

commit be8f733b8c51156c5d9c1a1e5530df9e0730f0a7
Author: Mark Thomas 
AuthorDate: Mon May 10 22:14:18 2021 +0100

Ensure chunked, if present, is the last encoding in the list
---
 java/org/apache/coyote/http11/Http11Processor.java | 13 +-
 .../apache/coyote/http11/TestHttp11Processor.java  | 28 +++---
 webapps/docs/changelog.xml |  5 
 3 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/coyote/http11/Http11Processor.java 
b/java/org/apache/coyote/http11/Http11Processor.java
index 2aad58a..1886f22 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -209,9 +209,20 @@ public class Http11Processor extends AbstractProcessor {
  * supported, a 501 response will be returned to the client.
  */
 private void addInputFilter(InputFilter[] inputFilters, String 
encodingName) {
+if (contentDelimitation) {
+// Chunked has already been specified and it must be the final
+// encoding.
+// 400 - Bad request
+response.setStatus(400);
+setErrorState(ErrorState.CLOSE_CLEAN, null);
+if (log.isDebugEnabled()) {
+log.debug(sm.getString("http11processor.request.prepare") +
+  " Tranfer encoding lists chunked before [" + 
encodingName + "]");
+}
+return;
+}
 
 // Parsing trims and converts to lower case.
-
 if (encodingName.equals("chunked")) {
 
inputBuffer.addActiveFilter(inputFilters[Constants.CHUNKED_FILTER]);
 contentDelimitation = true;
diff --git a/test/org/apache/coyote/http11/TestHttp11Processor.java 
b/test/org/apache/coyote/http11/TestHttp11Processor.java
index 1c7d3cc..cad207b 100644
--- a/test/org/apache/coyote/http11/TestHttp11Processor.java
+++ b/test/org/apache/coyote/http11/TestHttp11Processor.java
@@ -1838,47 +1838,53 @@ public class TestHttp11Processor extends TomcatBaseTest 
{
 
 @Test
 public void testTEHeaderUnknown01() throws Exception {
-doTestTEHeaderUnknown("identity");
+doTestTEHeaderInvalid("identity", false);
 }
 
 
 @Test
 public void testTEHeaderUnknown02() throws Exception {
-doTestTEHeaderUnknown("identity, chunked");
+doTestTEHeaderInvalid("identity, chunked", false);
 }
 
 
 @Test
 public void testTEHeaderUnknown03() throws Exception {
-doTestTEHeaderUnknown("unknown, chunked");
+doTestTEHeaderInvalid("unknown, chunked", false);
 }
 
 
 @Test
 public void testTEHeaderUnknown04() throws Exception {
-doTestTEHeaderUnknown("void");
+doTestTEHeaderInvalid("void", false);
 }
 
 
 @Test
 public void testTEHeaderUnknown05() throws Exception {
-doTestTEHeaderUnknown("void, chunked");
+doTestTEHeaderInvalid("void, chunked", false);
 }
 
 
 @Test
 public void testTEHeaderUnknown06() throws Exception {
-doTestTEHeaderUnknown("void, identity");
+doTestTEHeaderInvalid("void, identity", false);
 }
 
 
 @Test
 public void testTEHeaderUnknown07() throws Exception {
-doTestTEHeaderUnknown("identity, void");
+doTestTEHeaderInvalid("identity, void", false);
 }
 
 
-private void doTestTEHeaderUnknown(String headerValue) throws Exception {
+@Test
+public void testTEHeaderChunkedNotLast01() throws Exception {
+doTestTEHeaderInvalid("chunked, void", true);
+}
+
+
+private void doTestTEHeaderInvalid(String headerValue, boolean badRequest) 
throws Exception {
 Tomcat tomcat = getTomcatInstance();
 
 // No file system docBase required
@@ -1902,7 +1908,11 @@ public class TestHttp11Processor extends TomcatBaseTest {
 client.connect();
 client.processRequest(false);
 
-Assert.assertTrue(client.isResponse501());
+if (badRequest) {
+Assert.assertTrue(client.isResponse400());
+} else {
+Assert.assertTrue(client.isResponse501());
+}
 }
 
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c852c95..5e670b2 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -223,6 +223,11 @@
 Process transfer encoding headers from both HTTP 1.0 and HTTP 1.1
 clients. (markt)
   
+  
+Ensure that if the transfer encoding header contains the
+chunked, that the chunked encoding is the
+final encoding listed. (markt)
+  
 
   
   

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

[tomcat] branch main updated (157487d -> be8f733)

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

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


from 157487d  Treat empty token at end the same way as empty token at 
start/middle
 new c3bd168  Remove support for the identity T-E header value
 new 1692e4e  Process T-E header from both HTTP 1.0 and HTTP 1.1. clients
 new be8f733  Ensure chunked, if present, is the last encoding in the list

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


Summary of changes:
 java/org/apache/coyote/http11/Http11Processor.java |  25 ++--
 .../apache/coyote/http11/TestHttp11Processor.java  | 133 +
 webapps/docs/changelog.xml |  15 +++
 3 files changed, 140 insertions(+), 33 deletions(-)

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

[tomcat] branch 8.5.x updated: Treat empty token at end the same way as empty token at start/middle

2021-06-08 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 1971c76  Treat empty token at end the same way as empty token at 
start/middle
1971c76 is described below

commit 1971c7699aa44cd32244cc50ee036af56bc249d2
Author: Mark Thomas 
AuthorDate: Tue Jun 8 11:27:33 2021 +0100

Treat empty token at end the same way as empty token at start/middle
---
 .../apache/tomcat/util/http/parser/TokenList.java  |  3 ++-
 .../tomcat/util/http/parser/TestTokenList.java | 29 ++
 webapps/docs/changelog.xml |  6 +
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/http/parser/TokenList.java 
b/java/org/apache/tomcat/util/http/parser/TokenList.java
index 0ab7ce1..01ac449 100644
--- a/java/org/apache/tomcat/util/http/parser/TokenList.java
+++ b/java/org/apache/tomcat/util/http/parser/TokenList.java
@@ -84,7 +84,8 @@ public class TokenList {
 }
 
 if (fieldName.length() == 0) {
-// No more data to read
+// Unexpected EOF. Should have been a token.
+invalid = true;
 break;
 }
 
diff --git a/test/org/apache/tomcat/util/http/parser/TestTokenList.java 
b/test/org/apache/tomcat/util/http/parser/TestTokenList.java
index fc06eb6..99fcdb8 100644
--- a/test/org/apache/tomcat/util/http/parser/TestTokenList.java
+++ b/test/org/apache/tomcat/util/http/parser/TestTokenList.java
@@ -199,4 +199,33 @@ public class TestTokenList {
 Assert.assertFalse(result);
 }
 
+
+@Test
+public void testMultipleWithEmptyStart() throws IOException {
+Set expected = new HashSet<>();
+expected.add("bar");
+expected.add("foo");
+expected.add("host");
+doTestVary(",Host, Foo, Bar", expected, false);
+}
+
+
+@Test
+public void testMultipleWithEmptyMiddle() throws IOException {
+Set expected = new HashSet<>();
+expected.add("bar");
+expected.add("foo");
+expected.add("host");
+doTestVary("Host, Foo,,Bar", expected, false);
+}
+
+
+@Test
+public void testMultipleWithEmptyEnd() throws IOException {
+Set expected = new HashSet<>();
+expected.add("bar");
+expected.add("foo");
+expected.add("host");
+doTestVary("Host, Foo, Bar,", expected, false);
+}
 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d37bcaf..6bd5459 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -200,6 +200,12 @@
   
 Add debug logging for HTTP/2 HPACK header decoding. (markt)
   
+  
+Correct parsing of HTTP headers consisting of a list of tokens so that 
a
+header with an empty token is treated consistently regardless of 
whether
+the empty token is at the start, middle or end of the list of tokens.
+(markt)
+  
 
   
   

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

[tomcat] branch 9.0.x updated: Treat empty token at end the same way as empty token at start/middle

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 869b403  Treat empty token at end the same way as empty token at 
start/middle
869b403 is described below

commit 869b403f279543c182fa90ab58ee04604e439feb
Author: Mark Thomas 
AuthorDate: Tue Jun 8 11:27:33 2021 +0100

Treat empty token at end the same way as empty token at start/middle
---
 .../apache/tomcat/util/http/parser/TokenList.java  |  3 ++-
 .../tomcat/util/http/parser/TestTokenList.java | 29 ++
 webapps/docs/changelog.xml |  6 +
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/http/parser/TokenList.java 
b/java/org/apache/tomcat/util/http/parser/TokenList.java
index 0ab7ce1..01ac449 100644
--- a/java/org/apache/tomcat/util/http/parser/TokenList.java
+++ b/java/org/apache/tomcat/util/http/parser/TokenList.java
@@ -84,7 +84,8 @@ public class TokenList {
 }
 
 if (fieldName.length() == 0) {
-// No more data to read
+// Unexpected EOF. Should have been a token.
+invalid = true;
 break;
 }
 
diff --git a/test/org/apache/tomcat/util/http/parser/TestTokenList.java 
b/test/org/apache/tomcat/util/http/parser/TestTokenList.java
index 6e3cbba..22f4d49 100644
--- a/test/org/apache/tomcat/util/http/parser/TestTokenList.java
+++ b/test/org/apache/tomcat/util/http/parser/TestTokenList.java
@@ -197,4 +197,33 @@ public class TestTokenList {
 Assert.assertFalse(result);
 }
 
+
+@Test
+public void testMultipleWithEmptyStart() throws IOException {
+Set expected = new HashSet<>();
+expected.add("bar");
+expected.add("foo");
+expected.add("host");
+doTestVary(",Host, Foo, Bar", expected, false);
+}
+
+
+@Test
+public void testMultipleWithEmptyMiddle() throws IOException {
+Set expected = new HashSet<>();
+expected.add("bar");
+expected.add("foo");
+expected.add("host");
+doTestVary("Host, Foo,,Bar", expected, false);
+}
+
+
+@Test
+public void testMultipleWithEmptyEnd() throws IOException {
+Set expected = new HashSet<>();
+expected.add("bar");
+expected.add("foo");
+expected.add("host");
+doTestVary("Host, Foo, Bar,", expected, false);
+}
 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1ea53e9..b21fad0 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -212,6 +212,12 @@
   
 Add debug logging for HTTP/2 HPACK header decoding. (markt)
   
+  
+Correct parsing of HTTP headers consisting of a list of tokens so that 
a
+header with an empty token is treated consistently regardless of 
whether
+the empty token is at the start, middle or end of the list of tokens.
+(markt)
+  
 
   
   

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

[tomcat] branch 10.0.x updated: Treat empty token at end the same way as empty token at start/middle

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

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new 5be9cff  Treat empty token at end the same way as empty token at 
start/middle
5be9cff is described below

commit 5be9cff97a457001bb16e58860be979762315c39
Author: Mark Thomas 
AuthorDate: Tue Jun 8 11:27:33 2021 +0100

Treat empty token at end the same way as empty token at start/middle
---
 .../apache/tomcat/util/http/parser/TokenList.java  |  3 ++-
 .../tomcat/util/http/parser/TestTokenList.java | 29 ++
 webapps/docs/changelog.xml |  6 +
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/http/parser/TokenList.java 
b/java/org/apache/tomcat/util/http/parser/TokenList.java
index 0ab7ce1..01ac449 100644
--- a/java/org/apache/tomcat/util/http/parser/TokenList.java
+++ b/java/org/apache/tomcat/util/http/parser/TokenList.java
@@ -84,7 +84,8 @@ public class TokenList {
 }
 
 if (fieldName.length() == 0) {
-// No more data to read
+// Unexpected EOF. Should have been a token.
+invalid = true;
 break;
 }
 
diff --git a/test/org/apache/tomcat/util/http/parser/TestTokenList.java 
b/test/org/apache/tomcat/util/http/parser/TestTokenList.java
index 43ea16d..a1415c4 100644
--- a/test/org/apache/tomcat/util/http/parser/TestTokenList.java
+++ b/test/org/apache/tomcat/util/http/parser/TestTokenList.java
@@ -190,4 +190,33 @@ public class TestTokenList {
 Assert.assertFalse(result);
 }
 
+
+@Test
+public void testMultipleWithEmptyStart() throws IOException {
+Set expected = new HashSet<>();
+expected.add("bar");
+expected.add("foo");
+expected.add("host");
+doTestVary(",Host, Foo, Bar", expected, false);
+}
+
+
+@Test
+public void testMultipleWithEmptyMiddle() throws IOException {
+Set expected = new HashSet<>();
+expected.add("bar");
+expected.add("foo");
+expected.add("host");
+doTestVary("Host, Foo,,Bar", expected, false);
+}
+
+
+@Test
+public void testMultipleWithEmptyEnd() throws IOException {
+Set expected = new HashSet<>();
+expected.add("bar");
+expected.add("foo");
+expected.add("host");
+doTestVary("Host, Foo, Bar,", expected, false);
+}
 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 72d4445..07dd8b5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -186,6 +186,12 @@
   
 Add debug logging for HTTP/2 HPACK header decoding. (markt)
   
+  
+Correct parsing of HTTP headers consisting of a list of tokens so that 
a
+header with an empty token is treated consistently regardless of 
whether
+the empty token is at the start, middle or end of the list of tokens.
+(markt)
+  
 
   
   

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

[tomcat] branch main updated: Treat empty token at end the same way as empty token at start/middle

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

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


The following commit(s) were added to refs/heads/main by this push:
 new 157487d  Treat empty token at end the same way as empty token at 
start/middle
157487d is described below

commit 157487d425734a37ac32fe709ff20b8f6d8fe4e4
Author: Mark Thomas 
AuthorDate: Tue Jun 8 11:27:33 2021 +0100

Treat empty token at end the same way as empty token at start/middle
---
 .../apache/tomcat/util/http/parser/TokenList.java  |  3 ++-
 .../tomcat/util/http/parser/TestTokenList.java | 29 ++
 webapps/docs/changelog.xml |  6 +
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/http/parser/TokenList.java 
b/java/org/apache/tomcat/util/http/parser/TokenList.java
index 0ab7ce1..01ac449 100644
--- a/java/org/apache/tomcat/util/http/parser/TokenList.java
+++ b/java/org/apache/tomcat/util/http/parser/TokenList.java
@@ -84,7 +84,8 @@ public class TokenList {
 }
 
 if (fieldName.length() == 0) {
-// No more data to read
+// Unexpected EOF. Should have been a token.
+invalid = true;
 break;
 }
 
diff --git a/test/org/apache/tomcat/util/http/parser/TestTokenList.java 
b/test/org/apache/tomcat/util/http/parser/TestTokenList.java
index 43ea16d..a1415c4 100644
--- a/test/org/apache/tomcat/util/http/parser/TestTokenList.java
+++ b/test/org/apache/tomcat/util/http/parser/TestTokenList.java
@@ -190,4 +190,33 @@ public class TestTokenList {
 Assert.assertFalse(result);
 }
 
+
+@Test
+public void testMultipleWithEmptyStart() throws IOException {
+Set expected = new HashSet<>();
+expected.add("bar");
+expected.add("foo");
+expected.add("host");
+doTestVary(",Host, Foo, Bar", expected, false);
+}
+
+
+@Test
+public void testMultipleWithEmptyMiddle() throws IOException {
+Set expected = new HashSet<>();
+expected.add("bar");
+expected.add("foo");
+expected.add("host");
+doTestVary("Host, Foo,,Bar", expected, false);
+}
+
+
+@Test
+public void testMultipleWithEmptyEnd() throws IOException {
+Set expected = new HashSet<>();
+expected.add("bar");
+expected.add("foo");
+expected.add("host");
+doTestVary("Host, Foo, Bar,", expected, false);
+}
 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 650533d..3cb74a3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -207,6 +207,12 @@
   
 Add debug logging for HTTP/2 HPACK header decoding. (markt)
   
+  
+Correct parsing of HTTP headers consisting of a list of tokens so that 
a
+header with an empty token is treated consistently regardless of 
whether
+the empty token is at the start, middle or end of the list of tokens.
+(markt)
+  
 
   
   

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

buildbot exception in on tomcat-8.5.x

2021-06-08 Thread buildbot 
The Buildbot has detected a build exception on builder tomcat-8.5.x while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-8.5.x/builds/21

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

Buildslave for this Build: asf946_ubuntu

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

BUILD FAILED: exception compile upload_2

Sincerely,
 -The Buildbot




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

[tomcat] branch 10.0.x updated: Fix 65332 - javac permissions with Java 9 onwards for JSPs

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

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new 6d34eb6  Fix 65332 - javac permissions with Java 9 onwards for JSPs
6d34eb6 is described below

commit 6d34eb633371931480aecb59895c45b018d17408
Author: Mark Thomas 
AuthorDate: Tue Jun 8 09:39:16 2021 +0100

Fix 65332 - javac permissions with Java 9 onwards for JSPs

https://bz.apache.org/bugzilla/show_bug.cgi?id=65332
---
 conf/catalina.policy   | 7 ++-
 webapps/docs/changelog.xml | 7 +++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/conf/catalina.policy b/conf/catalina.policy
index 2e6f8df..91b7c83 100644
--- a/conf/catalina.policy
+++ b/conf/catalina.policy
@@ -50,9 +50,14 @@ grant codeBase "file:${java.home}/lib/ext/-" {
 permission java.security.AllPermission;
 };
 
+// This permission is required when using javac to compile JSPs on Java 9
+// onwards
+//grant codeBase "jrt:/jdk.compiler" {
+//permission java.security.AllPermission;
+//};
 
-// == CATALINA CODE PERMISSIONS ===
 
+// == CATALINA CODE PERMISSIONS ===
 
 // These permissions apply to the daemon code
 grant codeBase "file:${catalina.home}/bin/commons-daemon.jar" {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1501001..72d4445 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -218,6 +218,13 @@
 parameters, the method that requires the fewest varargs is preferred.
 (markt)
   
+  
+65332: Add a commented out section in
+catalina.policy that provides the necessary permissions to
+compile JSPs with javac when running on Java 9 onwards with a security
+manager. It is commented out as it will cause errors if used with
+earlier Java versions. (markt)
+  
 
   
   

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

buildbot failure in on tomcat-10.0.x

2021-06-08 Thread buildbot 
The Buildbot has detected a new failure on builder tomcat-10.0.x while building 
tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-10.0.x/builds/37

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

Buildslave for this Build: asf946_ubuntu

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

BUILD FAILED: failed shell_8

Sincerely,
 -The Buildbot




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

[Bug 65332] AccessControlException when using Ant instead of ECJ to compile JSPs at runtime

2021-06-08 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=65332

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #2 from Mark Thomas  ---
Comment added in
- 10.1.x for 10.1.0-M1 onwards
- 10.0.x for 10.0.7 onwards
- 9.0.x for 9.0.47 onwards
- 8.5.x for 8.5.67 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

[tomcat] branch 8.5.x updated: Fix 65332 - javac permissions with Java 9 onwards for JSPs

2021-06-08 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 a3bd927  Fix 65332 - javac permissions with Java 9 onwards for JSPs
a3bd927 is described below

commit a3bd927ff223bf06925771e1f9d5986af0427f45
Author: Mark Thomas 
AuthorDate: Tue Jun 8 09:39:16 2021 +0100

Fix 65332 - javac permissions with Java 9 onwards for JSPs

https://bz.apache.org/bugzilla/show_bug.cgi?id=65332
---
 conf/catalina.policy   | 7 ++-
 webapps/docs/changelog.xml | 7 +++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/conf/catalina.policy b/conf/catalina.policy
index 0567324..5cfab09 100644
--- a/conf/catalina.policy
+++ b/conf/catalina.policy
@@ -50,9 +50,14 @@ grant codeBase "file:${java.home}/lib/ext/-" {
 permission java.security.AllPermission;
 };
 
+// This permission is required when using javac to compile JSPs on Java 9
+// onwards
+//grant codeBase "jrt:/jdk.compiler" {
+//permission java.security.AllPermission;
+//};
 
-// == CATALINA CODE PERMISSIONS ===
 
+// == CATALINA CODE PERMISSIONS ===
 
 // These permissions apply to the daemon code
 grant codeBase "file:${catalina.home}/bin/commons-daemon.jar" {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 38b27ca..d37bcaf 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -218,6 +218,13 @@
 parameters, the method that requires the fewest varargs is preferred.
 (markt)
   
+  
+65332: Add a commented out section in
+catalina.policy that provides the necessary permissions to
+compile JSPs with javac when running on Java 9 onwards with a security
+manager. It is commented out as it will cause errors if used with
+earlier Java versions. (markt)
+  
 
   
   

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

[tomcat] branch 9.0.x updated: Fix 65332 - javac permissions with Java 9 onwards for JSPs

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 09b1f9a  Fix 65332 - javac permissions with Java 9 onwards for JSPs
09b1f9a is described below

commit 09b1f9a3deb9345e095f331d65367e3561a0cbd4
Author: Mark Thomas 
AuthorDate: Tue Jun 8 09:39:16 2021 +0100

Fix 65332 - javac permissions with Java 9 onwards for JSPs

https://bz.apache.org/bugzilla/show_bug.cgi?id=65332
---
 conf/catalina.policy   | 7 ++-
 webapps/docs/changelog.xml | 7 +++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/conf/catalina.policy b/conf/catalina.policy
index 2e6f8df..91b7c83 100644
--- a/conf/catalina.policy
+++ b/conf/catalina.policy
@@ -50,9 +50,14 @@ grant codeBase "file:${java.home}/lib/ext/-" {
 permission java.security.AllPermission;
 };
 
+// This permission is required when using javac to compile JSPs on Java 9
+// onwards
+//grant codeBase "jrt:/jdk.compiler" {
+//permission java.security.AllPermission;
+//};
 
-// == CATALINA CODE PERMISSIONS ===
 
+// == CATALINA CODE PERMISSIONS ===
 
 // These permissions apply to the daemon code
 grant codeBase "file:${catalina.home}/bin/commons-daemon.jar" {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 47af7b8..1ea53e9 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -230,6 +230,13 @@
 parameters, the method that requires the fewest varargs is preferred.
 (markt)
   
+  
+65332: Add a commented out section in
+catalina.policy that provides the necessary permissions to
+compile JSPs with javac when running on Java 9 onwards with a security
+manager. It is commented out as it will cause errors if used with
+earlier Java versions. (markt)
+  
 
   
   

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

[tomcat] 02/02: Fix 65332 - javac permissions with Java 9 onwards for JSPs

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

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

commit 5669c3507c266bd29f40cd373f8eb9ad1ed5c93e
Author: Mark Thomas 
AuthorDate: Tue Jun 8 09:39:16 2021 +0100

Fix 65332 - javac permissions with Java 9 onwards for JSPs

https://bz.apache.org/bugzilla/show_bug.cgi?id=65332
---
 conf/catalina.policy   | 7 ++-
 webapps/docs/changelog.xml | 7 +++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/conf/catalina.policy b/conf/catalina.policy
index 2e6f8df..91b7c83 100644
--- a/conf/catalina.policy
+++ b/conf/catalina.policy
@@ -50,9 +50,14 @@ grant codeBase "file:${java.home}/lib/ext/-" {
 permission java.security.AllPermission;
 };
 
+// This permission is required when using javac to compile JSPs on Java 9
+// onwards
+//grant codeBase "jrt:/jdk.compiler" {
+//permission java.security.AllPermission;
+//};
 
-// == CATALINA CODE PERMISSIONS ===
 
+// == CATALINA CODE PERMISSIONS ===
 
 // These permissions apply to the daemon code
 grant codeBase "file:${catalina.home}/bin/commons-daemon.jar" {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 6e5387f..650533d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -253,6 +253,13 @@
 parameters, the method that requires the fewest varargs is preferred.
 (markt)
   
+  
+65332: Add a commented out section in
+catalina.policy that provides the necessary permissions to
+compile JSPs with javac when running on Java 9 onwards with a security
+manager. It is commented out as it will cause errors if used with
+earlier Java versions. (markt)
+  
 
   
   

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

[tomcat] 01/02: Fix typo

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

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

commit 644156817cde3919b644b64412304efa99ca973c
Author: Mark Thomas 
AuthorDate: Tue Jun 8 09:35:21 2021 +0100

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

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index bd4d78f..6e5387f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -108,7 +108,7 @@
   
 
   
-This release contains all of the changes upto and including those in
+This release contains all of the changes up to and including those in
 Apache Tomcat 10.0.6 plus the additional changes listed below. (markt)
   
   

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

[tomcat] branch main updated (a5f3488 -> 5669c35)

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

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


from a5f3488  Update to Tomcat Native 1.2.30
 new 6441568  Fix typo
 new 5669c35  Fix 65332 - javac permissions with Java 9 onwards for JSPs

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:
 conf/catalina.policy   | 7 ++-
 webapps/docs/changelog.xml | 9 -
 2 files changed, 14 insertions(+), 2 deletions(-)

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

[tomcat] branch 8.5.x updated: Update to Tomcat Native 1.2.30

2021-06-08 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 744b0fd  Update to Tomcat Native 1.2.30
744b0fd is described below

commit 744b0fd7834705cf1b293717226dd780c3e8466b
Author: Mark Thomas 
AuthorDate: Tue Jun 8 09:28:26 2021 +0100

Update to Tomcat Native 1.2.30
---
 build.properties.default| 6 +++---
 java/org/apache/catalina/core/AprLifecycleListener.java | 2 +-
 webapps/docs/changelog.xml  | 4 
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index a6b05fd..dd478e5 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -151,13 +151,13 @@ 
jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj
 
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
 
 # - Tomcat native library -
-tomcat-native.version=1.2.28
+tomcat-native.version=1.2.30
 tomcat-native.src.checksum.enabled=true
 tomcat-native.src.checksum.algorithm=SHA-512
-tomcat-native.src.checksum.value=16b8659dcd228ea153d05c9ae19e3d97add944315f3b8b42905162d0e4e8a28fd51a172d59d7da8508271ecad0b8ac025a386895565acaf8e2ba11fba77492bb
+tomcat-native.src.checksum.value=51a8c55214de166cace193c3330abe77cabea56c2d05efc8c3408bc06369c328899376c94c572725ebe2887f2faf99fea05d1819fa84c712d57fd309d0476953
 tomcat-native.win.checksum.enabled=true
 tomcat-native.win.checksum.algorithm=SHA-512
-tomcat-native.win.checksum.value=a0a7c05ca1b2b873456e2331232f9752b52af23a205e61d14905e0779f4c517563438b45fc36b1a81803f67d47b39e77009e4a4e892a3fd0e548398ed9a69dc3
+tomcat-native.win.checksum.value=ce84edcec3b5a89b0c30951bb8832695a657e7558bceece8e92551644773d0f763369951d9d043dbf52653f4e37238d8d53555ae58cc0017bf777b447d00f603
 tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
 tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
 
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java 
b/java/org/apache/catalina/core/AprLifecycleListener.java
index c1a9a51..99a84bd 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -67,7 +67,7 @@ public class AprLifecycleListener
 protected static final int TCN_REQUIRED_MINOR = 2;
 protected static final int TCN_REQUIRED_PATCH = 14;
 protected static final int TCN_RECOMMENDED_MINOR = 2;
-protected static final int TCN_RECOMMENDED_PV = 23;
+protected static final int TCN_RECOMMENDED_PV = 30;
 
 
 // -- Properties
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 141adac..38b27ca 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -252,6 +252,10 @@
   
 Improvements to Korean translations. (woonsan)
   
+  
+Update the packaged version of the Tomcat Native Library to 1.2.30. 
Also
+update the minimum recommended version to 1.2.30. (markt)
+  
 
   
 

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

[tomcat] branch 9.0.x updated: Update to Tomcat Native 1.2.30

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 556b37a  Update to Tomcat Native 1.2.30
556b37a is described below

commit 556b37a57adb8066878358d0831c48ae7c822fae
Author: Mark Thomas 
AuthorDate: Tue Jun 8 09:28:26 2021 +0100

Update to Tomcat Native 1.2.30
---
 build.properties.default| 6 +++---
 java/org/apache/catalina/core/AprLifecycleListener.java | 2 +-
 webapps/docs/changelog.xml  | 4 
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index df908a4..79e40b3 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -147,13 +147,13 @@ 
jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj
 
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
 
 # - Tomcat native library -
-tomcat-native.version=1.2.28
+tomcat-native.version=1.2.30
 tomcat-native.src.checksum.enabled=true
 tomcat-native.src.checksum.algorithm=SHA-512
-tomcat-native.src.checksum.value=16b8659dcd228ea153d05c9ae19e3d97add944315f3b8b42905162d0e4e8a28fd51a172d59d7da8508271ecad0b8ac025a386895565acaf8e2ba11fba77492bb
+tomcat-native.src.checksum.value=51a8c55214de166cace193c3330abe77cabea56c2d05efc8c3408bc06369c328899376c94c572725ebe2887f2faf99fea05d1819fa84c712d57fd309d0476953
 tomcat-native.win.checksum.enabled=true
 tomcat-native.win.checksum.algorithm=SHA-512
-tomcat-native.win.checksum.value=a0a7c05ca1b2b873456e2331232f9752b52af23a205e61d14905e0779f4c517563438b45fc36b1a81803f67d47b39e77009e4a4e892a3fd0e548398ed9a69dc3
+tomcat-native.win.checksum.value=ce84edcec3b5a89b0c30951bb8832695a657e7558bceece8e92551644773d0f763369951d9d043dbf52653f4e37238d8d53555ae58cc0017bf777b447d00f603
 tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
 tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
 
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java 
b/java/org/apache/catalina/core/AprLifecycleListener.java
index 6fd0e32..b8ad718 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -66,7 +66,7 @@ public class AprLifecycleListener
 protected static final int TCN_REQUIRED_MINOR = 2;
 protected static final int TCN_REQUIRED_PATCH = 14;
 protected static final int TCN_RECOMMENDED_MINOR = 2;
-protected static final int TCN_RECOMMENDED_PV = 23;
+protected static final int TCN_RECOMMENDED_PV = 30;
 
 
 // -- Properties
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 62e328b..47af7b8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -270,6 +270,10 @@
 manifests for Jakarta API JARs manually rather bnd annotations did not
 add the necessary manual entries to the embedded JARs. (markt)
   
+  
+Update the packaged version of the Tomcat Native Library to 1.2.30. 
Also
+update the minimum recommended version to 1.2.30. (markt)
+  
 
   
 

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

[tomcat] branch 10.0.x updated: Update to Tomcat Native 1.2.30

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

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new 847a093  Update to Tomcat Native 1.2.30
847a093 is described below

commit 847a0933c4e45d56dfc7a8b994f44df90337b8eb
Author: Mark Thomas 
AuthorDate: Tue Jun 8 09:28:26 2021 +0100

Update to Tomcat Native 1.2.30
---
 build.properties.default| 6 +++---
 java/org/apache/catalina/core/AprLifecycleListener.java | 2 +-
 webapps/docs/changelog.xml  | 4 
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index f1bd57b..b42d483 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -147,13 +147,13 @@ 
jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj
 
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
 
 # - Tomcat native library -
-tomcat-native.version=1.2.28
+tomcat-native.version=1.2.30
 tomcat-native.src.checksum.enabled=true
 tomcat-native.src.checksum.algorithm=SHA-512
-tomcat-native.src.checksum.value=16b8659dcd228ea153d05c9ae19e3d97add944315f3b8b42905162d0e4e8a28fd51a172d59d7da8508271ecad0b8ac025a386895565acaf8e2ba11fba77492bb
+tomcat-native.src.checksum.value=51a8c55214de166cace193c3330abe77cabea56c2d05efc8c3408bc06369c328899376c94c572725ebe2887f2faf99fea05d1819fa84c712d57fd309d0476953
 tomcat-native.win.checksum.enabled=true
 tomcat-native.win.checksum.algorithm=SHA-512
-tomcat-native.win.checksum.value=a0a7c05ca1b2b873456e2331232f9752b52af23a205e61d14905e0779f4c517563438b45fc36b1a81803f67d47b39e77009e4a4e892a3fd0e548398ed9a69dc3
+tomcat-native.win.checksum.value=ce84edcec3b5a89b0c30951bb8832695a657e7558bceece8e92551644773d0f763369951d9d043dbf52653f4e37238d8d53555ae58cc0017bf777b447d00f603
 tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
 tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
 
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java 
b/java/org/apache/catalina/core/AprLifecycleListener.java
index 2837033..2f6194c 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -66,7 +66,7 @@ public class AprLifecycleListener
 protected static final int TCN_REQUIRED_MINOR = 2;
 protected static final int TCN_REQUIRED_PATCH = 14;
 protected static final int TCN_RECOMMENDED_MINOR = 2;
-protected static final int TCN_RECOMMENDED_PV = 23;
+protected static final int TCN_RECOMMENDED_PV = 30;
 
 
 // -- Properties
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8490f71..1501001 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -262,6 +262,10 @@
 manifests for Jakarta API JARs manually rather bnd annotations did not
 add the necessary manual entries to the embedded JARs. (markt)
   
+  
+Update the packaged version of the Tomcat Native Library to 1.2.30. 
Also
+update the minimum recommended version to 1.2.30. (markt)
+  
 
   
 

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

[tomcat] branch main updated: Update to Tomcat Native 1.2.30

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

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


The following commit(s) were added to refs/heads/main by this push:
 new a5f3488  Update to Tomcat Native 1.2.30
a5f3488 is described below

commit a5f348856d6e89f9f9eea91691c750aa7d9d8965
Author: Mark Thomas 
AuthorDate: Tue Jun 8 09:28:26 2021 +0100

Update to Tomcat Native 1.2.30
---
 build.properties.default| 6 +++---
 java/org/apache/catalina/core/AprLifecycleListener.java | 2 +-
 webapps/docs/changelog.xml  | 4 
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 3437d88..4bb4928 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -147,13 +147,13 @@ 
jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj
 
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
 
 # - Tomcat native library -
-tomcat-native.version=1.2.28
+tomcat-native.version=1.2.30
 tomcat-native.src.checksum.enabled=true
 tomcat-native.src.checksum.algorithm=SHA-512
-tomcat-native.src.checksum.value=16b8659dcd228ea153d05c9ae19e3d97add944315f3b8b42905162d0e4e8a28fd51a172d59d7da8508271ecad0b8ac025a386895565acaf8e2ba11fba77492bb
+tomcat-native.src.checksum.value=51a8c55214de166cace193c3330abe77cabea56c2d05efc8c3408bc06369c328899376c94c572725ebe2887f2faf99fea05d1819fa84c712d57fd309d0476953
 tomcat-native.win.checksum.enabled=true
 tomcat-native.win.checksum.algorithm=SHA-512
-tomcat-native.win.checksum.value=a0a7c05ca1b2b873456e2331232f9752b52af23a205e61d14905e0779f4c517563438b45fc36b1a81803f67d47b39e77009e4a4e892a3fd0e548398ed9a69dc3
+tomcat-native.win.checksum.value=ce84edcec3b5a89b0c30951bb8832695a657e7558bceece8e92551644773d0f763369951d9d043dbf52653f4e37238d8d53555ae58cc0017bf777b447d00f603
 tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
 tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
 
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java 
b/java/org/apache/catalina/core/AprLifecycleListener.java
index 2837033..2f6194c 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -66,7 +66,7 @@ public class AprLifecycleListener
 protected static final int TCN_REQUIRED_MINOR = 2;
 protected static final int TCN_REQUIRED_PATCH = 14;
 protected static final int TCN_RECOMMENDED_MINOR = 2;
-protected static final int TCN_RECOMMENDED_PV = 23;
+protected static final int TCN_RECOMMENDED_PV = 30;
 
 
 // -- Properties
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f750d60..bd4d78f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -297,6 +297,10 @@
 manifests for Jakarta API JARs manually rather bnd annotations did not
 add the necessary manual entries to the embedded JARs. (markt)
   
+  
+Update the packaged version of the Tomcat Native Library to 1.2.30. 
Also
+update the minimum recommended version to 1.2.30. (markt)
+  
 
   
 

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

[Bug 65365] HTTP Tunneling (Forward Proxy) Support

2021-06-08 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=65365

Mark Thomas  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution|--- |WONTFIX

--- Comment #3 from Mark Thomas  ---
Of course. The URI normalization checks fail. And even if they didn't you can't
map the CONNECT request to a servlet.

This isn't possible to implement for a Servlet based web application.

With a CONNECT request, there is no URI so there is no ability to map a request
to a virtual host, web application and servlet.

It should be possible to implement this in Tomcat with a custom protocol
implementation.

I can't think of any good reason to write a forward proxy based on Tomcat.
Writing spec compliant, secure HTTP proxies is hard and there are already
implementations available such as httpd.

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