[Bug 65995] Change JavaScript MIME type from application/javascript to text/javascript

[bugzilla]

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

matthias.kel...@ergon.ch changed:

   What|Removed |Added

 CC||matthias.kel...@ergon.ch

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

Re: [VOTE] Release Apache Tomcat 10.1.0-M19

[Han Li]

> 2022年9月14日 01:09，Mark Thomas  写道：
> 
> The proposed Apache Tomcat 10.1.0-M19 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.
> 
> The notable changes compared to 10.1.0-M17 are:
> 
> - Add support for authenticating WebSocket clients with an HTTP forward
>  proxy when establishing a connection to a WebSocket endpoint via a
>  forward proxy that requires authentication. Based on a patch provided
>  by Joe Mokos.
> 
> - Various fixes for edge case bugs in EL processing
> 
> - Improve host header handling for HTTP/2 requests
> 
> For full details, see the change log:
> https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/changelog.html
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.0-M19/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1389
> 
> The tag is:
> https://github.com/apache/tomcat/tree/10.1.0-M19
> ff0b6c231b7a1a416688346fdd299a3d6cfb5b64
> 
> 
> The proposed 10.1.0-M19 release is:
> [ ] Broken - do not release
> [ X] Beta - go ahead and release as 10.1.0-M19 (beta)

Unit tests pass with Tomcat Native 2.0.1 and OpenSSL 3.0.5 on macOS 12.3.1.

Han

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


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

[GitHub] [tomcat] aooohan closed pull request #552: UTF-8 makes Non-English Windows Console garbled

[GitBox]

aooohan closed pull request #552: UTF-8 makes Non-English Windows Console 
garbled
URL: https://github.com/apache/tomcat/pull/552


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


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

Re: [VOTE] Release Apache Tomcat 10.1.0-M19

[Mark Thomas]

On 13/09/2022 19:09, Mark Thomas wrote:

On 13/09/2022 18:51, Konstantin Kolinko wrote:

вт, 13 сент. 2022 г. в 20:09, Mark Thomas :


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

[...]

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.0-M19/


*.asc files are missing at dist.a.o
They were missing for 10.1.0-M18 release candidate as well.


Thanks for catching this.

I think I know what is going on but I need to test my theory. I'll get 
the signatures generated shortly. If my theory is correct, this will be 
a good opportunity to test the repeatability of the build.


I guessed wrong. The issue was I wasn't defining gpg.exec.

The good news is that I did a complete rebuild with gpg.exec defined and 
the repeatability of the build meant I could copy the new build over the 
svn checkout of dist and since the files were identical it just added 
the asc files.


I should have fixed this for future releases.

Mark

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

svn commit: r56807 - in /dev/tomcat/tomcat-10/v10.1.0-M19: bin/ bin/embed/ src/

[markt]

Author: markt
Date: Tue Sep 13 18:42:00 2022
New Revision: 56807

Log:
Add sigs

Added:

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

dev/tomcat/tomcat-10/v10.1.0-M19/bin/apache-tomcat-10.1.0-M19-deployer.zip.asc

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

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

dev/tomcat/tomcat-10/v10.1.0-M19/bin/apache-tomcat-10.1.0-M19-windows-x86.zip.asc
dev/tomcat/tomcat-10/v10.1.0-M19/bin/apache-tomcat-10.1.0-M19.exe.asc
dev/tomcat/tomcat-10/v10.1.0-M19/bin/apache-tomcat-10.1.0-M19.tar.gz.asc
dev/tomcat/tomcat-10/v10.1.0-M19/bin/apache-tomcat-10.1.0-M19.zip.asc

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

dev/tomcat/tomcat-10/v10.1.0-M19/bin/embed/apache-tomcat-10.1.0-M19-embed.zip.asc
dev/tomcat/tomcat-10/v10.1.0-M19/src/apache-tomcat-10.1.0-M19-src.tar.gz.asc
dev/tomcat/tomcat-10/v10.1.0-M19/src/apache-tomcat-10.1.0-M19-src.zip.asc

Added: 
dev/tomcat/tomcat-10/v10.1.0-M19/bin/apache-tomcat-10.1.0-M19-deployer.tar.gz.asc
==
--- 
dev/tomcat/tomcat-10/v10.1.0-M19/bin/apache-tomcat-10.1.0-M19-deployer.tar.gz.asc
 (added)
+++ 
dev/tomcat/tomcat-10/v10.1.0-M19/bin/apache-tomcat-10.1.0-M19-deployer.tar.gz.asc
 Tue Sep 13 18:42:00 2022
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAmMgyooACgkQEMAcWi9g
+Wef9MhAAlCEZCl1hQ03/wo3+Ae9goUhhmwqh1eX2q8BFYzxMCjzQD5ITw1S9/One
+K6zDGARBh+eav6IlypXmrhfpJiT98fpTj0f8udL9ymn0iBCBoRP+Ny3Kq87uT2d0
+3GbhnS0AmyTsGvhzCxhDP2RQ4sthtsFOX1raU1M/S8NiAAtGbfvQbk6ZZ3co8gER
+nRYXAVS0ZGH+LeXf0QGw/NNFNPIkI7XE9UKyWYaoLBqJCon8x2/sZkpk4dO8zwb+
+vB2So5TcIZzKXeCnfV521NWwGBHJmjt+POe+7TwudTScUZ/WHuJZWoCc0QGzZkIL
+IEROxaIXC/3BgxsBqHGfH1eQ+wYBJuAphdvfJwnJvuj18kyERnlPahfVYuDfLb2n
+XdD8qXtmYxNkXEbTeGUw4FZuNPRjxjADsVE6p1rF6qC0KeuRYBNt/Kc8smPDr3jj
+trQkqhiU/LXGsRaZUszHWzHUFMLis35F7lTQGq7N0/UPwHT3OxmPF7VpleqXBHfx
+OJqfT8lCBIaCv50NHGoA/stttgUplJJGRtrCMAtgRfFh6xaA1E4MSmUGUVceg+s3
+aAvWYM03Nq+2J40OVNvSi1zLjcZJIaevFO2WSNCjpR/bkFHG2pTCeB0nX0cY1ndV
+Ifc2ilOJBd+lrf6dk2/GAaOiKBLkvecFy033yB0XDOVMMyOHsJU=
+=sSJr
+-END PGP SIGNATURE-

Added: 
dev/tomcat/tomcat-10/v10.1.0-M19/bin/apache-tomcat-10.1.0-M19-deployer.zip.asc
==
--- 
dev/tomcat/tomcat-10/v10.1.0-M19/bin/apache-tomcat-10.1.0-M19-deployer.zip.asc 
(added)
+++ 
dev/tomcat/tomcat-10/v10.1.0-M19/bin/apache-tomcat-10.1.0-M19-deployer.zip.asc 
Tue Sep 13 18:42:00 2022
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAmMgyoQACgkQEMAcWi9g
+Weeo1A//bBLQS5n1CdeOtq+lFLB1ODDRNc3mFwK1/dgX3GbqH2h6Nm/334XRJj81
+dDJ83veWSyqaSTn2bkIazuFvMY4fwsauLOGjaqfdZdVbgP7/AtAfR2tPJ8AccyhJ
+5q6pZE+8UU3qkI1JWzOtw7UQw0AYBGtEiatGsW60mPXb9OsAIAHSoUEJxpGJT2sW
+Q8z7gDSzsOS8pQu5lXTq4VY4bLXNskG/qtkyrRUvltSsLOlMK7c8B1LcXAV0aG0+
+pk42GR3B0/xvqMCdQ9VOiPF5MukxTlntSwwF/CNiq/oSm1oY4k9Sal2wra2ehjwp
+0YDdFJpD5rYLJMJSXk3smmWz7C6Sm/qSnSZAKd0l/DufMR8GylOTGElToIe/HvXK
+nqm2iUlIm0YSEpe/DSDaDPUBiz7oUZF34v2AxHDm34Pn2M2yacS3Ki5k6usTyDpE
+DKaqtwDHBMgJWma7zqZq1mdmY6r9+y9074jFWw2uUL6wFfMqmo7BVuPxgkHe2IMn
+Wrtbpa6+t7NEDoSgzP7mT/zmh3zocvjs/EgwKzk0L1uWgF+afzcGTIaPaM4Sz+Bz
+YDRkyH4DrjHjaqlnjCraHLtD1EgwxzDw1jw3D3kgoSjtbyz3kTdIL0MYJn97xvlw
+aC+yWyPy3V/UV6cIvM/R7Chrepz12vVttJizfRL1A4GtbjPBLTw=
+=nA7W
+-END PGP SIGNATURE-

Added: 
dev/tomcat/tomcat-10/v10.1.0-M19/bin/apache-tomcat-10.1.0-M19-fulldocs.tar.gz.asc
==
--- 
dev/tomcat/tomcat-10/v10.1.0-M19/bin/apache-tomcat-10.1.0-M19-fulldocs.tar.gz.asc
 (added)
+++ 
dev/tomcat/tomcat-10/v10.1.0-M19/bin/apache-tomcat-10.1.0-M19-fulldocs.tar.gz.asc
 Tue Sep 13 18:42:00 2022
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAmMgy3MACgkQEMAcWi9g
+Wed+vg/7BYbIfF1vKQPASB2szVDdgjRr3OQisOsiLQOTWIssPNZELPqmykUNzl55
+/lv4S5DpHKaRv/vuJYHOthcGIAI4RHBUL28lf9NNwITFg0S2o5rqAdRdgWBLg9Jo
+FgLrrgc5PR9DljmbqW95JkWD2HxdDtwuN8vhUY2q0J63namHrc7jWJBOyzf+jF1O
+h0G6EQAvddSbtbVaEaqoPSHRUZrAKGbQmrAwWqJWYz4jtULbpehgsgFNfd2VUZyX
+VeIbSebxqdndD4WuyUFrC4lw1pXEyxzbF8N2DgUv67FNjf0KGgusS8bbo1T1eeFz
+O6OWG4UJllu5oYlQ2F76DH1UityRqU+RV/ch8ZGXdj4cdHHlSeqsXJvpvu5HJj0Z
+7gdwZPnNL3xEn6fNzHnd//N5TvBz/Jcn3eCHgr6zAIIqq4q9i+gE2FS++Kr8Zj2S
+vObQ1e3wNaeNwt9SqVAmxerqqnYXI9FukfRPB/VnUQSxJRydT6erj/wcqujxheRG
+Z4ih4zgbXvQ3MG+Dpo9pRApRX7UC7/HcicVI431UygG8c4717QTepxfqsfPaq6DG
+5OMn3AKTXjpyxphBB12+bX1wVC5gkGYtB6bT79PfOKz5fpPDItB7HOO79PtSg8ge
+t+ewzxk1/5fsx19BwQVQ6wjQ7b4v/3BT65UszaMhWKB4DloNFgw=
+=01Vp
+-END PGP SIGNATURE-

