[GitHub] [tomcat] pavandv9 commented on pull request #481: changing HashMap to LinkedHashMap to maintain execution order of deployment

2022-03-09 Thread GitBox


pavandv9 commented on pull request #481:
URL: https://github.com/apache/tomcat/pull/481#issuecomment-1063696340


   Can someone review this.


-- 
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] pavandv9 removed a comment on pull request #481: changing HashMap to LinkedHashMap to maintain execution order of deployment

2022-03-09 Thread GitBox


pavandv9 removed a comment on pull request #481:
URL: https://github.com/apache/tomcat/pull/481#issuecomment-1063696340


   Can someone review this.


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



[Bug 65947] New: Typos in http2 documentation and translation

2022-03-09 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=65947

Bug ID: 65947
   Summary: Typos in http2 documentation and translation
   Product: Tomcat 10
   Version: 10.0.16
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Documentation
  Assignee: dev@tomcat.apache.org
  Reporter: thomas.hoffm...@speed4trade.com
  Target Milestone: --

Hello,
just want to report two small typos:

On the website https://tomcat.apache.org/tomcat-10.0-doc/config/http2.html
there is mentioned at the bottom:

The HTTP/2 upgrade protocol will also inherit the following limits from the
HTTP Connector it is nested with:
...
- maxHeaderSize
...

However the fields name is maxHttpHeaderSize (the Http is missing). The
provided link doesn't list any field named maxHeaderSize.


Another typo is in the resource file:
\java\org\apache\catalina\connector\LocalStrings_de.properties

It should be:
coyoteRequest.gssLifetimeFail=Die verbleibende Lebenszeit für den Principal
[{0}] konnte nicht ermittelt werden.