Added: 
dev/tomcat/tomcat-10/v10.1.0-M19/bin/apache-tomcat-10.1.0-M19-windows-x64.zip.asc
==
--- 
dev/tomcat/tomcat

Re: [VOTE] Release Apache Tomcat 10.1.0-M19

[Mark Thomas]

On 13/09/2022 18:51, Konstantin Kolinko wrote:

вт, 13 сент. 2022 г. в 20:09, Mark Thomas :


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

[...]

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.0-M19/


*.asc files are missing at dist.a.o
They were missing for 10.1.0-M18 release candidate as well.


Thanks for catching this.

I think I know what is going on but I need to test my theory. I'll get 
the signatures generated shortly. If my theory is correct, this will be 
a good opportunity to test the repeatability of the build.


Mark




apache-tomcat-10.1.0-M19.exe is signed, OK.


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


*.asc files are present in the Maven staging area, OK


The tag is:
https://github.com/apache/tomcat/tree/10.1.0-M19
ff0b6c231b7a1a416688346fdd299a3d6cfb5b64


The proposed 10.1.0-M19 release is:
[ ] Broken - do not release
[ ] Beta - go ahead and release as 10.1.0-M19 (beta)


Best regards,
Konstantin Kolinko

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



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

Re: [VOTE] Release Apache Tomcat 10.1.0-M19

[Konstantin Kolinko]

вт, 13 сент. 2022 г. в 20:09, Mark Thomas :
>
> The proposed Apache Tomcat 10.1.0-M19 release is now available for
> voting.
>
> [...]
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.0-M19/

*.asc files are missing at dist.a.o
They were missing for 10.1.0-M18 release candidate as well.

apache-tomcat-10.1.0-M19.exe is signed, OK.

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

*.asc files are present in the Maven staging area, OK

> The tag is:
> https://github.com/apache/tomcat/tree/10.1.0-M19
> ff0b6c231b7a1a416688346fdd299a3d6cfb5b64
>
>
> The proposed 10.1.0-M19 release is:
> [ ] Broken - do not release
> [ ] Beta - go ahead and release as 10.1.0-M19 (beta)

Best regards,
Konstantin Kolinko

-
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 for next dev cycle

[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 225eb3029e Increment version for next dev cycle
225eb3029e is described below

commit 225eb3029e5afade5f691fe98da0dd8328bb8633
Author: Mark Thomas 
AuthorDate: Tue Sep 13 18:10:45 2022 +0100

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

diff --git a/build.properties.default b/build.properties.default
index 387743c61a..8e48f133f8 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -33,7 +33,7 @@ version.major=10
 version.minor=1
 version.build=0
 version.patch=0
-version.suffix=-M19
+version.suffix=-M20
 version.dev=-dev
 
 # - Build tools -
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index ca8184d506..6ef98696e9 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-M19
+maven.asf.release.deploy.version=10.1.0-M20
 
 #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 1fccd0a066..853a97e332 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-M19

[Mark Thomas]

The proposed Apache Tomcat 10.1.0-M19 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.


The notable changes compared to 10.1.0-M17 are:

- Add support for authenticating WebSocket clients with an HTTP forward
  proxy when establishing a connection to a WebSocket endpoint via a
  forward proxy that requires authentication. Based on a patch provided
  by Joe Mokos.

- Various fixes for edge case bugs in EL processing

- Improve host header handling for HTTP/2 requests

For full details, see the change log:
https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/changelog.html

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.0-M19/

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

The tag is:
https://github.com/apache/tomcat/tree/10.1.0-M19
ff0b6c231b7a1a416688346fdd299a3d6cfb5b64


The proposed 10.1.0-M19 release is:
[ ] Broken - do not release
[ ] Beta - go ahead and release as 10.1.0-M19 (beta)

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

svn commit: r56805 - in /dev/tomcat/tomcat-10/v10.1.0-M19: ./ bin/ bin/embed/ src/

[markt]

Author: markt
Date: Tue Sep 13 17:03:46 2022
New Revision: 56805

Log:
Upload 10.1.0-M19 for voting

Added:
dev/tomcat/tomcat-10/v10.1.0-M19/
dev/tomcat/tomcat-10/v10.1.0-M19/KEYS
dev/tomcat/tomcat-10/v10.1.0-M19/README.html
dev/tomcat/tomcat-10/v10.1.0-M19/RELEASE-NOTES
dev/tomcat/tomcat-10/v10.1.0-M19/bin/
dev/tomcat/tomcat-10/v10.1.0-M19/bin/README.html

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

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

dev/tomcat/tomcat-10/v10.1.0-M19/bin/apache-tomcat-10.1.0-M19-deployer.zip.sha512

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

dev/tomcat/tomcat-10/v10.1.0-M19/bin/apache-tomcat-10.1.0-M19-fulldocs.tar.gz.sha512

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

dev/tomcat/tomcat-10/v10.1.0-M19/bin/apache-tomcat-10.1.0-M19-windows-x64.zip.sha512

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

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

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

dev/tomcat/tomcat-10/v10.1.0-M19/bin/embed/apache-tomcat-10.1.0-M19-embed.tar.gz.sha512

dev/tomcat/tomcat-10/v10.1.0-M19/bin/embed/apache-tomcat-10.1.0-M19-embed.zip   
(with props)

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

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

Added: dev/tomcat/tomcat-10/v10.1.0-M19/KEYS
==
--- dev/tomcat/tomcat-10/v10.1.0-M19/KEYS (added)
+++ dev/tomcat/tomcat-10/v10.1.0-M19/KEYS Tue Sep 13 17:03:46 2022
@@ -0,0 +1,453 @@
+This file contains the PGP&GPG 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).
+
+
+pub   4096R/2F6059E7 2009-09-18
+  Key fingerprint = A9C5 DF4D 22E9 9998 D987  5A51 10C0 1C5A 2F60 59E7
+uid  Mark E D Thomas 
+sub   4096R/5E763BEC 2009-09-18
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Comment: GPGTools - http://gpgtools.org
+
+mQINBEq0DukBEAD4jovHOPJDxoD+JnO1Go2kiwpgRULasGlrVKuSUdP6wzcaqWmX
+pqtOJKKwW2MQFQLmg7nQ9RjJwy3QCbKNDJQA/bwbQT1F7WzTCz2S6vxC4zxKck4t
+6RZBq2dJsYKF0CEh6ZfY4dmKvhq+3istSoFRdHYoOPGWZpuRDqfZPdGm/m335/6K
+GH59oysn1NE7a2a+kZzjBSEgv23+l4Z1Rg7+fpz1JcdHSdC2Z+ZRxML25eVatRVz
+4yvDOZItqDURP24zWOodxgboldV6Y88C3v/7KRR+1vklzkuA2FqF8Q4r/2f0su7M
+UVviQcy29y/RlLSDTTYoVlCZ1ni14qFU7Hpw43KJtgXmcUwq31T1+SlXdYjNJ1aF
+kUi8BjCHDcSgE/IReKUanjHzm4XSymKDTeqqzidi4k6PDD4jyHb8k8vxi6qT6Udn
+lcfo5NBkkUT1TauhEy8ktHhbl9k60BvvMBP9l6cURiJg1WS77egI4P/82oPbzzFi
+GFqXyJKULVgxtdQ3JikCpodp3f1fh6PlYZwkW4xCJLJucJ5MiQp07HAkMVW5w+k8
+Xvuk4i5quh3N+2kzKHOOiQCDmN0sz0XjOE+7XBvM1lvz3+UarLfgSVmW8aheLd7e
+aIl5ItBk8844ZJ60LrQ+JiIqvqJemxyIM6epoZvY5a3ZshZpcLilC5hW8QARAQAB
+tCJNYXJrIEUgRCBUaG9tYXMgPG1hcmt0QGFwYWNoZS5vcmc+iQI3BBMBCgAhBQJK
+tA7pAhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJEBDAHFovYFnn2YgQAKN6
+FLG/I1Ij3PUlC/XNlhasQxPeE3w2OvttweOQPYkblJ9nHtGH5pNqG2/qoGShlpI0
+4jJy9GxWKOo7NV4v7M0mbVlCXVgjdlvMFWdL7lnocggwJAFejQcYlVtxyhu4m50L
+BvBunEhxCbQcKnnWmkB7Ocm0Ictaqjc9rCc1F/aNhVMUpJ0zG1kyTp9hxvN6TbCQ
+lacMx5ocTWzL0zn6QZhbUfrYwfxYJmSnkVYZOYzXIXIsLN5sJ9Q4P8tjY4qWgd+b
+QvOqPWrkzL9LVRnGOrSYIsoM5zWdoj1g1glMzK/ZqJdRqqqBhe6FYTbXipz8oX8i
+mCebcaxZnfLhGiqqX+yDa3YUwDiqom+sZOc0iXGvKkqltPLpNeF0MVT7aZjalsQ/
+v2Ysb24RQl9FfjfWmvT8ZPWz8Kore1AI4UcIIgFVtM+zuLlL9CIsGjg+gHDE2dhZ
+DY0qfizlHL9CoAWUDM3pIfxM2V4BRn1xO+

[tomcat] 01/01: Tag 10.1.0-M19

[markt]

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

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

commit ff0b6c231b7a1a416688346fdd299a3d6cfb5b64
Author: Mark Thomas 
AuthorDate: Tue Sep 13 17:40:08 2022 +0100

Tag 10.1.0-M19
---
 build.properties.release |  49 +++
 res/install-win/Uninstall.exe.sig| Bin 0 -> 10253 bytes
 res/install-win/tomcat-installer.exe.sig | Bin 0 -> 10253 bytes
 res/maven/mvn.properties.release |  27 +
 webapps/docs/changelog.xml   |   2 +-
 5 files changed, 77 insertions(+), 1 deletion(-)

diff --git a/build.properties.release b/build.properties.release
new file mode 100644
index 00..cc459d702d
--- /dev/null
+++ b/build.properties.release
@@ -0,0 +1,49 @@
+# -
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -
+
+# This file was auto-generated by the pre-release Ant target.
+
+# Any unwanted settings may be over-ridden in a build.properties file located
+# in the same directory as this file.
+
+# Set the version-dev to "" (empty string) as this is not a development 
release.
+version.dev=
+
+# Ensure consistent timestamps for reproducible builds.
+ant.tstamp.now.iso=2022-09-13T16:26:35Z
+
+# Enable insertion of detatched signatures into the Windows installer.
+do.codesigning=true
+
+# Reproducible builds require the use of the build tools defined below. The
+# vendors (where appropriate) and versions must match exactly for a 
reproducible
+# build since this data is embedded in various files, particularly JAR file
+# manifests, as part of the build process.
+#
+# Apache Ant:  Apache Ant(TM) version 1.10.12 compiled on October 13 2021
+#
+# Java Name:   OpenJDK 64-Bit Server VM
+# Java Vendor: Eclipse Adoptium
+# Java Version:11.0.15+10
+
+# The following is provided for information only. Builds will be repeatable
+# whether or not the build ennvironment in consistent with this information.
+#
+# OS:  amd64 Windows Server 2022 10.0
+# File encoding:   Cp1252
+#
+# Release Manager: markt
diff --git a/res/install-win/Uninstall.exe.sig 
b/res/install-win/Uninstall.exe.sig
new file mode 100644
index 00..c125cd3d55
Binary files /dev/null and b/res/install-win/Uninstall.exe.sig differ
diff --git a/res/install-win/tomcat-installer.exe.sig 
b/res/install-win/tomcat-installer.exe.sig
new file mode 100644
index 00..c499cef81e
Binary files /dev/null and b/res/install-win/tomcat-installer.exe.sig differ
diff --git a/res/maven/mvn.properties.release b/res/maven/mvn.properties.release
new file mode 100644
index 00..701af6875b
--- /dev/null
+++ b/res/maven/mvn.properties.release
@@ -0,0 +1,27 @@
+# -
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -
+
+# This file was auto-generated by the pre-release Ant target.
+
+# Remove "-dev" from the version since this is not a development release.
+maven.asf.release.deploy.version=10.1.0-M19
+
+# Re-use the same GPG executable.
+gpg.exec=C:/Program Files (x86)/GnuPG/bin/gpg.exe
+
+# Set the user name to use to upload the artefacts to Nexus.
+asf.ldap.username=markt
di

[tomcat] tag 10.1.0-M19 created (now ff0b6c231b)

[markt]

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

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


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

 new ff0b6c231b Tag 10.1.0-M19

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

svn commit: r56804 - /dev/tomcat/tomcat-10/v10.1.0-M18/

[markt]

Author: markt
Date: Tue Sep 13 16:26:09 2022
New Revision: 56804

Log:
Drop 10.1.0-M18

Removed:
dev/tomcat/tomcat-10/v10.1.0-M18/


-
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: Correct a regression in the previous fix for BZ 66236