(the s in Lebenszeit is missing, see
https://www.duden.de/rechtschreibung/Lebenszeit )

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



[VOTE] Release Apache Tomcat 9.0.60

2022-03-09 Thread Rémy Maucherat
The proposed Apache Tomcat 9.0.60 release is now available for voting.

The notable changes compared to 9.0.59 are:

- Fix a potential thread-safety issue that could cause HTTP/1.1 request
   processing to pause, and potentially timeout, waiting for additional
   data when the full request has been received.

- Fix a regression introduced with 65757 bugfix which better identified
   non request threads but which introduced a similar problem when user
   code was doing sequential operations in a single thread.

- When resolving methods in EL expressions that use beans and/or static
   fields, ensure that any custom type conversion is considered when
   identifying the method to call.

Along with lots of other bug fixes and improvements.

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

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.60/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1362
The tag is:
https://github.com/apache/tomcat/tree/9.0.60
235730aed454e8d3619109f2c563587ff722e69d

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

Rémy

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



[GitHub] [tomcat] pavandv9 opened a new pull request #481: changing HashMap to LinkedHashMap to maintain execution order of deployment

2022-03-09 Thread GitBox


pavandv9 opened a new pull request #481:
URL: https://github.com/apache/tomcat/pull/481


   currently deployment order is not maintain, in order to overcome this we can 
change HashMap to LinkedHashMap.
   So that the deployment order in  maintained.


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



svn commit: r52947 - in /dev/tomcat/tomcat-9/v9.0.60: ./ bin/ bin/embed/ src/

2022-03-09 Thread remm
Author: remm
Date: Wed Mar  9 14:56:14 2022
New Revision: 52947

Log:
Upload 9.0.60 for vote

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

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

Added: dev/tomcat/tomcat-9/v9.0.60/KEYS
==
--- dev/tomcat/tomcat-9/v9.0.60/KEYS (added)
+++ dev/tomcat/tomcat-9/v9.0.60/KEYS Wed Mar  9 14:56:14 2022
@@ -0,0 +1,237 @@
+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   1024D/33C60243 2004-09-12
+  Key fingerprint = DCFD 35E0 BF8C A734 4752  DE8B 6FB2 1E89 33C6 0243
+uid  Mark E D Thomas 
+uid  Mark E D Thomas 
+uid  Mark E D Thomas 
+sub   2048g/0BECE548 2004-09-12
+
+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-
+Version: GnuPG v1.4.9 (MingW32)
+
+mQGiBEFEjegRBADocGttfROvtLGrTOW3xRqZHmFWybmEaI6jmnRdN/1gGXmb3wQL
+rHsS3fLFIIOYLPph0Kov9q4qNq36LekShIvjMBDFoj2/wRxaUtFq81asaRZg8Mcw
+4kVeIoe8OIOuWmvYhU8SH2jJNUnVVrpTPAa6QWquTmseNi6UJMjLxuL7DwCg//9u
+k2yj0vk6e4WSO6Fe5+EkQDED/AjQsy0kj9TpNHkKSSUR2evRlWPYA0YtxBSbsgON
+tT0cYipAp5IcYt6Zq5QzHiZreyQXLAjItDS2oGCIXfNbTYJ3kxxJTCU/3wlefVdq

[VOTE] Release Apache Tomcat 10.0.18

2022-03-09 Thread Mark Thomas

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

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

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


The notable changes compared to 10.0.17 are:

- Fix a potential thread-safety issue that could cause HTTP/1.1 request
  processing to pause, and potentially timeout, waiting for additional
  data when the full request has been received.

- Fix a regression introduced with 65757 bugfix which better identified
  non request threads but which introduced a similar problem when user
  code was doing sequential operations in a single thread.

- When resolving methods in EL expressions that use beans and/or static
  fields, ensure that any custom type conversion is considered when
  identifying the method to call.

Along with lots of other bug fixes and improvements.

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

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

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

The tag is:
https://github.com/apache/tomcat/tree/10.0.18
70f59e8328621e58b9493c119f05a2e57f597a1c

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

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



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

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

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


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

commit 1df89358989a5cf0b29c23cfa30062f8874483f6
Author: Mark Thomas 
AuthorDate: Wed Mar 9 14:44:26 2022 +

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

diff --git a/build.properties.default b/build.properties.default
index 268a77d..fa3f97c 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -31,7 +31,7 @@
 # - Version Control Flags -
 version.major=10
 version.minor=0
-version.build=18
+version.build=19
 version.patch=0
 version.suffix=-dev
 
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index f86e0dd..29a2e43 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -39,7 +39,7 @@ 
maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d
 maven.asf.release.repo.repositoryId=apache.releases.https
 
 # Release version info
-maven.asf.release.deploy.version=10.0.18
+maven.asf.release.deploy.version=10.0.19
 
 #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 eb4fb54..c29c535 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



[tomcat] branch 9.0.x updated: Next tag will be 9.0.61

2022-03-09 Thread remm
This is an automated email from the ASF dual-hosted git repository.

remm 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 b925f76  Next tag will be 9.0.61
b925f76 is described below

commit b925f769668fee1b6febf12153205ff6bdfd1258
Author: remm 
AuthorDate: Wed Mar 9 15:37:39 2022 +0100

Next tag will be 9.0.61
---
 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 6f14d4b..8b0a4da 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -31,7 +31,7 @@
 # - Version Control Flags -
 version.major=9
 version.minor=0
-version.build=60
+version.build=61
 version.patch=0
 version.suffix=-dev
 
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index e95da90..e47aef4 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -39,7 +39,7 @@ 
maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d
 maven.asf.release.repo.repositoryId=apache.releases.https
 
 # Release version info
-maven.asf.release.deploy.version=9.0.60
+maven.asf.release.deploy.version=9.0.61
 
 #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 c5e8512..f6b9abf 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



Re: [VOTE] Release Apache Tomcat 10.1.0-M12

2022-03-09 Thread Mark Thomas

On 09/03/2022 13:59, Mark Thomas wrote:




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


Unit tests pass for NIO and NIO2 on Linux, MacOS and Windows.

Mark

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



svn commit: r52945 - in /dev/tomcat/tomcat-10/v10.0.18: ./ bin/ bin/embed/ src/

2022-03-09 Thread markt
Author: markt
Date: Wed Mar  9 14:42:25 2022
New Revision: 52945

Log:
Upload 10.0.18 for voting

Added:
dev/tomcat/tomcat-10/v10.0.18/
dev/tomcat/tomcat-10/v10.0.18/KEYS
dev/tomcat/tomcat-10/v10.0.18/README.html
dev/tomcat/tomcat-10/v10.0.18/RELEASE-NOTES
dev/tomcat/tomcat-10/v10.0.18/bin/
dev/tomcat/tomcat-10/v10.0.18/bin/README.html
dev/tomcat/tomcat-10/v10.0.18/bin/apache-tomcat-10.0.18-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-10/v10.0.18/bin/apache-tomcat-10.0.18-deployer.tar.gz.asc

dev/tomcat/tomcat-10/v10.0.18/bin/apache-tomcat-10.0.18-deployer.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.18/bin/apache-tomcat-10.0.18-deployer.zip   
(with props)
dev/tomcat/tomcat-10/v10.0.18/bin/apache-tomcat-10.0.18-deployer.zip.asc
dev/tomcat/tomcat-10/v10.0.18/bin/apache-tomcat-10.0.18-deployer.zip.sha512
dev/tomcat/tomcat-10/v10.0.18/bin/apache-tomcat-10.0.18-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-10/v10.0.18/bin/apache-tomcat-10.0.18-fulldocs.tar.gz.asc

dev/tomcat/tomcat-10/v10.0.18/bin/apache-tomcat-10.0.18-fulldocs.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.18/bin/apache-tomcat-10.0.18-windows-x64.zip   
(with props)
dev/tomcat/tomcat-10/v10.0.18/bin/apache-tomcat-10.0.18-windows-x64.zip.asc

dev/tomcat/tomcat-10/v10.0.18/bin/apache-tomcat-10.0.18-windows-x64.zip.sha512
dev/tomcat/tomcat-10/v10.0.18/bin/apache-tomcat-10.0.18-windows-x86.zip   
(with props)
dev/tomcat/tomcat-10/v10.0.18/bin/apache-tomcat-10.0.18-windows-x86.zip.asc

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

dev/tomcat/tomcat-10/v10.0.18/bin/embed/apache-tomcat-10.0.18-embed.tar.gz.asc

dev/tomcat/tomcat-10/v10.0.18/bin/embed/apache-tomcat-10.0.18-embed.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.18/bin/embed/apache-tomcat-10.0.18-embed.zip   
(with props)
dev/tomcat/tomcat-10/v10.0.18/bin/embed/apache-tomcat-10.0.18-embed.zip.asc

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

Added: dev/tomcat/tomcat-10/v10.0.18/KEYS
==
--- dev/tomcat/tomcat-10/v10.0.18/KEYS (added)
+++ dev/tomcat/tomcat-10/v10.0.18/KEYS Wed Mar  9 14:42:25 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+

[tomcat] 01/01: Tag 9.0.60

2022-03-09 Thread remm
This is an automated email from the ASF dual-hosted git repository.

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

commit 235730aed454e8d3619109f2c563587ff722e69d
Author: remm 
AuthorDate: Wed Mar 9 15:35:42 2022 +0100

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

diff --git a/build.properties.default b/build.properties.default
index 6f14d4b..cfcf772 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -33,7 +33,7 @@ version.major=9
 version.minor=0
 version.build=60
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Reproducible builds -
 # Uncomment and set to current time for reproducible builds
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c5e8512..a992b6d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,7 +104,7 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
   
 
   

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



[tomcat] tag 9.0.60 created (now 235730a)

2022-03-09 Thread remm
This is an automated email from the ASF dual-hosted git repository.

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


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

 new 235730a  Tag 9.0.60

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


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



[tomcat] tag 10.0.18 created (now 70f59e8)

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

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


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

 new 70f59e8  Tag 10.0.18

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


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



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

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

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


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

commit cfa443f844c9b39685e9ca650e6dcd1d7ae08bf9
Author: Mark Thomas 
AuthorDate: Wed Mar 9 14:25:01 2022 +

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

diff --git a/build.properties.default b/build.properties.default
index 0d7e958..7b4a7ec 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=-M12-dev
+version.suffix=-M13-dev
 
 # - Reproducible builds -
 # Uncomment and set to current time for reproducible builds
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index a161a48..a1429de 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-M12
+maven.asf.release.deploy.version=10.1.0-M13
 
 #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 206b0f5..0798598 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



[tomcat] 01/01: Tag 10.0.18

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

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

commit 70f59e8328621e58b9493c119f05a2e57f597a1c
Author: Mark Thomas 
AuthorDate: Wed Mar 9 14:25:39 2022 +

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

diff --git a/build.properties.default b/build.properties.default
index 268a77d..f988d66 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -33,7 +33,7 @@ version.major=10
 version.minor=0
 version.build=18
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Reproducible builds -
 # Uncomment and set to current time for reproducible builds
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index eb4fb54..eb4a358 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,7 +104,7 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
   
 
   

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



Re: March releases?

2022-03-09 Thread Christopher Schultz

Mark,

On 3/8/22 16:24, Mark Thomas wrote:

Hi all,

I know I suggested skipping the March releases but I'd like to revisit 
that in light of two things.


1. The concurrency issue I fixed earlier today. [1]
It has been present for a long time and we haven't had any bug reports. 
However, it just looks like a random timeout so users might not report it.
My main motivation is that a customer at $dayjob is affected by this so 
I'd like to get them onto a proper release rather than the snapshot they 
are currently using.


2. The fix for the regression caused by BZ 65757 [2]
No hard evidence for this one, just a general uneasiness about 
regressions in general.


So, thoughts on a set of releases for March?


The Feb releases were so late they were almost March releases. I'm happy 
skipping March but if there's anything anyone is anxious about, I'm also 
happy to roll another one.


-chris

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

2022-03-09 Thread Mark Thomas

The proposed Apache Tomcat 10.1.0-M12 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-M11 are:

- Fix a potential thread-safety issue that could cause HTTP/1.1 request
  processing to pause, and potentially timeout, waiting for additional
  data when the full request has been received.

- Fix a regression introduced with 65757 bugfix which better identified
  non request threads but which introduced a similar problem when user
  code was doing sequential operations in a single thread.

- When resolving methods in EL expressions that use beans and/or static
  fields, ensure that any custom type conversion is considered when
  identifying the method to call.

For full details, see the changelog:
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-M12/

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

The tag is:
https://github.com/apache/tomcat/tree/10.1.0-M12
d08498a3cefa7206bad791acf019455794f865ea


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

-
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

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

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


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

commit da696d750025bff988155744ad38301022698ee3
Author: Mark Thomas 
AuthorDate: Wed Mar 9 13:57:46 2022 +

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 82a134f..de3bc3d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -139,7 +139,7 @@
   
 Throw IOException rather than
 IllegalStateException when the application attempts to
-write to an GHTTP/2 stream after the client has closed the stream.
+write to an HTTP/2 stream after the client has closed the stream.
 (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

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

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


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

commit a7bc2a9d6bf730f194ce6735e781f83b196a0add
Author: Mark Thomas 
AuthorDate: Wed Mar 9 13:57:46 2022 +

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 b94e0d7..c5e8512 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -139,7 +139,7 @@
   
 Throw IOException rather than
 IllegalStateException when the application attempts to
-write to an GHTTP/2 stream after the client has closed the stream.
+write to an HTTP/2 stream after the client has closed the stream.
 (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

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

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


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

commit a955bfd9216e2782744eccfccf6188bb3b8c391b
Author: Mark Thomas 
AuthorDate: Wed Mar 9 13:57:46 2022 +

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 fe26044..eb4fb54 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -144,7 +144,7 @@
   
 Throw IOException rather than
 IllegalStateException when the application attempts to
-write to an GHTTP/2 stream after the client has closed the stream.
+write to an HTTP/2 stream after the client has closed the stream.
 (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

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

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


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

commit cd4d4061e36e4d5e635ec6e2d69c019c1a53bdbf
Author: Mark Thomas 
AuthorDate: Wed Mar 9 13:57:46 2022 +

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 edcbdb6..206b0f5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -144,7 +144,7 @@
   
 Throw IOException rather than
 IllegalStateException when the application attempts to
-write to an GHTTP/2 stream after the client has closed the stream.
+write to an HTTP/2 stream after the client has closed the stream.
 (markt)
   
 

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



svn commit: r52943 - in /release/tomcat: tomcat-10/v10.0.16/ tomcat-10/v10.1.0-M10/ tomcat-9/v9.0.58/

2022-03-09 Thread markt
Author: markt
Date: Wed Mar  9 13:48:30 2022
New Revision: 52943

Log:
Drop old releases from mirrors

Removed:
release/tomcat/tomcat-10/v10.0.16/
release/tomcat/tomcat-10/v10.1.0-M10/
release/tomcat/tomcat-9/v9.0.58/


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



svn commit: r52942 - in /dev/tomcat/tomcat-10/v10.1.0-M12: ./ bin/ bin/embed/ src/

2022-03-09 Thread markt
Author: markt
Date: Wed Mar  9 13:40:56 2022
New Revision: 52942

Log:
Upload 10.1.0-M12 for voting

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Added: dev/tomcat/tomcat-10/v10.1.0-M12/KEYS
==
--- dev/tomcat/tomcat-10/v10.1.0-M12/KEYS (added)
+++ dev/tomcat/tomcat-10/v10.1.0-M12/KEYS Wed Mar  9 13:40:56 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/RlLSDTTYoVlCZ1ni14qF

[tomcat] tag 10.1.0-M12 created (now d08498a)

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

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


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

 new d08498a  Tag 10.1.0-M12

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


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



[tomcat] 01/01: Tag 10.1.0-M12

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

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

commit d08498a3cefa7206bad791acf019455794f865ea
Author: Mark Thomas 
AuthorDate: Wed Mar 9 13:19:51 2022 +

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

diff --git a/build.properties.default b/build.properties.default
index 0d7e958..664af48 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=-M12-dev
+version.suffix=-M12
 
 # - Reproducible builds -
 # Uncomment and set to current time for reproducible builds
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index edcbdb6..adeab67 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,7 +104,7 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
   
 
   

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



Re: March releases?

2022-03-09 Thread Mark Thomas

On 08/03/2022 23:54, Konstantin Kolinko wrote:

ср, 9 мар. 2022 г. в 00:24, Mark Thomas :


Hi all,

I know I suggested skipping the March releases but I'd like to revisit
that in light of two things.

1. The concurrency issue I fixed earlier today. [1]
It has been present for a long time and we haven't had any bug reports.
However, it just looks like a random timeout so users might not report it.
My main motivation is that a customer at $dayjob is affected by this so
I'd like to get them onto a proper release rather than the snapshot they
are currently using.

2. The fix for the regression caused by BZ 65757 [2]
No hard evidence for this one, just a general uneasiness about
regressions in general.

So, thoughts on a set of releases for March?


1.  The following may be a bug to be addressed before a release:
See thread "Many IllegalStateException when using http2 protocol"
- I wonder why the code mentioned there throws an ISE instead of an
IOException (end of stream exception) when writing to a closed stream.
That method declares that it throws an IOException. I commented in
that thread. It is not in BZ yet.

2. +1 for rolling a release.


Tx. And Thanks Rémy.

I've fixed the issue above and the open issue in BZ.

I'm currently looking at the unit tests. I saw some failures on Windows 
but I was running on a different VM to usual. I suspect the test ran out 
of ports (my usual VM is configured for more ephemeral ports).


I'll re-run the tests on the usual VM and, if all is well, start tagging.

Mark

-
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: Throw IOE rather than ISE if application tries to write to closed stream

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 268dc53  Throw IOE rather than ISE if application tries to write to 
closed stream
268dc53 is described below

commit 268dc538581063345f41fbef9ddb387629b945ff
Author: Mark Thomas 
AuthorDate: Wed Mar 9 09:52:49 2022 +

Throw IOE rather than ISE if application tries to write to closed stream
---
 java/org/apache/coyote/http2/Stream.java | 2 +-
 webapps/docs/changelog.xml   | 6 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/http2/Stream.java 
b/java/org/apache/coyote/http2/Stream.java
index b8aa5ce..e2d7683 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -824,7 +824,7 @@ class Stream extends AbstractNonZeroStream implements 
HeaderEmitter {
 @Override
 public final synchronized int doWrite(ByteBuffer chunk) throws 
IOException {
 if (closed) {
-throw new IllegalStateException(
+throw new IOException (
 sm.getString("stream.closed", getConnectionId(), 
getIdAsString()));
 }
 int totalThisTime = 0;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index fed2b97..82a134f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -136,6 +136,12 @@
 processing to wait, and potentially timeout, waiting for additional
 data when the full request has been received. (markt)
   
+  
+Throw IOException rather than
+IllegalStateException when the application attempts to
+write to an GHTTP/2 stream after the client has closed the stream.
+(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: Throw IOE rather than ISE if application tries to write to closed stream

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 6a7dce6  Throw IOE rather than ISE if application tries to write to 
closed stream
6a7dce6 is described below

commit 6a7dce69bd8348a76be517517f323239476f554c
Author: Mark Thomas 
AuthorDate: Wed Mar 9 09:52:49 2022 +

Throw IOE rather than ISE if application tries to write to closed stream
---
 java/org/apache/coyote/http2/Stream.java | 2 +-
 webapps/docs/changelog.xml   | 6 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/http2/Stream.java 
b/java/org/apache/coyote/http2/Stream.java
index 83a061c..7086114 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -839,7 +839,7 @@ class Stream extends AbstractNonZeroStream implements 
HeaderEmitter {
 @Override
 public final synchronized int doWrite(ByteBuffer chunk) throws 
IOException {
 if (closed) {
-throw new IllegalStateException(
+throw new IOException (
 sm.getString("stream.closed", getConnectionId(), 
getIdAsString()));
 }
 // chunk is always fully written
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c42d010..b94e0d7 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -136,6 +136,12 @@
 processing to wait, and potentially timeout, waiting for additional
 data when the full request has been received. (markt)
   
+  
+Throw IOException rather than
+IllegalStateException when the application attempts to
+write to an GHTTP/2 stream after the client has closed the stream.
+(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: Throw IOE rather than ISE if application tries to write to closed stream

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

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new f1bb690  Throw IOE rather than ISE if application tries to write to 
closed stream
f1bb690 is described below

commit f1bb69036d2bdf5faca83493e7b2deb2cb6edf33
Author: Mark Thomas 
AuthorDate: Wed Mar 9 09:52:49 2022 +

Throw IOE rather than ISE if application tries to write to closed stream
---
 java/org/apache/coyote/http2/Stream.java | 2 +-
 webapps/docs/changelog.xml   | 6 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/http2/Stream.java 
b/java/org/apache/coyote/http2/Stream.java
index ed5da75..03eaf43 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -839,7 +839,7 @@ class Stream extends AbstractNonZeroStream implements 
HeaderEmitter {
 @Override
 public final synchronized int doWrite(ByteBuffer chunk) throws 
IOException {
 if (closed) {
-throw new IllegalStateException(
+throw new IOException (
 sm.getString("stream.closed", getConnectionId(), 
getIdAsString()));
 }
 // chunk is always fully written
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3fff64f..fe26044 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -141,6 +141,12 @@
 processing to wait, and potentially timeout, waiting for additional
 data when the full request has been received. (markt)
   
+  
+Throw IOException rather than
+IllegalStateException when the application attempts to
+write to an GHTTP/2 stream after the client has closed the stream.
+(markt)
+  
 
   
   

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



[tomcat] branch main updated: Throw IOE rather than ISE if application tries to write to closed stream

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

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


The following commit(s) were added to refs/heads/main by this push:
 new b738fa6  Throw IOE rather than ISE if application tries to write to 
closed stream
b738fa6 is described below

commit b738fa6ee0e6789b104e652d95c982827e9753dd
Author: Mark Thomas 
AuthorDate: Wed Mar 9 09:52:49 2022 +

Throw IOE rather than ISE if application tries to write to closed stream
---
 java/org/apache/coyote/http2/Stream.java | 2 +-
 webapps/docs/changelog.xml   | 6 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/http2/Stream.java 
b/java/org/apache/coyote/http2/Stream.java
index 076226f..a142836 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -844,7 +844,7 @@ class Stream extends AbstractNonZeroStream implements 
HeaderEmitter {
 @Override
 public final synchronized int doWrite(ByteBuffer chunk) throws 
IOException {
 if (closed) {
-throw new IllegalStateException(
+throw new IOException (
 sm.getString("stream.closed", getConnectionId(), 
getIdAsString()));
 }
 // chunk is always fully written
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f09364a..edcbdb6 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -141,6 +141,12 @@
 processing to wait, and potentially timeout, waiting for additional
 data when the full request has been received. (markt)
   
+  
+Throw IOException rather than
+IllegalStateException when the application attempts to
+write to an GHTTP/2 stream after the client has closed the stream.
+(markt)
+  
 
   
   

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



[Bug 65940] DefaultInstanceManager.destroyInstance can lead to a NullPointerException

2022-03-09 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=65940

--- Comment #2 from reda-ala...@hey.com ---
Thank you !

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



[Bug 65940] DefaultInstanceManager.destroyInstance can lead to a NullPointerException

2022-03-09 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=65940

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #1 from Mark Thomas  ---
Thanks for the report.

Fixed in:
- 10.1.x for 10.1.0-M12 onwards
- 10.0.x for 10.0.18 onwards
- 9.0.x for 9.0.60 onwards
- 8.5.x for 8.5.77 onwards

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



[tomcat] branch 8.5.x updated: Fix NPE if exception occurs during destruction of Servlet - BZ 65940

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 9f94deb  Fix NPE if exception occurs during destruction of Servlet - 
BZ 65940
9f94deb is described below

commit 9f94deb0d6b626441ab388e22be4ef43a2d1368f
Author: Mark Thomas 
AuthorDate: Wed Mar 9 09:22:34 2022 +

Fix NPE if exception occurs during destruction of Servlet - BZ 65940

https://bz.apache.org/bugzilla/show_bug.cgi?id=65940
Also includes a trivial optimisation
---
 java/org/apache/catalina/core/StandardWrapper.java | 4 ++--
 webapps/docs/changelog.xml | 4 
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/core/StandardWrapper.java 
b/java/org/apache/catalina/core/StandardWrapper.java
index 2388f3d..a7ebe83 100644
--- a/java/org/apache/catalina/core/StandardWrapper.java
+++ b/java/org/apache/catalina/core/StandardWrapper.java
@@ -1337,7 +1337,6 @@ public class StandardWrapper extends ContainerBase
 } catch (Throwable t) {
 t = ExceptionUtils.unwrapInvocationTargetException(t);
 ExceptionUtils.handleThrowable(t);
-instance = null;
 instancePool = null;
 nInstances = 0;
 fireContainerEvent("unload", this);
@@ -1366,12 +1365,13 @@ public class StandardWrapper extends ContainerBase
 }
 }
 }
+instance = null;
+instanceInitialized = false;
 }
 }
 
 // Deregister the destroyed instance
 instance = null;
-instanceInitialized = false;
 
 if (isJspServlet && jspMonitorON != null ) {
 Registry.getRegistry(null, null).unregisterComponent(jspMonitorON);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d50cfa0..fed2b97 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -117,6 +117,10 @@
 original request cannot be mapped to a context. This typically happens
 when no ROOT context is defined. Pull request by elkman. (markt)
   
+  
+65940: Fix NullPointerException if an exception
+occurs during the destruction of a Servlet. (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 NPE if exception occurs during destruction of Servlet - BZ 65940

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 275ac79  Fix NPE if exception occurs during destruction of Servlet - 
BZ 65940
275ac79 is described below

commit 275ac79558379108cce4907abd9cfe6599b21d19
Author: Mark Thomas 
AuthorDate: Wed Mar 9 09:22:34 2022 +

Fix NPE if exception occurs during destruction of Servlet - BZ 65940

https://bz.apache.org/bugzilla/show_bug.cgi?id=65940
Also includes a trivial optimisation
---
 java/org/apache/catalina/core/StandardWrapper.java | 4 ++--
 webapps/docs/changelog.xml | 4 
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/core/StandardWrapper.java 
b/java/org/apache/catalina/core/StandardWrapper.java
index 6d41a5f..4a73bbe 100644
--- a/java/org/apache/catalina/core/StandardWrapper.java
+++ b/java/org/apache/catalina/core/StandardWrapper.java
@@ -1328,7 +1328,6 @@ public class StandardWrapper extends ContainerBase
 } catch (Throwable t) {
 t = ExceptionUtils.unwrapInvocationTargetException(t);
 ExceptionUtils.handleThrowable(t);
-instance = null;
 instancePool = null;
 nInstances = 0;
 fireContainerEvent("unload", this);
@@ -1357,12 +1356,13 @@ public class StandardWrapper extends ContainerBase
 }
 }
 }
+instance = null;
+instanceInitialized = false;
 }
 }
 
 // Deregister the destroyed instance
 instance = null;
-instanceInitialized = false;
 
 if (isJspServlet && jspMonitorON != null ) {
 Registry.getRegistry(null, null).unregisterComponent(jspMonitorON);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9f28ce2..c42d010 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -117,6 +117,10 @@
 original request cannot be mapped to a context. This typically happens
 when no ROOT context is defined. Pull request by elkman. (markt)
   
+  
+65940: Fix NullPointerException if an exception
+occurs during the destruction of a Servlet. (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 NPE if exception occurs during destruction of Servlet - BZ 65940

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

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new b555cc0  Fix NPE if exception occurs during destruction of Servlet - 
BZ 65940
b555cc0 is described below

commit b555cc0cac22ef095f34609946fd44ca92f968bf
Author: Mark Thomas 
AuthorDate: Wed Mar 9 09:22:34 2022 +

Fix NPE if exception occurs during destruction of Servlet - BZ 65940

https://bz.apache.org/bugzilla/show_bug.cgi?id=65940
Also includes a trivial optimisation
---
 java/org/apache/catalina/core/StandardWrapper.java | 4 ++--
 webapps/docs/changelog.xml | 4 
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/core/StandardWrapper.java 
b/java/org/apache/catalina/core/StandardWrapper.java
index f40f487..c9d6071 100644
--- a/java/org/apache/catalina/core/StandardWrapper.java
+++ b/java/org/apache/catalina/core/StandardWrapper.java
@@ -1329,7 +1329,6 @@ public class StandardWrapper extends ContainerBase
 } catch (Throwable t) {
 t = ExceptionUtils.unwrapInvocationTargetException(t);
 ExceptionUtils.handleThrowable(t);
-instance = null;
 instancePool = null;
 nInstances = 0;
 fireContainerEvent("unload", this);
@@ -1358,12 +1357,13 @@ public class StandardWrapper extends ContainerBase
 }
 }
 }
+instance = null;
+instanceInitialized = false;
 }
 }
 
 // Deregister the destroyed instance
 instance = null;
-instanceInitialized = false;
 
 if (isJspServlet && jspMonitorON != null ) {
 Registry.getRegistry(null, null).unregisterComponent(jspMonitorON);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2a1c8f5..3fff64f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -122,6 +122,10 @@
 original request cannot be mapped to a context. This typically happens
 when no ROOT context is defined. Pull request by elkman. (markt)
   
+  
+65940: Fix NullPointerException if an exception
+occurs during the destruction of a Servlet. (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 NPE if exception occurs during destruction of Servlet - BZ 65940

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

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


The following commit(s) were added to refs/heads/main by this push:
 new f4e0502  Fix NPE if exception occurs during destruction of Servlet - 
BZ 65940
f4e0502 is described below

commit f4e0502daf575c0f47a1bbf9eb45c4b6c85fd7e2
Author: Mark Thomas 
AuthorDate: Wed Mar 9 09:22:34 2022 +

Fix NPE if exception occurs during destruction of Servlet - BZ 65940

https://bz.apache.org/bugzilla/show_bug.cgi?id=65940
Also includes a trivial optimisation
---
 java/org/apache/catalina/core/StandardWrapper.java | 4 ++--
 webapps/docs/changelog.xml | 4 
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/core/StandardWrapper.java 
b/java/org/apache/catalina/core/StandardWrapper.java
index 22aef41..7f72326 100644
--- a/java/org/apache/catalina/core/StandardWrapper.java
+++ b/java/org/apache/catalina/core/StandardWrapper.java
@@ -1158,7 +1158,6 @@ public class StandardWrapper extends ContainerBase
 } catch (Throwable t) {
 t = ExceptionUtils.unwrapInvocationTargetException(t);
 ExceptionUtils.handleThrowable(t);
-instance = null;
 fireContainerEvent("unload", this);
 unloading = false;
 throw new ServletException
@@ -1185,12 +1184,13 @@ public class StandardWrapper extends ContainerBase
 }
 }
 }
+instance = null;
+instanceInitialized = false;
 }
 }
 
 // Deregister the destroyed instance
 instance = null;
-instanceInitialized = false;
 
 if (isJspServlet && jspMonitorON != null ) {
 Registry.getRegistry(null, null).unregisterComponent(jspMonitorON);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5f0850f..f09364a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -122,6 +122,10 @@
 original request cannot be mapped to a context. This typically happens
 when no ROOT context is defined. Pull request by elkman. (markt)
   
+  
+65940: Fix NullPointerException if an exception
+occurs during the destruction of a Servlet. (markt)
+  
 
   
   

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