[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 7aa03bdea8 Correct a regression in the previous fix for BZ 66236
7aa03bdea8 is described below

commit 7aa03bdea82da0294c8ad3d88f7a69b7f2c14d0a
Author: Mark Thomas 
AuthorDate: Tue Sep 13 16:35:24 2022 +0100

Correct a regression in the previous fix for BZ 66236

https://bz.apache.org/bugzilla/show_bug.cgi?id=66236
---
 java/org/apache/coyote/http11/Http11Processor.java |  2 +-
 .../coyote/http11/filters/BufferedInputFilter.java | 37 ++
 .../coyote/http11/filters/IdentityInputFilter.java |  6 +---
 3 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/java/org/apache/coyote/http11/Http11Processor.java 
b/java/org/apache/coyote/http11/Http11Processor.java
index d7d23fe58a..e13ab36690 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -213,7 +213,7 @@ public class Http11Processor extends AbstractProcessor {
 outputBuffer.addFilter(new VoidOutputFilter());
 
 // Create and add buffered input filter
-inputBuffer.addFilter(new BufferedInputFilter());
+inputBuffer.addFilter(new 
BufferedInputFilter(protocol.getMaxSwallowSize()));
 
 // Create and add the gzip filters.
 //inputBuffer.addFilter(new GzipInputFilter());
diff --git a/java/org/apache/coyote/http11/filters/BufferedInputFilter.java 
b/java/org/apache/coyote/http11/filters/BufferedInputFilter.java
index 34321b351a..2f6a1ae76b 100644
--- a/java/org/apache/coyote/http11/filters/BufferedInputFilter.java
+++ b/java/org/apache/coyote/http11/filters/BufferedInputFilter.java
@@ -33,13 +33,14 @@ import org.apache.tomcat.util.net.ApplicationBufferHandler;
  */
 public class BufferedInputFilter implements InputFilter, 
ApplicationBufferHandler {
 
-// -- Constants
-
 private static final String ENCODING_NAME = "buffered";
 private static final ByteChunk ENCODING = new ByteChunk();
 
 
-// - Instance Variables
+static {
+ENCODING.setBytes(ENCODING_NAME.getBytes(StandardCharsets.ISO_8859_1), 
0, ENCODING_NAME.length());
+}
+
 
 // Use ByteChunk since it correctly handles the special buffer size of -1
 // for maxSavePostSize.
@@ -48,15 +49,13 @@ public class BufferedInputFilter implements InputFilter, 
ApplicationBufferHandle
 private InputBuffer buffer;
 private boolean hasRead = false;
 
+private final int maxSwallowSize;
 
-// - Static Initializer
 
-static {
-ENCODING.setBytes(ENCODING_NAME.getBytes(StandardCharsets.ISO_8859_1),
-0, ENCODING_NAME.length());
+public BufferedInputFilter(int maxSwallowSize) {
+this.maxSwallowSize = maxSwallowSize;
 }
 
-
 // - Public Methods
 
 
@@ -82,14 +81,24 @@ public class BufferedInputFilter implements InputFilter, 
ApplicationBufferHandle
  */
 @Override
 public void setRequest(Request request) {
-if (buffered.getLimit() == 0) {
-return;
-}
 // save off the Request body
 try {
-while (buffer.doRead(this) >= 0) {
-buffered.append(tempRead);
-tempRead = null;
+if (buffered.getLimit() == 0) {
+// Special case - ignore (swallow) body. Do so within a limit.
+long swallowed = 0;
+int read = 0;
+while ((read = buffer.doRead(this)) >= 0) {
+swallowed += read;
+if (maxSwallowSize > -1 && swallowed > maxSwallowSize) {
+// No need for i18n - this isn't going to get logged
+throw new IOException("Ignored body exceeded 
maxSwallowSize");
+}
+}
+} else {
+while (buffer.doRead(this) >= 0) {
+buffered.append(tempRead);
+tempRead = null;
+}
 }
 } catch(IOException | BufferOverflowException ioe) {
 // No need for i18n - this isn't going to get logged anywhere
diff --git a/java/org/apache/coyote/http11/filters/IdentityInputFilter.java 
b/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
index e6ff1f96ba..2380bc53e6 100644
--- a/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
+++ b/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
@@ -34,20 +34,17 @@ import org.apache.tomcat.util.res.StringManager;
  */
 public class IdentityInputFilter implements InputFilter, 
ApplicationBuf

[tomcat] branch 9.0.x updated: Correct a regression in the previous fix for BZ 66236

[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 fe527f5a8b Correct a regression in the previous fix for BZ 66236
fe527f5a8b is described below

commit fe527f5a8b90ab42edc6d641108814ba6008d98d
Author: Mark Thomas 
AuthorDate: Tue Sep 13 16:35:24 2022 +0100

Correct a regression in the previous fix for BZ 66236

https://bz.apache.org/bugzilla/show_bug.cgi?id=66236
---
 java/org/apache/coyote/http11/Http11Processor.java |  2 +-
 .../coyote/http11/filters/BufferedInputFilter.java | 37 ++
 .../coyote/http11/filters/IdentityInputFilter.java |  6 +---
 3 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/java/org/apache/coyote/http11/Http11Processor.java 
b/java/org/apache/coyote/http11/Http11Processor.java
index 83eea9df33..bb2e5d28cd 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -180,7 +180,7 @@ public class Http11Processor extends AbstractProcessor {
 outputBuffer.addFilter(new VoidOutputFilter());
 
 // Create and add buffered input filter
-inputBuffer.addFilter(new BufferedInputFilter());
+inputBuffer.addFilter(new 
BufferedInputFilter(protocol.getMaxSwallowSize()));
 
 // Create and add the gzip filters.
 //inputBuffer.addFilter(new GzipInputFilter());
diff --git a/java/org/apache/coyote/http11/filters/BufferedInputFilter.java 
b/java/org/apache/coyote/http11/filters/BufferedInputFilter.java
index 7aa9f2da78..a091c92f3a 100644
--- a/java/org/apache/coyote/http11/filters/BufferedInputFilter.java
+++ b/java/org/apache/coyote/http11/filters/BufferedInputFilter.java
@@ -33,13 +33,14 @@ import org.apache.tomcat.util.net.ApplicationBufferHandler;
  */
 public class BufferedInputFilter implements InputFilter, 
ApplicationBufferHandler {
 
-// -- Constants
-
 private static final String ENCODING_NAME = "buffered";
 private static final ByteChunk ENCODING = new ByteChunk();
 
 
-// - Instance Variables
+static {
+ENCODING.setBytes(ENCODING_NAME.getBytes(StandardCharsets.ISO_8859_1), 
0, ENCODING_NAME.length());
+}
+
 
 // Use ByteChunk since it correctly handles the special buffer size of -1
 // for maxSavePostSize.
@@ -48,15 +49,13 @@ public class BufferedInputFilter implements InputFilter, 
ApplicationBufferHandle
 private InputBuffer buffer;
 private boolean hasRead = false;
 
+private final int maxSwallowSize;
 
-// - Static Initializer
 
-static {
-ENCODING.setBytes(ENCODING_NAME.getBytes(StandardCharsets.ISO_8859_1),
-0, ENCODING_NAME.length());
+public BufferedInputFilter(int maxSwallowSize) {
+this.maxSwallowSize = maxSwallowSize;
 }
 
-
 // - Public Methods
 
 
@@ -82,14 +81,24 @@ public class BufferedInputFilter implements InputFilter, 
ApplicationBufferHandle
  */
 @Override
 public void setRequest(Request request) {
-if (buffered.getLimit() == 0) {
-return;
-}
 // save off the Request body
 try {
-while (buffer.doRead(this) >= 0) {
-buffered.append(tempRead);
-tempRead = null;
+if (buffered.getLimit() == 0) {
+// Special case - ignore (swallow) body. Do so within a limit.
+long swallowed = 0;
+int read = 0;
+while ((read = buffer.doRead(this)) >= 0) {
+swallowed += read;
+if (maxSwallowSize > -1 && swallowed > maxSwallowSize) {
+// No need for i18n - this isn't going to get logged
+throw new IOException("Ignored body exceeded 
maxSwallowSize");
+}
+}
+} else {
+while (buffer.doRead(this) >= 0) {
+buffered.append(tempRead);
+tempRead = null;
+}
 }
 } catch(IOException | BufferOverflowException ioe) {
 // No need for i18n - this isn't going to get logged anywhere
diff --git a/java/org/apache/coyote/http11/filters/IdentityInputFilter.java 
b/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
index a53e69be64..f89cee5eec 100644
--- a/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
+++ b/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
@@ -34,20 +34,17 @@ import org.apache.tomcat.util.res.StringManager;
  */
 public class IdentityInputFilter implements InputFilter, 
ApplicationBuf

[tomcat] branch 10.0.x updated: Correct a regression in the previous fix for BZ 66236

[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 d25d6a48e8 Correct a regression in the previous fix for BZ 66236
d25d6a48e8 is described below

commit d25d6a48e867ed15893546665985d7113c2e970d
Author: Mark Thomas 
AuthorDate: Tue Sep 13 16:35:24 2022 +0100

Correct a regression in the previous fix for BZ 66236

https://bz.apache.org/bugzilla/show_bug.cgi?id=66236
---
 java/org/apache/coyote/http11/Http11Processor.java |  2 +-
 .../coyote/http11/filters/BufferedInputFilter.java | 37 ++
 .../coyote/http11/filters/IdentityInputFilter.java |  6 +---
 3 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/java/org/apache/coyote/http11/Http11Processor.java 
b/java/org/apache/coyote/http11/Http11Processor.java
index 4d61a1554c..9a3c1c206c 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -180,7 +180,7 @@ public class Http11Processor extends AbstractProcessor {
 outputBuffer.addFilter(new VoidOutputFilter());
 
 // Create and add buffered input filter
-inputBuffer.addFilter(new BufferedInputFilter());
+inputBuffer.addFilter(new 
BufferedInputFilter(protocol.getMaxSwallowSize()));
 
 // Create and add the gzip filters.
 //inputBuffer.addFilter(new GzipInputFilter());
diff --git a/java/org/apache/coyote/http11/filters/BufferedInputFilter.java 
b/java/org/apache/coyote/http11/filters/BufferedInputFilter.java
index 7aa9f2da78..a091c92f3a 100644
--- a/java/org/apache/coyote/http11/filters/BufferedInputFilter.java
+++ b/java/org/apache/coyote/http11/filters/BufferedInputFilter.java
@@ -33,13 +33,14 @@ import org.apache.tomcat.util.net.ApplicationBufferHandler;
  */
 public class BufferedInputFilter implements InputFilter, 
ApplicationBufferHandler {
 
-// -- Constants
-
 private static final String ENCODING_NAME = "buffered";
 private static final ByteChunk ENCODING = new ByteChunk();
 
 
-// - Instance Variables
+static {
+ENCODING.setBytes(ENCODING_NAME.getBytes(StandardCharsets.ISO_8859_1), 
0, ENCODING_NAME.length());
+}
+
 
 // Use ByteChunk since it correctly handles the special buffer size of -1
 // for maxSavePostSize.
@@ -48,15 +49,13 @@ public class BufferedInputFilter implements InputFilter, 
ApplicationBufferHandle
 private InputBuffer buffer;
 private boolean hasRead = false;
 
+private final int maxSwallowSize;
 
-// - Static Initializer
 
-static {
-ENCODING.setBytes(ENCODING_NAME.getBytes(StandardCharsets.ISO_8859_1),
-0, ENCODING_NAME.length());
+public BufferedInputFilter(int maxSwallowSize) {
+this.maxSwallowSize = maxSwallowSize;
 }
 
-
 // - Public Methods
 
 
@@ -82,14 +81,24 @@ public class BufferedInputFilter implements InputFilter, 
ApplicationBufferHandle
  */
 @Override
 public void setRequest(Request request) {
-if (buffered.getLimit() == 0) {
-return;
-}
 // save off the Request body
 try {
-while (buffer.doRead(this) >= 0) {
-buffered.append(tempRead);
-tempRead = null;
+if (buffered.getLimit() == 0) {
+// Special case - ignore (swallow) body. Do so within a limit.
+long swallowed = 0;
+int read = 0;
+while ((read = buffer.doRead(this)) >= 0) {
+swallowed += read;
+if (maxSwallowSize > -1 && swallowed > maxSwallowSize) {
+// No need for i18n - this isn't going to get logged
+throw new IOException("Ignored body exceeded 
maxSwallowSize");
+}
+}
+} else {
+while (buffer.doRead(this) >= 0) {
+buffered.append(tempRead);
+tempRead = null;
+}
 }
 } catch(IOException | BufferOverflowException ioe) {
 // No need for i18n - this isn't going to get logged anywhere
diff --git a/java/org/apache/coyote/http11/filters/IdentityInputFilter.java 
b/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
index a53e69be64..f89cee5eec 100644
--- a/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
+++ b/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
@@ -34,20 +34,17 @@ import org.apache.tomcat.util.res.StringManager;
  */
 public class IdentityInputFilter implements InputFilter, 
ApplicationB

[tomcat] branch main updated: Better wording

[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 6424d88549 Better wording
6424d88549 is described below

commit 6424d885490f3df0228ea5f7405b48a097150aff
Author: Mark Thomas 
AuthorDate: Tue Sep 13 16:37:13 2022 +0100

Better wording
---
 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 88b7935c80..1fccd0a066 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -108,7 +108,7 @@
   
 
   
-Correct regression in the previous fix for 66236. (markt)
+Correct a regression in the previous fix for 66236. (markt)
   
 
   


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

[tomcat] branch main updated: Remove trailing spaces

[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 d5dfb781cc Remove trailing spaces
d5dfb781cc is described below

commit d5dfb781cca928c1814f9b0657dd4bff1b4ae402
Author: Mark Thomas 
AuthorDate: Tue Sep 13 16:36:48 2022 +0100

Remove trailing spaces
---
 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 e5888a96bf..88b7935c80 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -109,7 +109,7 @@
 
   
 Correct regression in the previous fix for 66236. (markt)
-
+  
 
   
 


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

[tomcat] 03/03: Correct a regression in the previous fix for BZ 66236

[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 e16d9f0a0d80dee7531f32ed50e6e5d08e1d0dff
Author: Mark Thomas 
AuthorDate: Tue Sep 13 16:35:24 2022 +0100

Correct a regression in the previous fix for BZ 66236

https://bz.apache.org/bugzilla/show_bug.cgi?id=66236
---
 java/org/apache/coyote/http11/Http11Processor.java |  2 +-
 .../coyote/http11/filters/BufferedInputFilter.java | 37 ++
 .../coyote/http11/filters/IdentityInputFilter.java |  6 +---
 webapps/docs/changelog.xml |  7 
 4 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/java/org/apache/coyote/http11/Http11Processor.java 
b/java/org/apache/coyote/http11/Http11Processor.java
index fdc4cc395c..10e3d7098d 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -181,7 +181,7 @@ public class Http11Processor extends AbstractProcessor {
 outputBuffer.addFilter(new VoidOutputFilter());
 
 // Create and add buffered input filter
-inputBuffer.addFilter(new BufferedInputFilter());
+inputBuffer.addFilter(new 
BufferedInputFilter(protocol.getMaxSwallowSize()));
 
 // Create and add the gzip filters.
 //inputBuffer.addFilter(new GzipInputFilter());
diff --git a/java/org/apache/coyote/http11/filters/BufferedInputFilter.java 
b/java/org/apache/coyote/http11/filters/BufferedInputFilter.java
index 7aa9f2da78..a091c92f3a 100644
--- a/java/org/apache/coyote/http11/filters/BufferedInputFilter.java
+++ b/java/org/apache/coyote/http11/filters/BufferedInputFilter.java
@@ -33,13 +33,14 @@ import org.apache.tomcat.util.net.ApplicationBufferHandler;
  */
 public class BufferedInputFilter implements InputFilter, 
ApplicationBufferHandler {
 
-// -- Constants
-
 private static final String ENCODING_NAME = "buffered";
 private static final ByteChunk ENCODING = new ByteChunk();
 
 
-// - Instance Variables
+static {
+ENCODING.setBytes(ENCODING_NAME.getBytes(StandardCharsets.ISO_8859_1), 
0, ENCODING_NAME.length());
+}
+
 
 // Use ByteChunk since it correctly handles the special buffer size of -1
 // for maxSavePostSize.
@@ -48,15 +49,13 @@ public class BufferedInputFilter implements InputFilter, 
ApplicationBufferHandle
 private InputBuffer buffer;
 private boolean hasRead = false;
 
+private final int maxSwallowSize;
 
-// - Static Initializer
 
-static {
-ENCODING.setBytes(ENCODING_NAME.getBytes(StandardCharsets.ISO_8859_1),
-0, ENCODING_NAME.length());
+public BufferedInputFilter(int maxSwallowSize) {
+this.maxSwallowSize = maxSwallowSize;
 }
 
-
 // - Public Methods
 
 
@@ -82,14 +81,24 @@ public class BufferedInputFilter implements InputFilter, 
ApplicationBufferHandle
  */
 @Override
 public void setRequest(Request request) {
-if (buffered.getLimit() == 0) {
-return;
-}
 // save off the Request body
 try {
-while (buffer.doRead(this) >= 0) {
-buffered.append(tempRead);
-tempRead = null;
+if (buffered.getLimit() == 0) {
+// Special case - ignore (swallow) body. Do so within a limit.
+long swallowed = 0;
+int read = 0;
+while ((read = buffer.doRead(this)) >= 0) {
+swallowed += read;
+if (maxSwallowSize > -1 && swallowed > maxSwallowSize) {
+// No need for i18n - this isn't going to get logged
+throw new IOException("Ignored body exceeded 
maxSwallowSize");
+}
+}
+} else {
+while (buffer.doRead(this) >= 0) {
+buffered.append(tempRead);
+tempRead = null;
+}
 }
 } catch(IOException | BufferOverflowException ioe) {
 // No need for i18n - this isn't going to get logged anywhere
diff --git a/java/org/apache/coyote/http11/filters/IdentityInputFilter.java 
b/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
index a53e69be64..f89cee5eec 100644
--- a/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
+++ b/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
@@ -34,20 +34,17 @@ import org.apache.tomcat.util.res.StringManager;
  */
 public class IdentityInputFilter implements InputFilter, 
ApplicationBufferHandler {
 
-private static final StringManager sm = StringManager.getManager(
-IdentityInputFi

[tomcat] 01/03: 10.1.0-M18 vote was cancelled

[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 1d7aebe09460192472e08e54a3d1f68e23f8f4e7
Author: Mark Thomas 
AuthorDate: Tue Sep 13 16:30:59 2022 +0100

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

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e4b1f2c169..83524ce34f 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] 02/03: Increment version for next dev cycle

[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 9e6cfc12dacf61ec62d354a854f79b015b9a7259
Author: Mark Thomas 
AuthorDate: Tue Sep 13 16:32:47 2022 +0100

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

diff --git a/build.properties.default b/build.properties.default
index f32f670708..387743c61a 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -33,7 +33,7 @@ version.major=10
 version.minor=1
 version.build=0
 version.patch=0
-version.suffix=-M18
+version.suffix=-M19
 version.dev=-dev
 
 # - Build tools -
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 62335290dc..ca8184d506 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-M18
+maven.asf.release.deploy.version=10.1.0-M19
 
 #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 83524ce34f..a8ab4ba6c8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,6 +104,8 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
+
+
 
   
 


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

[tomcat] branch main updated (b5bc432f2c -> e16d9f0a0d)

[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 b5bc432f2c Fix typo
 new 1d7aebe094 10.1.0-M18 vote was cancelled
 new 9e6cfc12da Increment version for next dev cycle
 new e16d9f0a0d Correct a regression in the previous fix for BZ 66236

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


Summary of changes:
 build.properties.default   |  2 +-
 java/org/apache/coyote/http11/Http11Processor.java |  2 +-
 .../coyote/http11/filters/BufferedInputFilter.java | 37 ++
 .../coyote/http11/filters/IdentityInputFilter.java |  6 +---
 res/maven/mvn.properties.default   |  2 +-
 webapps/docs/changelog.xml | 11 ++-
 6 files changed, 37 insertions(+), 23 deletions(-)


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

Re: Time for Tomcat 8.5.83?

[Mark Thomas]

On 13/09/2022 16:12, Christopher Schultz wrote:

All,

Looking at the changelog, I don't see anything really critical, but 
there are a bunch of little things that maybe we should just go ahead 
and release.


Any comments either way?


+1 to a release.

Note that I need to fix a regression first. I should have that 
back-ported in the next couple of hours - assuming the tests runs pass.


Mark

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

Time for Tomcat 8.5.83?

[Christopher Schultz]

All,

Looking at the changelog, I don't see anything really critical, but 
there are a bunch of little things that maybe we should just go ahead 
and release.


Any comments either way?

-chris

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

[GitHub] [tomcat-native] markt-asf commented on pull request #15: Update README.txt

[GitBox]

markt-asf commented on PR #15:
URL: https://github.com/apache/tomcat-native/pull/15#issuecomment-1245242996

   The current grammar is correct. And grammatical is spelt with threes 'a's, 
not two 'a's and an 'e'.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


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

[GitHub] [tomcat-native] markt-asf closed pull request #15: Update README.txt

[GitBox]

markt-asf closed pull request #15: Update README.txt
URL: https://github.com/apache/tomcat-native/pull/15


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


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

[GitHub] [tomcat-native] IAMBANN opened a new pull request, #15: Update README.txt

[GitBox]

IAMBANN opened a new pull request, #15:
URL: https://github.com/apache/tomcat-native/pull/15

   grammetical correction


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


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

[VOTE][CANCELLED] Release Apache Tomcat 10.1.0-M18

[Mark Thomas]

I am cancelling this release vote due to a regression caused by:

https://github.com/apache/tomcat/commit/8bb7c0980adfebe65ba23c1eedaa3408d472ca0a

Mark


On 12/09/2022 22:00, Mark Thomas wrote:

The proposed Apache Tomcat 10.1.0-M18 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.


The notable changes compared to 10.1.0-M17 are:

- Add support for authenticating WebSocket clients with an HTTP forward
   proxy when establishing a connection to a WebSocket endpoint via a
   forward proxy that requires authentication. Based on a patch provided
   by Joe Mokos.

- Various fixes for edge case bugs in EL processing

- Improve host header handling for HTTP/2 requests

For full details, see the change log:
https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/changelog.html

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.0-M18/

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

The tag is:
https://github.com/apache/tomcat/tree/10.1.0-M18
ae9df1bcc169a5b03adea54c8c19ca9bd902e44f


The proposed 10.1.0-M18 release is:
[ ] Broken - do not release
[ ] Beta - go ahead and release as 10.1.0-M18 (beta)

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



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

Re: [VOTE] Release Apache Tomcat 10.1.0-M18

[Mark Thomas]

On 13/09/2022 08:28, Han Li wrote:




2022年9月13日 15:19，Han Li  写道：




2022年9月13日 15:16，Mark Thomas mailto:ma...@apache.org>> 写道：

On 13/09/2022 08:14, Han Li wrote:

macOS 12.3.1（intel）


Tx. I now see this on Linux and I saw it on Windows yesterday.

Need to figure out what triggered this.

The swallowInput change maybe?


I will try to revert this change, and try again.

This problem still exists and it only occurs with NIO2 and OpenSSL.


"git bisect" found it quite quickly. It is my fault but a different 
change. It is the maxSavePostSize change.


I'll cancel the release vote and start looking into exactly what is 
going wrong.


Mark




Han


Han



Mark


Han

2022年9月13日 15:09，Mark Thomas mailto:ma...@apache.org>> 写道：

Which OS?

I saw the issue on Windows but thought it was a VM / load issue.

Mark


On 13/09/2022 07:16, Han Li wrote:

I'm missing the point, it's only under NIO2 that this problem occurs.
Han

2022年9月13日 14:12，Han Li mailto:li...@apache.org>> 写道：

I encountered a test case that would randomly fail.

I executed it individually several times and it failed a high percentage of 
times.

Env Info:
Tomcat Native 2.0.1
OpenSSL 3.0.5
OpenJDK 17.0.2

The following content is log:

Testcase: testClientCertPostZero[OpenSSL] took 6.057 sec
Caused an ERROR
Received close_notify during handshake
javax.net.ssl.SSLProtocolException: Received close_notify during handshake
at java.base/sun.security.ssl.Alert.createSSLException(Alert.java:129)
at java.base/sun.security.ssl.Alert.createSSLException(Alert.java:117)
at 
java.base/sun.security.ssl.TransportContext.fatal(TransportContext.java:358)
at 
java.base/sun.security.ssl.TransportContext.fatal(TransportContext.java:314)
at 
java.base/sun.security.ssl.TransportContext.fatal(TransportContext.java:305)
at 
java.base/sun.security.ssl.Alert$AlertConsumer.consume(Alert.java:250)
at 
java.base/sun.security.ssl.TransportContext.dispatch(TransportContext.java:204)
at java.base/sun.security.ssl.SSLTransport.decode(SSLTransport.java:172)
at 
java.base/sun.security.ssl.SSLSocketImpl.decode(SSLSocketImpl.java:1503)
at 
java.base/sun.security.ssl.SSLSocketImpl.readApplicationRecord(SSLSocketImpl.java:1474)
at 
java.base/sun.security.ssl.SSLSocketImpl$AppInputStream.read(SSLSocketImpl.java:1059)
at 
java.base/java.io.BufferedInputStream.fill(BufferedInputStream.java:244)
at 
java.base/java.io.BufferedInputStream.read1(BufferedInputStream.java:284)
at 
java.base/java.io.BufferedInputStream.read(BufferedInputStream.java:343)
at 
java.base/sun.net.www.http.HttpClient.parseHTTPHeader(HttpClient.java:791)
at java.base/sun.net.www.http.HttpClient.parseHTTP(HttpClient.java:726)
at java.base/sun.net.www.http.HttpClient.parseHTTP(HttpClient.java:750)
at 
java.base/sun.net.www.protocol.http.HttpURLConnection.getInputStream0(HttpURLConnection.java:1688)
at 
java.base/sun.net.www.protocol.http.HttpURLConnection.getInputStream(HttpURLConnection.java:1589)
at 
java.base/java.net.HttpURLConnection.getResponseCode(HttpURLConnection.java:529)
at 
java.base/sun.net.www.protocol.https.HttpsURLConnectionImpl.getResponseCode(HttpsURLConnectionImpl.java:308)
at 
org.apache.catalina.startup.TomcatBaseTest.postUrl(TomcatBaseTest.java:794)
at 
org.apache.catalina.startup.TomcatBaseTest.postUrl(TomcatBaseTest.java:749)
at 
org.apache.catalina.startup.TomcatBaseTest.postUrl(TomcatBaseTest.java:720)
at 
org.apache.tomcat.util.net.TestClientCert.doTestClientCertPost(TestClientCert.java:184)
at 
org.apache.tomcat.util.net.TestClientCert.testClientCertPostZero(TestClientCert.java:133)
at 
java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at 
java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
at 
java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)


2022年9月13日 05:00，Mark Thomas mailto:ma...@apache.org>> 写道：

The proposed Apache Tomcat 10.1.0-M18 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.

The notable changes compared to 10.1.0-M17 are:

- Add support for authenticating WebSocket clients with an HTTP forward
proxy when establishing a connection to a WebSocket endpoint via a
forward proxy that requires authentication. Based on a patch provided
by Joe Mokos.

- Various fixes for edge case bugs in EL processing

- Improve host header handling for HTTP/2 requests

For full details, see the change log:
https://nightlies.apache.org/tomcat/tomc

svn commit: r1904039 - in /tomcat/site/trunk: docs/index.html xdocs/index.xml

[markt]

Author: markt
Date: Tue Sep 13 08:02:37 2022
New Revision: 1904039

URL: http://svn.apache.org/viewvc?rev=1904039&view=rev
Log:
Fix typo

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

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1904039&r1=1904038&r2=1904039&view=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Tue Sep 13 08:02:37 2022
@@ -43,7 +43,7 @@ bug fixes and improvements compared to v
 
 Update checksums for modified files to avoid issues when trying to use
 migrated JAR files
-Handle migration of manifets files when part of an exploded JAR
+Handle migration of manifest files when part of an exploded JAR
 
 
 Full details of these changes, and all the other changes, are available in the

Modified: tomcat/site/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1904039&r1=1904038&r2=1904039&view=diff
==
--- tomcat/site/trunk/xdocs/index.xml (original)
+++ tomcat/site/trunk/xdocs/index.xml Tue Sep 13 08:02:37 2022
@@ -64,7 +64,7 @@ bug fixes and improvements compared to v
 
 Update checksums for modified files to avoid issues when trying to use
 migrated JAR files
-Handle migration of manifets files when part of an exploded JAR
+Handle migration of manifest files when part of an exploded JAR
 
 
 Full details of these changes, and all the other changes, are available in the



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

[tomcat] branch 8.5.x updated: Fix typo

[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 7496e2cf38 Fix typo
7496e2cf38 is described below

commit 7496e2cf38e6414a2595a69b69a4400ac9e20035
Author: Mark Thomas 
AuthorDate: Tue Sep 13 09:00:59 2022 +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 76766752dc..e856651c6b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -242,7 +242,7 @@
   
 62312: Add support for authenticating WebSocket clients with
 an HTTP forward proxy when establishing a connection to a WebSocket
-endpoint via a foward proxy that requires authentication. Based on a
+endpoint via a forward proxy that requires authentication. Based on a
 patch provided by Joe Mokos. (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 typo

[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 f31b707904 Fix typo
f31b707904 is described below

commit f31b707904212769019d8327f97404df0c98f421
Author: Mark Thomas 
AuthorDate: Tue Sep 13 09:00:59 2022 +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 599c6f50a6..09f0b9c0a3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -290,7 +290,7 @@
   
 62312: Add support for authenticating WebSocket clients with
 an HTTP forward proxy when establishing a connection to a WebSocket
-endpoint via a foward proxy that requires authentication. Based on a
+endpoint via a forward proxy that requires authentication. Based on a
 patch provided by Joe Mokos. (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 typo

[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 b5bc432f2c Fix typo
b5bc432f2c is described below

commit b5bc432f2c7f62af3670408c238d2db94ad0e2f8
Author: Mark Thomas 
AuthorDate: Tue Sep 13 09:00:59 2022 +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 a777d777fb..e4b1f2c169 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -292,7 +292,7 @@
   
 62312: Add support for authenticating WebSocket clients with
 an HTTP forward proxy when establishing a connection to a WebSocket
-endpoint via a foward proxy that requires authentication. Based on a
+endpoint via a forward proxy that requires authentication. Based on a
 patch provided by Joe Mokos. (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 typo

[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 ced2fe39f3 Fix typo
ced2fe39f3 is described below

commit ced2fe39f36d5da4cc13f2ff539a9abeacd503b9
Author: Mark Thomas 
AuthorDate: Tue Sep 13 09:00:59 2022 +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 b1c22e0788..80dba24586 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -287,7 +287,7 @@
   
 62312: Add support for authenticating WebSocket clients with
 an HTTP forward proxy when establishing a connection to a WebSocket
-endpoint via a foward proxy that requires authentication. Based on a
+endpoint via a forward proxy that requires authentication. Based on a
 patch provided by Joe Mokos. (markt)
   
 


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

Re: [VOTE] Release Apache Tomcat 10.1.0-M18

[Han Li]

> 2022年9月13日 15:19，Han Li  写道：
> 
> 
> 
>> 2022年9月13日 15:16，Mark Thomas mailto:ma...@apache.org>> 写道：
>> 
>> On 13/09/2022 08:14, Han Li wrote:
>>> macOS 12.3.1（intel）
>> 
>> Tx. I now see this on Linux and I saw it on Windows yesterday.
>> 
>> Need to figure out what triggered this.
>> 
>> The swallowInput change maybe?
> 
> I will try to revert this change, and try again.
This problem still exists and it only occurs with NIO2 and OpenSSL.

Han
> 
> Han
> 
>> 
>> Mark
>> 
>>> Han
 2022年9月13日 15:09，Mark Thomas mailto:ma...@apache.org>> 
 写道：
 
 Which OS?
 
 I saw the issue on Windows but thought it was a VM / load issue.
 
 Mark
 
 
 On 13/09/2022 07:16, Han Li wrote:
> I'm missing the point, it's only under NIO2 that this problem occurs.
> Han
>> 2022年9月13日 14:12，Han Li mailto:li...@apache.org>> 写道：
>> 
>> I encountered a test case that would randomly fail.
>> 
>> I executed it individually several times and it failed a high percentage 
>> of times.
>> 
>> Env Info:
>> Tomcat Native 2.0.1
>> OpenSSL 3.0.5
>> OpenJDK 17.0.2
>> 
>> The following content is log:
>> 
>> Testcase: testClientCertPostZero[OpenSSL] took 6.057 sec
>>  Caused an ERROR
>> Received close_notify during handshake
>> javax.net.ssl.SSLProtocolException: Received close_notify during 
>> handshake
>>  at java.base/sun.security.ssl.Alert.createSSLException(Alert.java:129)
>>  at java.base/sun.security.ssl.Alert.createSSLException(Alert.java:117)
>>  at 
>> java.base/sun.security.ssl.TransportContext.fatal(TransportContext.java:358)
>>  at 
>> java.base/sun.security.ssl.TransportContext.fatal(TransportContext.java:314)
>>  at 
>> java.base/sun.security.ssl.TransportContext.fatal(TransportContext.java:305)
>>  at 
>> java.base/sun.security.ssl.Alert$AlertConsumer.consume(Alert.java:250)
>>  at 
>> java.base/sun.security.ssl.TransportContext.dispatch(TransportContext.java:204)
>>  at java.base/sun.security.ssl.SSLTransport.decode(SSLTransport.java:172)
>>  at 
>> java.base/sun.security.ssl.SSLSocketImpl.decode(SSLSocketImpl.java:1503)
>>  at 
>> java.base/sun.security.ssl.SSLSocketImpl.readApplicationRecord(SSLSocketImpl.java:1474)
>>  at 
>> java.base/sun.security.ssl.SSLSocketImpl$AppInputStream.read(SSLSocketImpl.java:1059)
>>  at 
>> java.base/java.io.BufferedInputStream.fill(BufferedInputStream.java:244)
>>  at 
>> java.base/java.io.BufferedInputStream.read1(BufferedInputStream.java:284)
>>  at 
>> java.base/java.io.BufferedInputStream.read(BufferedInputStream.java:343)
>>  at 
>> java.base/sun.net.www.http.HttpClient.parseHTTPHeader(HttpClient.java:791)
>>  at java.base/sun.net.www.http.HttpClient.parseHTTP(HttpClient.java:726)
>>  at java.base/sun.net.www.http.HttpClient.parseHTTP(HttpClient.java:750)
>>  at 
>> java.base/sun.net.www.protocol.http.HttpURLConnection.getInputStream0(HttpURLConnection.java:1688)
>>  at 
>> java.base/sun.net.www.protocol.http.HttpURLConnection.getInputStream(HttpURLConnection.java:1589)
>>  at 
>> java.base/java.net.HttpURLConnection.getResponseCode(HttpURLConnection.java:529)
>>  at 
>> java.base/sun.net.www.protocol.https.HttpsURLConnectionImpl.getResponseCode(HttpsURLConnectionImpl.java:308)
>>  at 
>> org.apache.catalina.startup.TomcatBaseTest.postUrl(TomcatBaseTest.java:794)
>>  at 
>> org.apache.catalina.startup.TomcatBaseTest.postUrl(TomcatBaseTest.java:749)
>>  at 
>> org.apache.catalina.startup.TomcatBaseTest.postUrl(TomcatBaseTest.java:720)
>>  at 
>> org.apache.tomcat.util.net.TestClientCert.doTestClientCertPost(TestClientCert.java:184)
>>  at 
>> org.apache.tomcat.util.net.TestClientCert.testClientCertPostZero(TestClientCert.java:133)
>>  at 
>> java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native 
>> Method)
>>  at 
>> java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
>>  at 
>> java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>> 
>>> 2022年9月13日 05:00，Mark Thomas >> > 写道：
>>> 
>>> The proposed Apache Tomcat 10.1.0-M18 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.
>>> 
>>> The notable changes compared to 10.1.0-M17 are:
>>> 
>>> - Add support for authenticating WebSocket clients with an HTTP forward
>>> proxy when establishing

Re: [VOTE] Release Apache Tomcat 10.1.0-M18

[Mark Thomas]

On 13/09/2022 08:19, Han Li wrote:




2022年9月13日 15:16，Mark Thomas  写道：

On 13/09/2022 08:14, Han Li wrote:

macOS 12.3.1（intel）


Tx. I now see this on Linux and I saw it on Windows yesterday.

Need to figure out what triggered this.

The swallowInput change maybe?


I will try to revert this change, and try again.


Thanks. I'm looking too. It looks like the client is timing out which 
suggests Tomcat isn't sending something the client expects.


Mark




Han



Mark


Han

2022年9月13日 15:09，Mark Thomas  写道：

Which OS?

I saw the issue on Windows but thought it was a VM / load issue.

Mark


On 13/09/2022 07:16, Han Li wrote:

I'm missing the point, it's only under NIO2 that this problem occurs.
Han

2022年9月13日 14:12，Han Li  写道：

I encountered a test case that would randomly fail.

I executed it individually several times and it failed a high percentage of 
times.

Env Info:
Tomcat Native 2.0.1
OpenSSL 3.0.5
OpenJDK 17.0.2

The following content is log:

Testcase: testClientCertPostZero[OpenSSL] took 6.057 sec
Caused an ERROR
Received close_notify during handshake
javax.net.ssl.SSLProtocolException: Received close_notify during handshake
at java.base/sun.security.ssl.Alert.createSSLException(Alert.java:129)
at java.base/sun.security.ssl.Alert.createSSLException(Alert.java:117)
at 
java.base/sun.security.ssl.TransportContext.fatal(TransportContext.java:358)
at 
java.base/sun.security.ssl.TransportContext.fatal(TransportContext.java:314)
at 
java.base/sun.security.ssl.TransportContext.fatal(TransportContext.java:305)
at 
java.base/sun.security.ssl.Alert$AlertConsumer.consume(Alert.java:250)
at 
java.base/sun.security.ssl.TransportContext.dispatch(TransportContext.java:204)
at java.base/sun.security.ssl.SSLTransport.decode(SSLTransport.java:172)
at 
java.base/sun.security.ssl.SSLSocketImpl.decode(SSLSocketImpl.java:1503)
at 
java.base/sun.security.ssl.SSLSocketImpl.readApplicationRecord(SSLSocketImpl.java:1474)
at 
java.base/sun.security.ssl.SSLSocketImpl$AppInputStream.read(SSLSocketImpl.java:1059)
at 
java.base/java.io.BufferedInputStream.fill(BufferedInputStream.java:244)
at 
java.base/java.io.BufferedInputStream.read1(BufferedInputStream.java:284)
at 
java.base/java.io.BufferedInputStream.read(BufferedInputStream.java:343)
at 
java.base/sun.net.www.http.HttpClient.parseHTTPHeader(HttpClient.java:791)
at java.base/sun.net.www.http.HttpClient.parseHTTP(HttpClient.java:726)
at java.base/sun.net.www.http.HttpClient.parseHTTP(HttpClient.java:750)
at 
java.base/sun.net.www.protocol.http.HttpURLConnection.getInputStream0(HttpURLConnection.java:1688)
at 
java.base/sun.net.www.protocol.http.HttpURLConnection.getInputStream(HttpURLConnection.java:1589)
at 
java.base/java.net.HttpURLConnection.getResponseCode(HttpURLConnection.java:529)
at 
java.base/sun.net.www.protocol.https.HttpsURLConnectionImpl.getResponseCode(HttpsURLConnectionImpl.java:308)
at 
org.apache.catalina.startup.TomcatBaseTest.postUrl(TomcatBaseTest.java:794)
at 
org.apache.catalina.startup.TomcatBaseTest.postUrl(TomcatBaseTest.java:749)
at 
org.apache.catalina.startup.TomcatBaseTest.postUrl(TomcatBaseTest.java:720)
at 
org.apache.tomcat.util.net.TestClientCert.doTestClientCertPost(TestClientCert.java:184)
at 
org.apache.tomcat.util.net.TestClientCert.testClientCertPostZero(TestClientCert.java:133)
at 
java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at 
java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
at 
java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)


2022年9月13日 05:00，Mark Thomas  写道：

The proposed Apache Tomcat 10.1.0-M18 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.

The notable changes compared to 10.1.0-M17 are:

- Add support for authenticating WebSocket clients with an HTTP forward
proxy when establishing a connection to a WebSocket endpoint via a
forward proxy that requires authentication. Based on a patch provided
by Joe Mokos.

- Various fixes for edge case bugs in EL processing

- Improve host header handling for HTTP/2 requests

For full details, see the change log:
https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/changelog.html

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.0-M18/

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

The tag is:
https://github.com/apache/tomcat/t

Re: [VOTE] Release Apache Tomcat 10.1.0-M18

[Han Li]

> 2022年9月13日 15:16，Mark Thomas  写道：
> 
> On 13/09/2022 08:14, Han Li wrote:
>> macOS 12.3.1（intel）
> 
> Tx. I now see this on Linux and I saw it on Windows yesterday.
> 
> Need to figure out what triggered this.
> 
> The swallowInput change maybe?

I will try to revert this change, and try again.

Han

> 
> Mark
> 
>> Han
>>> 2022年9月13日 15:09，Mark Thomas  写道：
>>> 
>>> Which OS?
>>> 
>>> I saw the issue on Windows but thought it was a VM / load issue.
>>> 
>>> Mark
>>> 
>>> 
>>> On 13/09/2022 07:16, Han Li wrote:
 I'm missing the point, it's only under NIO2 that this problem occurs.
 Han
> 2022年9月13日 14:12，Han Li  写道：
> 
> I encountered a test case that would randomly fail.
> 
> I executed it individually several times and it failed a high percentage 
> of times.
> 
> Env Info:
> Tomcat Native 2.0.1
> OpenSSL 3.0.5
> OpenJDK 17.0.2
> 
> The following content is log:
> 
> Testcase: testClientCertPostZero[OpenSSL] took 6.057 sec
>   Caused an ERROR
> Received close_notify during handshake
> javax.net.ssl.SSLProtocolException: Received close_notify during handshake
>   at java.base/sun.security.ssl.Alert.createSSLException(Alert.java:129)
>   at java.base/sun.security.ssl.Alert.createSSLException(Alert.java:117)
>   at 
> java.base/sun.security.ssl.TransportContext.fatal(TransportContext.java:358)
>   at 
> java.base/sun.security.ssl.TransportContext.fatal(TransportContext.java:314)
>   at 
> java.base/sun.security.ssl.TransportContext.fatal(TransportContext.java:305)
>   at 
> java.base/sun.security.ssl.Alert$AlertConsumer.consume(Alert.java:250)
>   at 
> java.base/sun.security.ssl.TransportContext.dispatch(TransportContext.java:204)
>   at java.base/sun.security.ssl.SSLTransport.decode(SSLTransport.java:172)
>   at 
> java.base/sun.security.ssl.SSLSocketImpl.decode(SSLSocketImpl.java:1503)
>   at 
> java.base/sun.security.ssl.SSLSocketImpl.readApplicationRecord(SSLSocketImpl.java:1474)
>   at 
> java.base/sun.security.ssl.SSLSocketImpl$AppInputStream.read(SSLSocketImpl.java:1059)
>   at 
> java.base/java.io.BufferedInputStream.fill(BufferedInputStream.java:244)
>   at 
> java.base/java.io.BufferedInputStream.read1(BufferedInputStream.java:284)
>   at 
> java.base/java.io.BufferedInputStream.read(BufferedInputStream.java:343)
>   at 
> java.base/sun.net.www.http.HttpClient.parseHTTPHeader(HttpClient.java:791)
>   at java.base/sun.net.www.http.HttpClient.parseHTTP(HttpClient.java:726)
>   at java.base/sun.net.www.http.HttpClient.parseHTTP(HttpClient.java:750)
>   at 
> java.base/sun.net.www.protocol.http.HttpURLConnection.getInputStream0(HttpURLConnection.java:1688)
>   at 
> java.base/sun.net.www.protocol.http.HttpURLConnection.getInputStream(HttpURLConnection.java:1589)
>   at 
> java.base/java.net.HttpURLConnection.getResponseCode(HttpURLConnection.java:529)
>   at 
> java.base/sun.net.www.protocol.https.HttpsURLConnectionImpl.getResponseCode(HttpsURLConnectionImpl.java:308)
>   at 
> org.apache.catalina.startup.TomcatBaseTest.postUrl(TomcatBaseTest.java:794)
>   at 
> org.apache.catalina.startup.TomcatBaseTest.postUrl(TomcatBaseTest.java:749)
>   at 
> org.apache.catalina.startup.TomcatBaseTest.postUrl(TomcatBaseTest.java:720)
>   at 
> org.apache.tomcat.util.net.TestClientCert.doTestClientCertPost(TestClientCert.java:184)
>   at 
> org.apache.tomcat.util.net.TestClientCert.testClientCertPostZero(TestClientCert.java:133)
>   at 
> java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native 
> Method)
>   at 
> java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
>   at 
> java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
> 
>> 2022年9月13日 05:00，Mark Thomas  写道：
>> 
>> The proposed Apache Tomcat 10.1.0-M18 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.
>> 
>> The notable changes compared to 10.1.0-M17 are:
>> 
>> - Add support for authenticating WebSocket clients with an HTTP forward
>> proxy when establishing a connection to a WebSocket endpoint via a
>> forward proxy that requires authentication. Based on a patch provided
>> by Joe Mokos.
>> 
>> - Various fixes for edge case bugs in EL processing
>> 
>> - Improve host header handling for HTTP/2 requests
>> 
>> For full details, see the change log:
>

Re: [VOTE] Release Apache Tomcat 10.1.0-M18

[Mark Thomas]

On 13/09/2022 08:14, Han Li wrote:

macOS 12.3.1（intel）


Tx. I now see this on Linux and I saw it on Windows yesterday.

Need to figure out what triggered this.

The swallowInput change maybe?

Mark



Han


2022年9月13日 15:09，Mark Thomas  写道：

Which OS?

I saw the issue on Windows but thought it was a VM / load issue.

Mark


On 13/09/2022 07:16, Han Li wrote:

I'm missing the point, it's only under NIO2 that this problem occurs.
Han

2022年9月13日 14:12，Han Li  写道：

I encountered a test case that would randomly fail.

I executed it individually several times and it failed a high percentage of 
times.

Env Info:
Tomcat Native 2.0.1
OpenSSL 3.0.5
OpenJDK 17.0.2

The following content is log:

Testcase: testClientCertPostZero[OpenSSL] took 6.057 sec
Caused an ERROR
Received close_notify during handshake
javax.net.ssl.SSLProtocolException: Received close_notify during handshake
at java.base/sun.security.ssl.Alert.createSSLException(Alert.java:129)
at java.base/sun.security.ssl.Alert.createSSLException(Alert.java:117)
at 
java.base/sun.security.ssl.TransportContext.fatal(TransportContext.java:358)
at 
java.base/sun.security.ssl.TransportContext.fatal(TransportContext.java:314)
at 
java.base/sun.security.ssl.TransportContext.fatal(TransportContext.java:305)
at 
java.base/sun.security.ssl.Alert$AlertConsumer.consume(Alert.java:250)
at 
java.base/sun.security.ssl.TransportContext.dispatch(TransportContext.java:204)
at java.base/sun.security.ssl.SSLTransport.decode(SSLTransport.java:172)
at 
java.base/sun.security.ssl.SSLSocketImpl.decode(SSLSocketImpl.java:1503)
at 
java.base/sun.security.ssl.SSLSocketImpl.readApplicationRecord(SSLSocketImpl.java:1474)
at 
java.base/sun.security.ssl.SSLSocketImpl$AppInputStream.read(SSLSocketImpl.java:1059)
at 
java.base/java.io.BufferedInputStream.fill(BufferedInputStream.java:244)
at 
java.base/java.io.BufferedInputStream.read1(BufferedInputStream.java:284)
at 
java.base/java.io.BufferedInputStream.read(BufferedInputStream.java:343)
at 
java.base/sun.net.www.http.HttpClient.parseHTTPHeader(HttpClient.java:791)
at java.base/sun.net.www.http.HttpClient.parseHTTP(HttpClient.java:726)
at java.base/sun.net.www.http.HttpClient.parseHTTP(HttpClient.java:750)
at 
java.base/sun.net.www.protocol.http.HttpURLConnection.getInputStream0(HttpURLConnection.java:1688)
at 
java.base/sun.net.www.protocol.http.HttpURLConnection.getInputStream(HttpURLConnection.java:1589)
at 
java.base/java.net.HttpURLConnection.getResponseCode(HttpURLConnection.java:529)
at 
java.base/sun.net.www.protocol.https.HttpsURLConnectionImpl.getResponseCode(HttpsURLConnectionImpl.java:308)
at 
org.apache.catalina.startup.TomcatBaseTest.postUrl(TomcatBaseTest.java:794)
at 
org.apache.catalina.startup.TomcatBaseTest.postUrl(TomcatBaseTest.java:749)
at 
org.apache.catalina.startup.TomcatBaseTest.postUrl(TomcatBaseTest.java:720)
at 
org.apache.tomcat.util.net.TestClientCert.doTestClientCertPost(TestClientCert.java:184)
at 
org.apache.tomcat.util.net.TestClientCert.testClientCertPostZero(TestClientCert.java:133)
at 
java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at 
java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
at 
java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)


2022年9月13日 05:00，Mark Thomas  写道：

The proposed Apache Tomcat 10.1.0-M18 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.

The notable changes compared to 10.1.0-M17 are:

- Add support for authenticating WebSocket clients with an HTTP forward
proxy when establishing a connection to a WebSocket endpoint via a
forward proxy that requires authentication. Based on a patch provided
by Joe Mokos.

- Various fixes for edge case bugs in EL processing

- Improve host header handling for HTTP/2 requests

For full details, see the change log:
https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/changelog.html

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.0-M18/

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

The tag is:
https://github.com/apache/tomcat/tree/10.1.0-M18
ae9df1bcc169a5b03adea54c8c19ca9bd902e44f


The proposed 10.1.0-M18 release is:
[ ] Broken - do not release
[ ] Beta - go ahead and release as 10.1.0-M18 (beta)

-
To unsubscribe, e-mail: dev

Re: [VOTE] Release Apache Tomcat 10.1.0-M18

[Han Li]

macOS 12.3.1（intel）

Han

> 2022年9月13日 15:09，Mark Thomas  写道：
> 
> Which OS?
> 
> I saw the issue on Windows but thought it was a VM / load issue.
> 
> Mark
> 
> 
> On 13/09/2022 07:16, Han Li wrote:
>> I'm missing the point, it's only under NIO2 that this problem occurs.
>> Han
>>> 2022年9月13日 14:12，Han Li  写道：
>>> 
>>> I encountered a test case that would randomly fail.
>>> 
>>> I executed it individually several times and it failed a high percentage of 
>>> times.
>>> 
>>> Env Info:
>>> Tomcat Native 2.0.1
>>> OpenSSL 3.0.5
>>> OpenJDK 17.0.2
>>> 
>>> The following content is log:
>>> 
>>> Testcase: testClientCertPostZero[OpenSSL] took 6.057 sec
>>> Caused an ERROR
>>> Received close_notify during handshake
>>> javax.net.ssl.SSLProtocolException: Received close_notify during handshake
>>> at java.base/sun.security.ssl.Alert.createSSLException(Alert.java:129)
>>> at java.base/sun.security.ssl.Alert.createSSLException(Alert.java:117)
>>> at 
>>> java.base/sun.security.ssl.TransportContext.fatal(TransportContext.java:358)
>>> at 
>>> java.base/sun.security.ssl.TransportContext.fatal(TransportContext.java:314)
>>> at 
>>> java.base/sun.security.ssl.TransportContext.fatal(TransportContext.java:305)
>>> at 
>>> java.base/sun.security.ssl.Alert$AlertConsumer.consume(Alert.java:250)
>>> at 
>>> java.base/sun.security.ssl.TransportContext.dispatch(TransportContext.java:204)
>>> at java.base/sun.security.ssl.SSLTransport.decode(SSLTransport.java:172)
>>> at 
>>> java.base/sun.security.ssl.SSLSocketImpl.decode(SSLSocketImpl.java:1503)
>>> at 
>>> java.base/sun.security.ssl.SSLSocketImpl.readApplicationRecord(SSLSocketImpl.java:1474)
>>> at 
>>> java.base/sun.security.ssl.SSLSocketImpl$AppInputStream.read(SSLSocketImpl.java:1059)
>>> at 
>>> java.base/java.io.BufferedInputStream.fill(BufferedInputStream.java:244)
>>> at 
>>> java.base/java.io.BufferedInputStream.read1(BufferedInputStream.java:284)
>>> at 
>>> java.base/java.io.BufferedInputStream.read(BufferedInputStream.java:343)
>>> at 
>>> java.base/sun.net.www.http.HttpClient.parseHTTPHeader(HttpClient.java:791)
>>> at java.base/sun.net.www.http.HttpClient.parseHTTP(HttpClient.java:726)
>>> at java.base/sun.net.www.http.HttpClient.parseHTTP(HttpClient.java:750)
>>> at 
>>> java.base/sun.net.www.protocol.http.HttpURLConnection.getInputStream0(HttpURLConnection.java:1688)
>>> at 
>>> java.base/sun.net.www.protocol.http.HttpURLConnection.getInputStream(HttpURLConnection.java:1589)
>>> at 
>>> java.base/java.net.HttpURLConnection.getResponseCode(HttpURLConnection.java:529)
>>> at 
>>> java.base/sun.net.www.protocol.https.HttpsURLConnectionImpl.getResponseCode(HttpsURLConnectionImpl.java:308)
>>> at 
>>> org.apache.catalina.startup.TomcatBaseTest.postUrl(TomcatBaseTest.java:794)
>>> at 
>>> org.apache.catalina.startup.TomcatBaseTest.postUrl(TomcatBaseTest.java:749)
>>> at 
>>> org.apache.catalina.startup.TomcatBaseTest.postUrl(TomcatBaseTest.java:720)
>>> at 
>>> org.apache.tomcat.util.net.TestClientCert.doTestClientCertPost(TestClientCert.java:184)
>>> at 
>>> org.apache.tomcat.util.net.TestClientCert.testClientCertPostZero(TestClientCert.java:133)
>>> at 
>>> java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native 
>>> Method)
>>> at 
>>> java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
>>> at 
>>> java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>>> 
 2022年9月13日 05:00，Mark Thomas  写道：
 
 The proposed Apache Tomcat 10.1.0-M18 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.
 
 The notable changes compared to 10.1.0-M17 are:
 
 - Add support for authenticating WebSocket clients with an HTTP forward
 proxy when establishing a connection to a WebSocket endpoint via a
 forward proxy that requires authentication. Based on a patch provided
 by Joe Mokos.
 
 - Various fixes for edge case bugs in EL processing
 
 - Improve host header handling for HTTP/2 requests
 
 For full details, see the change log:
 https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/changelog.html
 
 It can be obtained from:
 https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.0-M18/
 
 The Maven staging repo is:
 https://repository.apache.org/content/repositories/orgapachetomcat-1388
 
 The tag is:
 https://github.com/apache/tomcat/tree/10.1.0-M18
 ae9df1bcc169a5b03adea54c8c19ca9bd902e44f
 
 
 The proposed 10.1

Re: [VOTE] Release Apache Tomcat 10.1.0-M18

[Mark Thomas]

Which OS?

I saw the issue on Windows but thought it was a VM / load issue.

Mark


On 13/09/2022 07:16, Han Li wrote:

I'm missing the point, it's only under NIO2 that this problem occurs.


Han


2022年9月13日 14:12，Han Li  写道：

I encountered a test case that would randomly fail.

I executed it individually several times and it failed a high percentage of 
times.

Env Info:
Tomcat Native 2.0.1
OpenSSL 3.0.5
OpenJDK 17.0.2

The following content is log:

Testcase: testClientCertPostZero[OpenSSL] took 6.057 sec
Caused an ERROR
Received close_notify during handshake
javax.net.ssl.SSLProtocolException: Received close_notify during handshake
at java.base/sun.security.ssl.Alert.createSSLException(Alert.java:129)
at java.base/sun.security.ssl.Alert.createSSLException(Alert.java:117)
at 
java.base/sun.security.ssl.TransportContext.fatal(TransportContext.java:358)
at 
java.base/sun.security.ssl.TransportContext.fatal(TransportContext.java:314)
at 
java.base/sun.security.ssl.TransportContext.fatal(TransportContext.java:305)
at 
java.base/sun.security.ssl.Alert$AlertConsumer.consume(Alert.java:250)
at 
java.base/sun.security.ssl.TransportContext.dispatch(TransportContext.java:204)
at java.base/sun.security.ssl.SSLTransport.decode(SSLTransport.java:172)
at 
java.base/sun.security.ssl.SSLSocketImpl.decode(SSLSocketImpl.java:1503)
at 
java.base/sun.security.ssl.SSLSocketImpl.readApplicationRecord(SSLSocketImpl.java:1474)
at 
java.base/sun.security.ssl.SSLSocketImpl$AppInputStream.read(SSLSocketImpl.java:1059)
at 
java.base/java.io.BufferedInputStream.fill(BufferedInputStream.java:244)
at 
java.base/java.io.BufferedInputStream.read1(BufferedInputStream.java:284)
at 
java.base/java.io.BufferedInputStream.read(BufferedInputStream.java:343)
at 
java.base/sun.net.www.http.HttpClient.parseHTTPHeader(HttpClient.java:791)
at java.base/sun.net.www.http.HttpClient.parseHTTP(HttpClient.java:726)
at java.base/sun.net.www.http.HttpClient.parseHTTP(HttpClient.java:750)
at 
java.base/sun.net.www.protocol.http.HttpURLConnection.getInputStream0(HttpURLConnection.java:1688)
at 
java.base/sun.net.www.protocol.http.HttpURLConnection.getInputStream(HttpURLConnection.java:1589)
at 
java.base/java.net.HttpURLConnection.getResponseCode(HttpURLConnection.java:529)
at 
java.base/sun.net.www.protocol.https.HttpsURLConnectionImpl.getResponseCode(HttpsURLConnectionImpl.java:308)
at 
org.apache.catalina.startup.TomcatBaseTest.postUrl(TomcatBaseTest.java:794)
at 
org.apache.catalina.startup.TomcatBaseTest.postUrl(TomcatBaseTest.java:749)
at 
org.apache.catalina.startup.TomcatBaseTest.postUrl(TomcatBaseTest.java:720)
at 
org.apache.tomcat.util.net.TestClientCert.doTestClientCertPost(TestClientCert.java:184)
at 
org.apache.tomcat.util.net.TestClientCert.testClientCertPostZero(TestClientCert.java:133)
at 
java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at 
java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
at 
java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)


2022年9月13日 05:00，Mark Thomas  写道：

The proposed Apache Tomcat 10.1.0-M18 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.

The notable changes compared to 10.1.0-M17 are:

- Add support for authenticating WebSocket clients with an HTTP forward
proxy when establishing a connection to a WebSocket endpoint via a
forward proxy that requires authentication. Based on a patch provided
by Joe Mokos.

- Various fixes for edge case bugs in EL processing

- Improve host header handling for HTTP/2 requests

For full details, see the change log:
https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/changelog.html

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.0-M18/

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

The tag is:
https://github.com/apache/tomcat/tree/10.1.0-M18
ae9df1bcc169a5b03adea54c8c19ca9bd902e44f


The proposed 10.1.0-M18 release is:
[ ] Broken - do not release
[ ] Beta - go ahead and release as 10.1.0-M18 (beta)

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






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