Re: Security manager support

[Han Li]

> 2022年9月29日 00:16，Rémy Maucherat  写道：
> 
> On Wed, Sep 28, 2022 at 5:41 PM Mark Thomas  wrote:
>> 
>> On 28/09/2022 16:05, Emmanuel Bourg wrote:
>>> Hi all,
>>> 
>>> The security manager has been deprecated for removal in Java 17 [1], and
>>> at some point Tomcat will have to stop supporting it.
>>> 
>>> Do we want to wait until it's no longer available in the JDK to remove
>>> it from Tomcat, or should we remove it earlier, maybe in Tomcat 10.1 or 11?
>>> 
>>> I tend to think there are better solutions at the OS level to isolate a
>>> Tomcat instance nowadays, and I lean toward dropping it before its
>>> removal from the JDK.
>>> 
>>> What do you think?
>> 
>> I was thinking of proposing its removal for Tomcat 11. I think 10.1 is a
>> little early.
> 
> +1 if we want to attempt it 11 would be a plan. 12 would be too far
> away (it's frustrating !). -1 for 10.1, it's released now.
+1 
: )

Han
> 
> Rémy
> 
>> Mark
>> 
>> -
>> 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
> 


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

Re: Tomcat 11 and other plans

[Rémy Maucherat]

On Wed, Sep 28, 2022 at 6:05 PM Mark Thomas  wrote:
>
> Hi all,
>
> Various things have come together this week that have got me thinking
> about the next few months. They include:
> - Tomcat 10.1.x voted stable
> - Jakarta EE 10 released
> - Loom discussions at $work
>
> I've been thinking about a short term plan along the following lines:
>
> 1. Make the October release of 10.0.x the final release (barring any
> regressions or serious security issues).
>
> 2. After the October releases, create a 10.1.x branch and move main
> development to Tomcat 11.
>
> 3. Start on a JioLoomEndpoint and associated plumbing.
>
> 2 & 3 I think need a little more detail.
>
> Emmnanuel has already started the discussion about removing the
> SecurityManager. Minimum Java version is another key question but one
> where we'll need to wait for a decision from Jakarta EE. Are there any
> other significant pieces of work folks are thinking about for Tomcat 11?
>
> I'd quite like to start to picking off the low-hanging fruit from the
> Servlet spec issues list and being able to implement things in Tomcat 11
> is key to being able to do that.
>
>
> Interest in Loom seems to have picked up recently. I've been asked to
> present on Loom and Web Applications at the beginning of December so
> naturally I want to use Tomcat as the basis for my investigations. I
> have the basics (just HTTP Servlet and JSP requests, no HTTP/2, no
> WebSocket, no TLS, no async) working with relatively little code. My
> plan for Tomcat 11 would be continue this work, adding functionality and
> refactoring as necessary to:
> - enable a clean separation between the existing and Loom
>implementations
> - make any necessary adjustments to make Tomcat more Loom friendly

I am still not convinced by Loom for now, there are many problems. Ok
for Loom adjustments as long as they don't break the rest ;)

> I am currently have a BIO based Loom endpoint (I should probably rename
> that to BioLoomEndpoint). I don't currently see what an NioLoomEndpoint
> could offer but that is something to explore at some point.
>
> An obvious question at this point, particularly given that Loom is still
> in preview, is should this be in a separate module?

- Yes to a module, the Panama code in preview is there too, so it
would be consistent (also it seems to work for me). For example later,
it is possible to move Panama in the main tree as soon as we choose to
require Java 21 for building (with some additional build.xml
complexity).
- BIO seems to be the best for Loom. NIO doesn't seem worth even
trying. Async not sure, the current NIO2 is a new non blocking impl
with async on top, so not good. However, the Tomcat async layer should
be adaptable on top of BIO I think (some "non blocking" operations are
best if they were blocking).
- It needs the java.io JSSE impl again. OpenSSL is probably not usable
with it (Panama or JNI), or if it somehow works eventually it's bad
(Panama needs a real thread for native ...).
- Since Panama is probably not ok with Loom, this is a problem for
HTTP/3 (still thinking the best option is the future integrated
OpenSSL API and implementation for quic, which is starting to appear
right now).

Rémy

>
> Thoughts?
>
> Mark
>
> -
> 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: Security manager support

[Rémy Maucherat]

On Wed, Sep 28, 2022 at 5:41 PM Mark Thomas  wrote:
>
> On 28/09/2022 16:05, Emmanuel Bourg wrote:
> > Hi all,
> >
> > The security manager has been deprecated for removal in Java 17 [1], and
> > at some point Tomcat will have to stop supporting it.
> >
> > Do we want to wait until it's no longer available in the JDK to remove
> > it from Tomcat, or should we remove it earlier, maybe in Tomcat 10.1 or 11?
> >
> > I tend to think there are better solutions at the OS level to isolate a
> > Tomcat instance nowadays, and I lean toward dropping it before its
> > removal from the JDK.
> >
> > What do you think?
>
> I was thinking of proposing its removal for Tomcat 11. I think 10.1 is a
> little early.

+1 if we want to attempt it 11 would be a plan. 12 would be too far
away (it's frustrating !). -1 for 10.1, it's released now.

Rémy

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

Tomcat 11 and other plans

[Mark Thomas]

Hi all,

Various things have come together this week that have got me thinking 
about the next few months. They include:

- Tomcat 10.1.x voted stable
- Jakarta EE 10 released
- Loom discussions at $work

I've been thinking about a short term plan along the following lines:

1. Make the October release of 10.0.x the final release (barring any
   regressions or serious security issues).

2. After the October releases, create a 10.1.x branch and move main
   development to Tomcat 11.

3. Start on a JioLoomEndpoint and associated plumbing.

2 & 3 I think need a little more detail.

Emmnanuel has already started the discussion about removing the 
SecurityManager. Minimum Java version is another key question but one 
where we'll need to wait for a decision from Jakarta EE. Are there any 
other significant pieces of work folks are thinking about for Tomcat 11?


I'd quite like to start to picking off the low-hanging fruit from the 
Servlet spec issues list and being able to implement things in Tomcat 11 
is key to being able to do that.



Interest in Loom seems to have picked up recently. I've been asked to 
present on Loom and Web Applications at the beginning of December so 
naturally I want to use Tomcat as the basis for my investigations. I 
have the basics (just HTTP Servlet and JSP requests, no HTTP/2, no 
WebSocket, no TLS, no async) working with relatively little code. My 
plan for Tomcat 11 would be continue this work, adding functionality and 
refactoring as necessary to:

- enable a clean separation between the existing and Loom
  implementations
- make any necessary adjustments to make Tomcat more Loom friendly

I am currently have a BIO based Loom endpoint (I should probably rename 
that to BioLoomEndpoint). I don't currently see what an NioLoomEndpoint 
could offer but that is something to explore at some point.


An obvious question at this point, particularly given that Loom is still 
in preview, is should this be in a separate module?


Thoughts?

Mark

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

Re: [tomcat] branch main updated: Revert "Fix the typos in the XML schemas" due to license concerns

[Mark Thomas]

On 28/09/2022 15:12, ebo...@apache.org wrote:

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

ebourg 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 23cb7814b1 Revert "Fix the typos in the XML schemas" due to license 
concerns
23cb7814b1 is described below

commit 23cb7814b1f692c25fd07cc3ae46dc5982edd162
Author: Emmanuel Bourg 
AuthorDate: Wed Sep 28 16:08:37 2022 +0200

 Revert "Fix the typos in the XML schemas" due to license concerns


Thanks.

Some of these typos have been annoying me for years. I guess we could 
try and see if the Jakarta schemas project will accept corrections for 
these.


Mark

 
 This reverts commit 2609b760e969cdbd096816fac65dd4a97cdc585c.

---
  java/jakarta/servlet/jsp/resources/jspxml.xsd| 2 +-
  java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd| 4 ++--
  java/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd | 4 ++--
  java/jakarta/servlet/resources/javaee_web_services_1_2.xsd   | 2 +-
  java/jakarta/servlet/resources/javaee_web_services_1_3.xsd   | 2 +-
  java/jakarta/servlet/resources/javaee_web_services_1_4.xsd   | 2 +-
  java/jakarta/servlet/resources/javaee_web_services_client_1_2.xsd| 2 +-
  java/jakarta/servlet/resources/javaee_web_services_client_1_3.xsd| 2 +-
  java/jakarta/servlet/resources/javaee_web_services_client_1_4.xsd| 2 +-
  java/jakarta/servlet/resources/jsp_3_0.xsd   | 2 +-
  java/jakarta/servlet/resources/jsp_3_1.xsd   | 2 +-
  java/jakarta/servlet/resources/web-app_3_0.xsd   | 2 +-
  java/jakarta/servlet/resources/web-app_3_1.xsd   | 2 +-
  java/jakarta/servlet/resources/web-app_4_0.xsd   | 2 +-
  java/jakarta/servlet/resources/web-app_5_0.xsd   | 2 +-
  java/jakarta/servlet/resources/web-app_6_0.xsd   | 2 +-
  java/jakarta/servlet/resources/web-fragment_3_0.xsd  | 2 +-
  java/jakarta/servlet/resources/web-fragment_3_1.xsd  | 2 +-
  java/jakarta/servlet/resources/web-fragment_4_0.xsd  | 2 +-
  java/jakarta/servlet/resources/web-fragment_5_0.xsd  | 2 +-
  java/jakarta/servlet/resources/web-fragment_6_0.xsd  | 2 +-
  java/jakarta/servlet/resources/web-jsptaglibrary_3_0.xsd | 4 ++--
  java/jakarta/servlet/resources/web-jsptaglibrary_3_1.xsd | 4 ++--
  23 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/java/jakarta/servlet/jsp/resources/jspxml.xsd 
b/java/jakarta/servlet/jsp/resources/jspxml.xsd
index d93c6156e6..4cad6bb2bc 100644
--- a/java/jakarta/servlet/jsp/resources/jspxml.xsd
+++ b/java/jakarta/servlet/jsp/resources/jspxml.xsd
@@ -415,7 +415,7 @@
  jsp:useBean action or a custom action with an associated
  VariableInfo entry for this name.
  
-Exact valid combinations are not expressible in XML Schema.

+Exact valid combinations are not expressable in XML Schema.
  They are:
  
  name="Identifier" property="*"

diff --git a/java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd 
b/java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd
index c9963a7540..9f5716b32f 100644
--- a/java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd
+++ b/java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd
@@ -303,7 +303,7 @@
com.wombat.empl.EmployeeService
  
  This may not be specified in case there is no Service

-Endpoint Interface as is the case with directly using an
+Enpoint Interface as is the case with directly using an
  implementation class with the @WebService annotation.
  
  When the port component is a Provider implementation

@@ -464,7 +464,7 @@

  
  The jaxrpc-mapping-file element contains the name of a file that

-describes the Jakarta XML RPC mapping between the Java interfaces 
used by
+describes the Jakarta XML RPC mapping between the Java interaces 
used by
  the application and the WSDL description in the wsdl-file.  The
  file name is a relative path within the module.
  
diff --git a/java/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd b/java/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd

index 5547d5e50a..dd01c6f5a3 100644
--- a/java/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd
+++ b/java/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd
@@ -122,7 +122,7 @@

  
  The jaxrpc-mapping-file element contains the name of a file that

-describes the Jakarta XML RPC mapping between the Java interfaces 
used by

Re: Security manager support

[Mark Thomas]

On 28/09/2022 16:05, Emmanuel Bourg wrote:

Hi all,

The security manager has been deprecated for removal in Java 17 [1], and 
at some point Tomcat will have to stop supporting it.


Do we want to wait until it's no longer available in the JDK to remove 
it from Tomcat, or should we remove it earlier, maybe in Tomcat 10.1 or 11?


I tend to think there are better solutions at the OS level to isolate a 
Tomcat instance nowadays, and I lean toward dropping it before its 
removal from the JDK.


What do you think?


I was thinking of proposing its removal for Tomcat 11. I think 10.1 is a 
little early.


Mark

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

Security manager support

[Emmanuel Bourg]

Hi all,

The security manager has been deprecated for removal in Java 17 [1], and 
at some point Tomcat will have to stop supporting it.


Do we want to wait until it's no longer available in the JDK to remove 
it from Tomcat, or should we remove it earlier, maybe in Tomcat 10.1 or 11?


I tend to think there are better solutions at the OS level to isolate a 
Tomcat instance nowadays, and I lean toward dropping it before its 
removal from the JDK.


What do you think?

Emmanuel Bourg

[1] https://openjdk.org/jeps/411

-
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: Revert "Fix the typos in the XML schemas" due to license concerns

[ebourg]

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

ebourg 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 c4f80f968c Revert "Fix the typos in the XML schemas" due to license 
concerns
c4f80f968c is described below

commit c4f80f968c73b0552c7bc5edd8a9432e3630caeb
Author: Emmanuel Bourg 
AuthorDate: Wed Sep 28 16:09:45 2022 +0200

Revert "Fix the typos in the XML schemas" due to license concerns

This reverts commit 4cab8699492fbb0c79b61e0dc00469cf63b06ea1.
---
 java/javax/servlet/jsp/resources/jspxml.xsd | 2 +-
 java/javax/servlet/resources/javaee_web_services_1_2.xsd| 2 +-
 java/javax/servlet/resources/javaee_web_services_1_3.xsd| 2 +-
 java/javax/servlet/resources/javaee_web_services_1_4.xsd| 2 +-
 java/javax/servlet/resources/javaee_web_services_client_1_2.xsd | 2 +-
 java/javax/servlet/resources/javaee_web_services_client_1_3.xsd | 2 +-
 java/javax/servlet/resources/javaee_web_services_client_1_4.xsd | 2 +-
 java/javax/servlet/resources/web-app_3_0.xsd| 2 +-
 java/javax/servlet/resources/web-app_3_1.xsd| 2 +-
 java/javax/servlet/resources/web-app_4_0.xsd| 2 +-
 java/javax/servlet/resources/web-fragment_3_0.xsd   | 2 +-
 java/javax/servlet/resources/web-fragment_3_1.xsd   | 2 +-
 java/javax/servlet/resources/web-fragment_4_0.xsd   | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/java/javax/servlet/jsp/resources/jspxml.xsd 
b/java/javax/servlet/jsp/resources/jspxml.xsd
index 1634d208d9..0e5eba0b36 100644
--- a/java/javax/servlet/jsp/resources/jspxml.xsd
+++ b/java/javax/servlet/jsp/resources/jspxml.xsd
@@ -414,7 +414,7 @@
 jsp:useBean action or a custom action with an associated
 VariableInfo entry for this name.
 
-Exact valid combinations are not expressible in XML Schema.
+Exact valid combinations are not expressable in XML Schema.
 They are:
 
 name="Identifier" property="*"
diff --git a/java/javax/servlet/resources/javaee_web_services_1_2.xsd 
b/java/javax/servlet/resources/javaee_web_services_1_2.xsd
index ec5540dd6c..43914742ff 100644
--- a/java/javax/servlet/resources/javaee_web_services_1_2.xsd
+++ b/java/javax/servlet/resources/javaee_web_services_1_2.xsd
@@ -336,7 +336,7 @@
   com.wombat.empl.EmployeeService
 
   This may not be specified in case there is no Service
-  Endpoint Interface as is the case with directly using an
+  Enpoint Interface as is the case with directly using an
   implementation class with the @WebService annotation.
 
   When the port component is a Provider implementation
diff --git a/java/javax/servlet/resources/javaee_web_services_1_3.xsd 
b/java/javax/servlet/resources/javaee_web_services_1_3.xsd
index 71d4b33f73..d69d723e1d 100644
--- a/java/javax/servlet/resources/javaee_web_services_1_3.xsd
+++ b/java/javax/servlet/resources/javaee_web_services_1_3.xsd
@@ -332,7 +332,7 @@
   com.wombat.empl.EmployeeService
 
 This may not be specified in case there is no Service
-Endpoint Interface as is the case with directly using an
+Enpoint Interface as is the case with directly using an
 implementation class with the @WebService annotation.
 
 When the port component is a Provider implementation
diff --git a/java/javax/servlet/resources/javaee_web_services_1_4.xsd 
b/java/javax/servlet/resources/javaee_web_services_1_4.xsd
index 032e6b7492..e32c5b7d0c 100644
--- a/java/javax/servlet/resources/javaee_web_services_1_4.xsd
+++ b/java/javax/servlet/resources/javaee_web_services_1_4.xsd
@@ -332,7 +332,7 @@
   com.wombat.empl.EmployeeService
 
 This may not be specified in case there is no Service
-Endpoint Interface as is the case with directly using an
+Enpoint Interface as is the case with directly using an
 implementation class with the @WebService annotation.
 
 When the port component is a Provider implementation
diff --git a/java/javax/servlet/resources/javaee_web_services_client_1_2.xsd 
b/java/javax/servlet/resources/javaee_web_services_client_1_2.xsd
index e32af449b3..e95308a0a8 100644
--- a/java/javax/servlet/resources/javaee_web_services_client_1_2.xsd
+++ b/java/javax/servlet/resources/javaee_web_services_client_1_2.xsd
@@ -260,7 +260,7 @@
   
 
 The service-qname element declares the specific WSDL service
-element that is being referred to.  It is not specified if no
+element that is being refered to.  It is not specified if no
 wsdl-file is declared.
 
   
diff --git 

[tomcat] branch main updated: Revert "Fix the typos in the XML schemas" due to license concerns

[ebourg]

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

ebourg 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 23cb7814b1 Revert "Fix the typos in the XML schemas" due to license 
concerns
23cb7814b1 is described below

commit 23cb7814b1f692c25fd07cc3ae46dc5982edd162
Author: Emmanuel Bourg 
AuthorDate: Wed Sep 28 16:08:37 2022 +0200

Revert "Fix the typos in the XML schemas" due to license concerns

This reverts commit 2609b760e969cdbd096816fac65dd4a97cdc585c.
---
 java/jakarta/servlet/jsp/resources/jspxml.xsd| 2 +-
 java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd| 4 ++--
 java/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd | 4 ++--
 java/jakarta/servlet/resources/javaee_web_services_1_2.xsd   | 2 +-
 java/jakarta/servlet/resources/javaee_web_services_1_3.xsd   | 2 +-
 java/jakarta/servlet/resources/javaee_web_services_1_4.xsd   | 2 +-
 java/jakarta/servlet/resources/javaee_web_services_client_1_2.xsd| 2 +-
 java/jakarta/servlet/resources/javaee_web_services_client_1_3.xsd| 2 +-
 java/jakarta/servlet/resources/javaee_web_services_client_1_4.xsd| 2 +-
 java/jakarta/servlet/resources/jsp_3_0.xsd   | 2 +-
 java/jakarta/servlet/resources/jsp_3_1.xsd   | 2 +-
 java/jakarta/servlet/resources/web-app_3_0.xsd   | 2 +-
 java/jakarta/servlet/resources/web-app_3_1.xsd   | 2 +-
 java/jakarta/servlet/resources/web-app_4_0.xsd   | 2 +-
 java/jakarta/servlet/resources/web-app_5_0.xsd   | 2 +-
 java/jakarta/servlet/resources/web-app_6_0.xsd   | 2 +-
 java/jakarta/servlet/resources/web-fragment_3_0.xsd  | 2 +-
 java/jakarta/servlet/resources/web-fragment_3_1.xsd  | 2 +-
 java/jakarta/servlet/resources/web-fragment_4_0.xsd  | 2 +-
 java/jakarta/servlet/resources/web-fragment_5_0.xsd  | 2 +-
 java/jakarta/servlet/resources/web-fragment_6_0.xsd  | 2 +-
 java/jakarta/servlet/resources/web-jsptaglibrary_3_0.xsd | 4 ++--
 java/jakarta/servlet/resources/web-jsptaglibrary_3_1.xsd | 4 ++--
 23 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/java/jakarta/servlet/jsp/resources/jspxml.xsd 
b/java/jakarta/servlet/jsp/resources/jspxml.xsd
index d93c6156e6..4cad6bb2bc 100644
--- a/java/jakarta/servlet/jsp/resources/jspxml.xsd
+++ b/java/jakarta/servlet/jsp/resources/jspxml.xsd
@@ -415,7 +415,7 @@
 jsp:useBean action or a custom action with an associated
 VariableInfo entry for this name.
 
-Exact valid combinations are not expressible in XML Schema.
+Exact valid combinations are not expressable in XML Schema.
 They are:
 
 name="Identifier" property="*"
diff --git a/java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd 
b/java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd
index c9963a7540..9f5716b32f 100644
--- a/java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd
+++ b/java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd
@@ -303,7 +303,7 @@
   com.wombat.empl.EmployeeService
 
 This may not be specified in case there is no Service
-Endpoint Interface as is the case with directly using an
+Enpoint Interface as is the case with directly using an
 implementation class with the @WebService annotation.
 
 When the port component is a Provider implementation
@@ -464,7 +464,7 @@
   
 
 The jaxrpc-mapping-file element contains the name of a file that
-describes the Jakarta XML RPC mapping between the Java interfaces 
used by
+describes the Jakarta XML RPC mapping between the Java interaces 
used by
 the application and the WSDL description in the wsdl-file.  The
 file name is a relative path within the module.
 
diff --git 
a/java/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd 
b/java/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd
index 5547d5e50a..dd01c6f5a3 100644
--- a/java/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd
+++ b/java/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd
@@ -122,7 +122,7 @@
   
 
 The jaxrpc-mapping-file element contains the name of a file that
-describes the Jakarta XML RPC mapping between the Java interfaces 
used by
+describes the Jakarta XML RPC mapping between the Java interaces 
used by
 the application and the WSDL description in the wsdl-file.  The
 file name is a relative path within the module file.
 
@@ -140,7 +140,7 @@
   
 
   

[tomcat] branch 8.5.x updated: Revert "Fix the typos in the XML schemas" due to license concerns

[ebourg]

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

ebourg 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 d3c32685b9 Revert "Fix the typos in the XML schemas" due to license 
concerns
d3c32685b9 is described below

commit d3c32685b938647086f96a7baf9832541dbe5135
Author: Emmanuel Bourg 
AuthorDate: Wed Sep 28 16:10:09 2022 +0200

Revert "Fix the typos in the XML schemas" due to license concerns

This reverts commit ad7b58a80aca18c684491f724b9444bbf434d955.
---
 java/javax/servlet/jsp/resources/jspxml.xsd | 2 +-
 java/javax/servlet/resources/javaee_web_services_1_2.xsd| 2 +-
 java/javax/servlet/resources/javaee_web_services_1_3.xsd| 2 +-
 java/javax/servlet/resources/javaee_web_services_1_4.xsd| 2 +-
 java/javax/servlet/resources/javaee_web_services_client_1_2.xsd | 2 +-
 java/javax/servlet/resources/javaee_web_services_client_1_3.xsd | 2 +-
 java/javax/servlet/resources/javaee_web_services_client_1_4.xsd | 2 +-
 java/javax/servlet/resources/jsp_2_1.xsd| 2 +-
 java/javax/servlet/resources/web-app_3_0.xsd| 2 +-
 java/javax/servlet/resources/web-app_3_1.xsd| 2 +-
 java/javax/servlet/resources/web-fragment_3_0.xsd   | 2 +-
 java/javax/servlet/resources/web-fragment_3_1.xsd   | 2 +-
 java/javax/servlet/resources/web-jsptaglibrary_2_1.xsd  | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/java/javax/servlet/jsp/resources/jspxml.xsd 
b/java/javax/servlet/jsp/resources/jspxml.xsd
index 1634d208d9..0e5eba0b36 100644
--- a/java/javax/servlet/jsp/resources/jspxml.xsd
+++ b/java/javax/servlet/jsp/resources/jspxml.xsd
@@ -414,7 +414,7 @@
 jsp:useBean action or a custom action with an associated
 VariableInfo entry for this name.
 
-Exact valid combinations are not expressible in XML Schema.
+Exact valid combinations are not expressable in XML Schema.
 They are:
 
 name="Identifier" property="*"
diff --git a/java/javax/servlet/resources/javaee_web_services_1_2.xsd 
b/java/javax/servlet/resources/javaee_web_services_1_2.xsd
index ec5540dd6c..43914742ff 100644
--- a/java/javax/servlet/resources/javaee_web_services_1_2.xsd
+++ b/java/javax/servlet/resources/javaee_web_services_1_2.xsd
@@ -336,7 +336,7 @@
   com.wombat.empl.EmployeeService
 
   This may not be specified in case there is no Service
-  Endpoint Interface as is the case with directly using an
+  Enpoint Interface as is the case with directly using an
   implementation class with the @WebService annotation.
 
   When the port component is a Provider implementation
diff --git a/java/javax/servlet/resources/javaee_web_services_1_3.xsd 
b/java/javax/servlet/resources/javaee_web_services_1_3.xsd
index 71d4b33f73..d69d723e1d 100644
--- a/java/javax/servlet/resources/javaee_web_services_1_3.xsd
+++ b/java/javax/servlet/resources/javaee_web_services_1_3.xsd
@@ -332,7 +332,7 @@
   com.wombat.empl.EmployeeService
 
 This may not be specified in case there is no Service
-Endpoint Interface as is the case with directly using an
+Enpoint Interface as is the case with directly using an
 implementation class with the @WebService annotation.
 
 When the port component is a Provider implementation
diff --git a/java/javax/servlet/resources/javaee_web_services_1_4.xsd 
b/java/javax/servlet/resources/javaee_web_services_1_4.xsd
index 032e6b7492..e32c5b7d0c 100644
--- a/java/javax/servlet/resources/javaee_web_services_1_4.xsd
+++ b/java/javax/servlet/resources/javaee_web_services_1_4.xsd
@@ -332,7 +332,7 @@
   com.wombat.empl.EmployeeService
 
 This may not be specified in case there is no Service
-Endpoint Interface as is the case with directly using an
+Enpoint Interface as is the case with directly using an
 implementation class with the @WebService annotation.
 
 When the port component is a Provider implementation
diff --git a/java/javax/servlet/resources/javaee_web_services_client_1_2.xsd 
b/java/javax/servlet/resources/javaee_web_services_client_1_2.xsd
index e32af449b3..e95308a0a8 100644
--- a/java/javax/servlet/resources/javaee_web_services_client_1_2.xsd
+++ b/java/javax/servlet/resources/javaee_web_services_client_1_2.xsd
@@ -260,7 +260,7 @@
   
 
 The service-qname element declares the specific WSDL service
-element that is being referred to.  It is not specified if no
+element that is being refered to.  It is not specified if no
 wsdl-file is declared.
 
   
diff --git 

[tomcat] branch 10.0.x updated: Revert "Fix the typos in the XML schemas" due to license concerns

[ebourg]

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

ebourg 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 7ba0658d1f Revert "Fix the typos in the XML schemas" due to license 
concerns
7ba0658d1f is described below

commit 7ba0658d1f4d6fee59ea861ffebe48d3844cf741
Author: Emmanuel Bourg 
AuthorDate: Wed Sep 28 16:10:49 2022 +0200

Revert "Fix the typos in the XML schemas" due to license concerns

This reverts commit 43c66d94fa71cec746d6a4018194ee40fc6f2248.
---
 java/jakarta/servlet/jsp/resources/jspxml.xsd| 2 +-
 java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd| 4 ++--
 java/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd | 4 ++--
 java/jakarta/servlet/resources/javaee_web_services_1_2.xsd   | 2 +-
 java/jakarta/servlet/resources/javaee_web_services_1_3.xsd   | 2 +-
 java/jakarta/servlet/resources/javaee_web_services_1_4.xsd   | 2 +-
 java/jakarta/servlet/resources/javaee_web_services_client_1_2.xsd| 2 +-
 java/jakarta/servlet/resources/javaee_web_services_client_1_3.xsd| 2 +-
 java/jakarta/servlet/resources/javaee_web_services_client_1_4.xsd| 2 +-
 java/jakarta/servlet/resources/jsp_3_0.xsd   | 2 +-
 java/jakarta/servlet/resources/web-app_3_0.xsd   | 2 +-
 java/jakarta/servlet/resources/web-app_3_1.xsd   | 2 +-
 java/jakarta/servlet/resources/web-app_4_0.xsd   | 2 +-
 java/jakarta/servlet/resources/web-app_5_0.xsd   | 2 +-
 java/jakarta/servlet/resources/web-fragment_3_0.xsd  | 2 +-
 java/jakarta/servlet/resources/web-fragment_3_1.xsd  | 2 +-
 java/jakarta/servlet/resources/web-fragment_4_0.xsd  | 2 +-
 java/jakarta/servlet/resources/web-fragment_5_0.xsd  | 2 +-
 java/jakarta/servlet/resources/web-jsptaglibrary_3_0.xsd | 4 ++--
 19 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/java/jakarta/servlet/jsp/resources/jspxml.xsd 
b/java/jakarta/servlet/jsp/resources/jspxml.xsd
index 1634d208d9..0e5eba0b36 100644
--- a/java/jakarta/servlet/jsp/resources/jspxml.xsd
+++ b/java/jakarta/servlet/jsp/resources/jspxml.xsd
@@ -414,7 +414,7 @@
 jsp:useBean action or a custom action with an associated
 VariableInfo entry for this name.
 
-Exact valid combinations are not expressible in XML Schema.
+Exact valid combinations are not expressable in XML Schema.
 They are:
 
 name="Identifier" property="*"
diff --git a/java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd 
b/java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd
index c9963a7540..9f5716b32f 100644
--- a/java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd
+++ b/java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd
@@ -303,7 +303,7 @@
   com.wombat.empl.EmployeeService
 
 This may not be specified in case there is no Service
-Endpoint Interface as is the case with directly using an
+Enpoint Interface as is the case with directly using an
 implementation class with the @WebService annotation.
 
 When the port component is a Provider implementation
@@ -464,7 +464,7 @@
   
 
 The jaxrpc-mapping-file element contains the name of a file that
-describes the Jakarta XML RPC mapping between the Java interfaces 
used by
+describes the Jakarta XML RPC mapping between the Java interaces 
used by
 the application and the WSDL description in the wsdl-file.  The
 file name is a relative path within the module.
 
diff --git 
a/java/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd 
b/java/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd
index 5547d5e50a..dd01c6f5a3 100644
--- a/java/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd
+++ b/java/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd
@@ -122,7 +122,7 @@
   
 
 The jaxrpc-mapping-file element contains the name of a file that
-describes the Jakarta XML RPC mapping between the Java interfaces 
used by
+describes the Jakarta XML RPC mapping between the Java interaces 
used by
 the application and the WSDL description in the wsdl-file.  The
 file name is a relative path within the module file.
 
@@ -140,7 +140,7 @@
   
 
 The service-qname element declares the specific WSDL service
-element that is being referred to.  It is not specified if no
+element that is being refered to.  It is not specified if no
 wsdl-file is declared.
 
   
diff --git 

[tomcat] branch 9.0.x updated: Update version numbers

[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 7ef2c3f0ef Update version numbers
7ef2c3f0ef is described below

commit 7ef2c3f0eff51a074f4588301ae547f240536ecd
Author: remm 
AuthorDate: Wed Sep 28 15:54:06 2022 +0200

Update version numbers
---
 modules/cxf/pom.xml | 2 +-
 modules/owb/pom.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/cxf/pom.xml b/modules/cxf/pom.xml
index 05d53f563e..678c2146f5 100644
--- a/modules/cxf/pom.xml
+++ b/modules/cxf/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache
 apache
-26
+27
 
 
 org.apache.tomcat
diff --git a/modules/owb/pom.xml b/modules/owb/pom.xml
index e770395bfc..b33ba0582d 100644
--- a/modules/owb/pom.xml
+++ b/modules/owb/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache
 apache
-26
+27
 
 
 org.apache.tomcat
@@ -36,7 +36,7 @@
 1.2
 1.2
 1.3
-9.0.62
+9.0.67
 
 
 


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

[tomcat] branch 10.0.x updated: Update version numbers

[remm]

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

remm 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 dbeb947bc2 Update version numbers
dbeb947bc2 is described below

commit dbeb947bc20f99180cb1041fe4ea888b4713e6c0
Author: remm 
AuthorDate: Wed Sep 28 15:53:31 2022 +0200

Update version numbers
---
 modules/cxf/pom.xml | 2 +-
 modules/owb/pom.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/cxf/pom.xml b/modules/cxf/pom.xml
index ac7ed8fce3..03ef816919 100644
--- a/modules/cxf/pom.xml
+++ b/modules/cxf/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache
 apache
-26
+27
 
 
 org.apache.tomcat
diff --git a/modules/owb/pom.xml b/modules/owb/pom.xml
index 06aa77949c..c51564cce9 100644
--- a/modules/owb/pom.xml
+++ b/modules/owb/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache
 apache
-26
+27
 
 
 org.apache.tomcat
@@ -36,7 +36,7 @@
 1.2
 1.2
 1.3
-10.0.20
+10.0.26
 
 
 


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

[tomcat] branch main updated: Update misc version numbers

[remm]

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

remm 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 2692854690 Update misc version numbers
2692854690 is described below

commit 269285469062ce1eb5986b6e3151e34f47408c34
Author: remm 
AuthorDate: Wed Sep 28 15:51:24 2022 +0200

Update misc version numbers
---
 modules/openssl-foreign/pom.xml | 4 ++--
 modules/openssl-java17/pom.xml  | 4 ++--
 modules/owb/pom.xml | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/openssl-foreign/pom.xml b/modules/openssl-foreign/pom.xml
index 28432f6e2d..aac7d891c9 100644
--- a/modules/openssl-foreign/pom.xml
+++ b/modules/openssl-foreign/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache
 apache
-26
+27
 
 
 org.apache.tomcat
@@ -31,7 +31,7 @@
 0.1-SNAPSHOT
 
 
-10.0.20
+10.1.0
 
2021-12-02T12:00:00Z
 
 
diff --git a/modules/openssl-java17/pom.xml b/modules/openssl-java17/pom.xml
index f21cbb4acd..b2505f42ab 100644
--- a/modules/openssl-java17/pom.xml
+++ b/modules/openssl-java17/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache
 apache
-26
+27
 
 
 org.apache.tomcat
@@ -31,7 +31,7 @@
 0.1-SNAPSHOT
 
 
-9.0.62
+9.0.67
 
2021-12-02T12:00:00Z
 
 
diff --git a/modules/owb/pom.xml b/modules/owb/pom.xml
index 06aa77949c..303f9d2982 100644
--- a/modules/owb/pom.xml
+++ b/modules/owb/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache
 apache
-26
+27
 
 
 org.apache.tomcat
@@ -36,7 +36,7 @@
 1.2
 1.2
 1.3
-10.0.20
+10.1.0
 
 
 


-
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: Avoid problems if building with Java 19 with Loom enabled

[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 953a876c62 Avoid problems if building with Java 19 with Loom enabled
953a876c62 is described below

commit 953a876c625b8037a62ff98211a9fcf2272a32e9
Author: Mark Thomas 
AuthorDate: Wed Sep 28 14:26:04 2022 +0100

Avoid problems if building with Java 19 with Loom enabled
---
 test/org/apache/tomcat/websocket/TestConnectionLimit.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/org/apache/tomcat/websocket/TestConnectionLimit.java 
b/test/org/apache/tomcat/websocket/TestConnectionLimit.java
index 5d966e2f7b..e4eb14d57e 100644
--- a/test/org/apache/tomcat/websocket/TestConnectionLimit.java
+++ b/test/org/apache/tomcat/websocket/TestConnectionLimit.java
@@ -20,7 +20,6 @@ import java.io.IOException;
 import java.net.URI;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import javax.websocket.ClientEndpointConfig.Builder;
 import javax.websocket.ContainerProvider;
 import javax.websocket.DeploymentException;
 import javax.websocket.WebSocketContainer;
@@ -96,7 +95,7 @@ public class TestConnectionLimit extends TomcatBaseTest {
 try {
 while (true) {
 
wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
-Builder.create().build(), uri);
+
javax.websocket.ClientEndpointConfig.Builder.create().build(), uri);
 count = counter.incrementAndGet();
 if (count % 100 == 0) {
 System.out.println(count + " and counting...");


-
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: Avoid problems if building with Java 19 with Loom enabled

[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 54c352ee47 Avoid problems if building with Java 19 with Loom enabled
54c352ee47 is described below

commit 54c352ee474dd4e769a360b611cdd77b4fd820e1
Author: Mark Thomas 
AuthorDate: Wed Sep 28 14:26:04 2022 +0100

Avoid problems if building with Java 19 with Loom enabled
---
 test/org/apache/tomcat/websocket/TestConnectionLimit.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/org/apache/tomcat/websocket/TestConnectionLimit.java 
b/test/org/apache/tomcat/websocket/TestConnectionLimit.java
index 5d966e2f7b..e4eb14d57e 100644
--- a/test/org/apache/tomcat/websocket/TestConnectionLimit.java
+++ b/test/org/apache/tomcat/websocket/TestConnectionLimit.java
@@ -20,7 +20,6 @@ import java.io.IOException;
 import java.net.URI;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import javax.websocket.ClientEndpointConfig.Builder;
 import javax.websocket.ContainerProvider;
 import javax.websocket.DeploymentException;
 import javax.websocket.WebSocketContainer;
@@ -96,7 +95,7 @@ public class TestConnectionLimit extends TomcatBaseTest {
 try {
 while (true) {
 
wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
-Builder.create().build(), uri);
+
javax.websocket.ClientEndpointConfig.Builder.create().build(), uri);
 count = counter.incrementAndGet();
 if (count % 100 == 0) {
 System.out.println(count + " and counting...");


-
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: Avoid problems if building with Java 19 with Loom enabled

[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 4c92c36079 Avoid problems if building with Java 19 with Loom enabled
4c92c36079 is described below

commit 4c92c36079b1d35e930085af59f407e2119ad141
Author: Mark Thomas 
AuthorDate: Wed Sep 28 14:26:04 2022 +0100

Avoid problems if building with Java 19 with Loom enabled
---
 test/org/apache/tomcat/websocket/TestConnectionLimit.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/org/apache/tomcat/websocket/TestConnectionLimit.java 
b/test/org/apache/tomcat/websocket/TestConnectionLimit.java
index 26acf8337b..80b4045bda 100644
--- a/test/org/apache/tomcat/websocket/TestConnectionLimit.java
+++ b/test/org/apache/tomcat/websocket/TestConnectionLimit.java
@@ -20,7 +20,6 @@ import java.io.IOException;
 import java.net.URI;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import jakarta.websocket.ClientEndpointConfig.Builder;
 import jakarta.websocket.ContainerProvider;
 import jakarta.websocket.DeploymentException;
 import jakarta.websocket.WebSocketContainer;
@@ -96,7 +95,7 @@ public class TestConnectionLimit extends TomcatBaseTest {
 try {
 while (true) {
 
wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
-Builder.create().build(), uri);
+
jakarta.websocket.ClientEndpointConfig.Builder.create().build(), uri);
 count = counter.incrementAndGet();
 if (count % 100 == 0) {
 System.out.println(count + " and counting...");


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

[tomcat] branch main updated: Avoid problems if building with Java 19 with Loom enabled

[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 6a1c09c418 Avoid problems if building with Java 19 with Loom enabled
6a1c09c418 is described below

commit 6a1c09c41872f853cea3c9b9d9216bf7e55ad73e
Author: Mark Thomas 
AuthorDate: Wed Sep 28 14:26:04 2022 +0100

Avoid problems if building with Java 19 with Loom enabled
---
 test/org/apache/tomcat/websocket/TestConnectionLimit.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/org/apache/tomcat/websocket/TestConnectionLimit.java 
b/test/org/apache/tomcat/websocket/TestConnectionLimit.java
index 26acf8337b..80b4045bda 100644
--- a/test/org/apache/tomcat/websocket/TestConnectionLimit.java
+++ b/test/org/apache/tomcat/websocket/TestConnectionLimit.java
@@ -20,7 +20,6 @@ import java.io.IOException;
 import java.net.URI;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import jakarta.websocket.ClientEndpointConfig.Builder;
 import jakarta.websocket.ContainerProvider;
 import jakarta.websocket.DeploymentException;
 import jakarta.websocket.WebSocketContainer;
@@ -96,7 +95,7 @@ public class TestConnectionLimit extends TomcatBaseTest {
 try {
 while (true) {
 
wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
-Builder.create().build(), uri);
+
jakarta.websocket.ClientEndpointConfig.Builder.create().build(), uri);
 count = counter.incrementAndGet();
 if (count % 100 == 0) {
 System.out.println(count + " and counting...");


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

svn commit: r1904323 - in /tomcat/site/trunk: docs/security-impact.html xdocs/security-impact.xml

[markt]

Author: markt
Date: Wed Sep 28 13:21:34 2022
New Revision: 1904323

URL: http://svn.apache.org/viewvc?rev=1904323=rev
Log:
Fix typo

Modified:
tomcat/site/trunk/docs/security-impact.html
tomcat/site/trunk/xdocs/security-impact.xml

Modified: tomcat/site/trunk/docs/security-impact.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-impact.html?rev=1904323=1904322=1904323=diff
==
--- tomcat/site/trunk/docs/security-impact.html (original)
+++ tomcat/site/trunk/docs/security-impact.html Wed Sep 28 13:21:34 2022
@@ -21,7 +21,7 @@
These are the sorts of vulnerabilities that could be exploited
automatically by worms.
   Important / High
-A vulnerability rated as Important )or High) impact is one which could
+A vulnerability rated as Important (or High) impact is one which could
result in the compromise of data or availability of the server. For
Tomcat this includes issues that allow an easy remote denial of service
(something that is out of proportion to the attack or with a lasting

Modified: tomcat/site/trunk/xdocs/security-impact.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-impact.xml?rev=1904323=1904322=1904323=diff
==
--- tomcat/site/trunk/xdocs/security-impact.xml (original)
+++ tomcat/site/trunk/xdocs/security-impact.xml Wed Sep 28 13:21:34 2022
@@ -33,7 +33,7 @@
   
 
   
-A vulnerability rated as Important )or High) impact is one which could
+A vulnerability rated as Important (or High) impact is one which could
result in the compromise of data or availability of the server. For
Tomcat this includes issues that allow an easy remote denial of service
(something that is out of proportion to the attack or with a lasting



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

[SECURITY] CVE-2021-43980 Apache Tomcat - Information Disclosure

[Mark Thomas]

CVE-2021-43980 Apache Tomcat - Information Disclosure

Severity: High

Vendor: The Apache Software Foundation

Versions Affected:
Apache Tomcat 10.1.0-M1 to 10.1.0-M12
Apache Tomcat 10.0.0-M1 to 10.0.18
Apache Tomcat 9.0.0-M1 to 9.0.60
Apache Tomcat 8.5.0 to 8.5.77

Description:
The simplified implementation of blocking reads and writes introduced in 
Tomcat 10 and back-ported to Tomcat 9.0.47 onwards exposed a long 
standing (but extremely hard to trigger) concurrency bug that could 
cause client connections to share an Http11Processor instance resulting 
in responses, or part responses, to be received by the wrong client.


Mitigation:
Users of the affected versions should apply one of the following
mitigations:
- Upgrade to Apache Tomcat 10.1.0-M14 or later once released
- Upgrade to Apache Tomcat 10.0.20 or later once released
- Upgrade to Apache Tomcat 9.0.62 or later once released
- Upgrade to Apache Tomcat 8.5.78 or later once released
- Note 10.1.0-M13, 10.0.19 and 9.0.61 were not released

Credit:
Thanks to Adam Thomas, Richard Hernandez and Ryan Schmitt for 
discovering the issue and working with the Tomcat security team to 
identify the root cause and appropriate fix.


History:
2022-09-28 Original advisory

References:
[1] https://tomcat.apache.org/security-10.html
[2] https://tomcat.apache.org/security-9.html
[3] https://tomcat.apache.org/security-8.html


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

svn commit: r1904322 - in /tomcat/site/trunk: docs/security-10.html docs/security-8.html docs/security-9.html xdocs/security-10.xml xdocs/security-8.xml xdocs/security-9.xml

[markt]

Author: markt
Date: Wed Sep 28 13:00:05 2022
New Revision: 1904322

URL: http://svn.apache.org/viewvc?rev=1904322=rev
Log:
Publish CVE-2021-43980

Modified:
tomcat/site/trunk/docs/security-10.html
tomcat/site/trunk/docs/security-8.html
tomcat/site/trunk/docs/security-9.html
tomcat/site/trunk/xdocs/security-10.xml
tomcat/site/trunk/xdocs/security-8.xml
tomcat/site/trunk/xdocs/security-9.xml

Modified: tomcat/site/trunk/docs/security-10.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-10.html?rev=1904322=1904321=1904322=diff
==
--- tomcat/site/trunk/docs/security-10.html (original)
+++ tomcat/site/trunk/docs/security-10.html Wed Sep 28 13:00:05 2022
@@ -36,7 +36,7 @@
 
 
   Table of Contents
-Fixed in Apache Tomcat 
10.0.23Fixed in 
Apache Tomcat 10.1.0-M17Fixed in Apache Tomcat 
10.0.21Fixed in 
Apache Tomcat 10.1.0-M15Fixed in Apache Tomcat 
10.0.16Fixed in 
Apache Tomcat 10.1.0-M10Fixed in Apache Tomcat 
10.0.12Fixed in Apache 
Tomcat 10.1.0-M6Fixed in 
Apache Tomcat 10.0.7Fixed 
in Apache Tomcat 10.0.6Fixed in Apache Tomcat 
10.0.5Fixed in Apache Tomcat 10.0.4Fixed in Apache Tomcat 
10.0.2Fixed in Apache 
Tomcat 10.0.0-M10Fixed 
in Apache Tomcat 10.0.0-M8Fixed in Apache Tomcat 
10.0.0-M7Fixed in 
Apache Tomcat 10.0.0-M6Fixed in Apache Tomcat 
10.0.0-M5Not a 
vulnerability in Tomcat
+Fixed in Apache Tomcat 
10.0.23Fixed in 
Apache Tomcat 10.1.0-M17Fixed in Apache Tomcat 
10.0.21Fixed in 
Apache Tomcat 10.1.0-M15Fixed in Apache Tomcat 
10.0.20Fixed in 
Apache Tomcat 10.1.0-M14Fixed in Apache Tomcat 
10.0.16Fixed in 
Apache Tomcat 10.1.0-M10Fixed in Apache Tomcat 
10.0.12Fixed in Apache 
Tomcat 10.1.0-M6Fixed in 
Apache Tomcat 10.0.7Fixed in Apache Tomcat 10.0.6Fixed in Apache Tomcat 
10.0.5Fixed in Apache 
Tomcat 10.0.4Fixed in 
Apache Tomcat 10.0.2Fixed in Apache Tomcat 
10.0.0-M10Fixed in 
Apache Tomcat 10.0.0-M8Fixed in Apache Tomcat 
10.0.0-M7Fixed in 
Apache Tomcat 10.0.0-M6Fixed in Apache Tomcat 
10.0.0-M5Not a 
vulnerability in Tomcat
   2022-07-26 Fixed in Apache Tomcat 10.0.23
   
 Low: Apache Tomcat XSS in examples web application
@@ -107,6 +107,58 @@
 
 Affects: 10.1.0-M1 to 10.1.0-M14
 
+  1 
April 2022 Fixed in Apache Tomcat 10.0.20
+
+Note: The issue below was fixed in Apache Tomcat 10.0.19 but the
+   release vote for the 10.0.19 release candidate did not pass. Therefore,
+   although users must download 10.0.20 to obtain a version that includes a
+   fix for these issues, version 10.0.19 is not included in the list of 
+   affected versions.
+
+High: Information Disclosure
+   http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-43980; 
rel="nofollow">CVE-2021-43980
+
+The simplified implementation of blocking reads and writes introduced in
+   Tomcat 10 and back-ported to Tomcat 9.0.47 onwards exposed a long
+   standing (but extremely hard to trigger) concurrency bug that could 
cause
+   client connections to share an Http11Processor instance resulting in
+   responses, or part responses, to be received by the wrong client.
+   
+This was fixed with commit
+   https://github.com/apache/tomcat/commit/17f177eeb7df5938f67ef9ea580411b120195f13;>17f177ee.
+
+This issue was reported to the Apache Tomcat Security team by Adam
+   Thomas, Richard Hernandez and Ryan Schmitt on 11 November 2021. The 
issue
+   was made public on 28 September 2022.
+
+Affects: 10.0.0-M1 to 10.0.18
+
+  1 
April 2022 Fixed in Apache Tomcat 10.1.0-M14
+
+Note: The issue below was fixed in Apache Tomcat 10.1.0-M13 but the
+   release vote for the 10.1.0-M13 release candidate did not pass. 
Therefore,
+   although users must download 10.1.0-M14 to obtain a version that 
includes a
+   fix for these issues, version 10.1.0-M13 is not included in the list of 
+   affected versions.
+
+High: Information Disclosure
+   http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-43980; 
rel="nofollow">CVE-2021-43980
+
+The simplified implementation of blocking reads and writes introduced in
+   Tomcat 10 and back-ported to Tomcat 9.0.47 onwards exposed a long
+   standing (but extremely hard to trigger) concurrency bug that could 
cause
+   client connections to share an Http11Processor instance resulting in
+   responses, or part responses, to be received by the wrong client.
+   
+This was fixed with commit
+   https://github.com/apache/tomcat/commit/9651b83a1d04583791525e5f0c4c9089f678d9fc;>9651b83a.
+
+This issue was reported to the Apache Tomcat Security team by Adam
+   Thomas, Richard Hernandez and Ryan Schmitt on 11 November 2021. The 
issue
+   was made public on 28 September 2022.
+
+Affects: 10.1.0-M1 to 10.1.0-M12
+
   20 
January 2022 Fixed in Apache Tomcat 10.0.16
 
 Note: The issue below was fixed in Apache Tomcat 

Re: HTTP2 with NIO2 broken?

[Rainer Jung]

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

Thanks,

Rainer

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

Re: [tomcat] 01/06: Fix the typos in the XML schemas

[Mark Thomas]

On 28/09/2022 12:52, ebo...@apache.org wrote:

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

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

commit 2609b760e969cdbd096816fac65dd4a97cdc585c
Author: Emmanuel Bourg 
AuthorDate: Wed Sep 28 13:20:59 2022 +0200

 Fix the typos in the XML schemas


-1. Veto. The changes to the following files MUST be reverted. We are 
not permitted (by ASF policy) to modify EPL and/or CDDL licensed files.



  java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd| 4 ++--
  java/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd | 4 ++--
  java/jakarta/servlet/resources/javaee_web_services_1_2.xsd   | 2 +-
  java/jakarta/servlet/resources/javaee_web_services_1_3.xsd   | 2 +-
  java/jakarta/servlet/resources/javaee_web_services_1_4.xsd   | 2 +-
  java/jakarta/servlet/resources/javaee_web_services_client_1_2.xsd| 2 +-
  java/jakarta/servlet/resources/javaee_web_services_client_1_3.xsd| 2 +-
  java/jakarta/servlet/resources/javaee_web_services_client_1_4.xsd| 2 +-
  java/jakarta/servlet/resources/jsp_3_0.xsd   | 2 +-
  java/jakarta/servlet/resources/jsp_3_1.xsd   | 2 +-
  java/jakarta/servlet/resources/web-app_3_0.xsd   | 2 +-
  java/jakarta/servlet/resources/web-app_3_1.xsd   | 2 +-
  java/jakarta/servlet/resources/web-app_4_0.xsd   | 2 +-
  java/jakarta/servlet/resources/web-app_5_0.xsd   | 2 +-
  java/jakarta/servlet/resources/web-app_6_0.xsd   | 2 +-
  java/jakarta/servlet/resources/web-fragment_3_0.xsd  | 2 +-
  java/jakarta/servlet/resources/web-fragment_3_1.xsd  | 2 +-
  java/jakarta/servlet/resources/web-fragment_4_0.xsd  | 2 +-
  java/jakarta/servlet/resources/web-fragment_5_0.xsd  | 2 +-
  java/jakarta/servlet/resources/web-fragment_6_0.xsd  | 2 +-
  java/jakarta/servlet/resources/web-jsptaglibrary_3_0.xsd | 4 ++--
  java/jakarta/servlet/resources/web-jsptaglibrary_3_1.xsd | 4 ++--


Mark

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

[Bug 66281] New: NIO2 breaks HTTP2 responses after 5 seconds

[bugzilla]

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

Bug ID: 66281
   Summary: NIO2 breaks HTTP2 responses after 5 seconds
   Product: Tomcat 10
   Version: 10.1.0
  Hardware: All
OS: All
Status: NEW
  Severity: major
  Priority: P2
 Component: Connectors
  Assignee: dev@tomcat.apache.org
  Reporter: rainer.j...@kippdata.de
  Target Milestone: --

NIO2 connector with HTTP2 and JSSE.

Client is (recent) curl or recent Firefox or Chrome.

If I call a JSP, that sleeps for eg. 8 seconds before responding, then the
client gets after 5 seconds:

curl: (92) HTTP/2 stream 1 was not closed cleanly before end of the underlying
stream

Browser communication ends as well before the response is generated and
received.

The example JSP is:


Begin Sleeping ...
<%
Thread.sleep(8000);
%>
Done

Turning on debug logging I see:

28-Sep-2022 11:11:11.408 FINE [https-jsse-nio2-8444-exec-5]
org.apache.coyote.http2.Http2AsyncParser$FrameCompletionHandler.failed
Connection [0], Stream [0], Frame type [null], Error
java.net.SocketTimeoutException
at
org.apache.tomcat.util.net.SocketWrapperBase$VectoredIOCompletionHandler.failed(SocketWrapperBase.java:1124)
at
org.apache.tomcat.util.net.SocketWrapperBase$VectoredIOCompletionHandler.failed(SocketWrapperBase.java:1066)
at
org.apache.tomcat.util.net.SecureNio2Channel$2.failed(SecureNio2Channel.java:1158)
at
java.base/sun.nio.ch.Invoker.invokeUnchecked(Invoker.java:129)
at java.base/sun.nio.ch.Invoker$2.run(Invoker.java:219)
at
java.base/sun.nio.ch.AsynchronousChannelGroupImpl$1.run(AsynchronousChannelGroupImpl.java:112)
at
org.apache.tomcat.util.threads.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1191)
at
org.apache.tomcat.util.threads.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:659)
at
org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)
at java.base/java.lang.Thread.run(Thread.java:829)


The request actually finished in Tomvcat, but when it tries to start back the
response it gets another exception because of the closed stream


28-Sep-2022 11:11:14.809 FINE [https-jsse-nio2-8444-exec-4]
org.apache.coyote.AbstractProcessor.setErrorState Error state [CLOSE_NOW]
reported while processing request
org.apache.coyote.CloseNowException: Connection [0], Stream [1], This
stream is not writable
at
org.apache.coyote.http2.Stream.doStreamCancel(Stream.java:269)
at
org.apache.coyote.http2.Http2UpgradeHandler.reserveWindowSize(Http2UpgradeHandler.java:939)
...


This only happens for NIO2, not NIO.

It happens for 10.1.0, 10.0.26, 9.0.67 but also for the older e.g. 10.0.10,
10.0.0 and 9.0.60.

Connector config I use:








and for comparison with the working NIO(1):








Regards,

Rainer

-- 
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] 05/06: Fix the typos in the build files

[ebourg]

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

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

commit 7ffac0533a65300e753c6a7d23bd768066110991
Author: Emmanuel Bourg 
AuthorDate: Wed Sep 28 13:51:12 2022 +0200

Fix the typos in the build files
---
 build.xml | 4 ++--
 res/maven/mvn-pub.xml | 2 +-
 res/scripts/check-mime.pl | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.xml b/build.xml
index 43164e6bda..4756a78d8b 100644
--- a/build.xml
+++ b/build.xml
@@ -2318,7 +2318,7 @@ version.dev=
 # Ensure consistent timestamps for reproducible builds.
 ant.tstamp.now.iso=${tstamp.iso.release}
 
-# Enable insertion of detatched signatures into the Windows installer.
+# Enable insertion of detached signatures into the Windows installer.
 do.codesigning=true
 
 # Re-use the same GPG executable.
@@ -2336,7 +2336,7 @@ gpg.exec=${gpg.exec}
 # Java Version:${java.vm.version}
 
 # The following is provided for information only. Builds will be repeatable
-# whether or not the build ennvironment in consistent with this information.
+# whether or not the build environment in consistent with this information.
 #
 # OS:  ${os.arch} ${os.name} ${os.version}
 # File encoding:   ${file.encoding}
diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml
index 8d420f23bf..e06320673f 100644
--- a/res/maven/mvn-pub.xml
+++ b/res/maven/mvn-pub.xml
@@ -351,7 +351,7 @@
 file="${tomcat.extras.path}/catalina-ws.jar"
 src="${tomcat.extras.src.path}/catalina-ws-src.jar" />
 
-
+
 
 

[tomcat] 06/06: Fix more typos

[ebourg]

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

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

commit 764c350bbd06f768add931a3a6338b35c5b35f8f
Author: Emmanuel Bourg 
AuthorDate: Wed Sep 28 13:51:34 2022 +0200

Fix more typos
---
 java/org/apache/tomcat/util/digester/package.html | 2 +-
 modules/jdbc-pool/doc/jdbc-pool.xml   | 4 ++--
 modules/jdbc-pool/doc/package.xsl | 4 ++--
 webapps/examples/websocket/drawboard.xhtml| 2 +-
 webapps/manager/WEB-INF/jsp/sessionsList.jsp  | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/tomcat/util/digester/package.html 
b/java/org/apache/tomcat/util/digester/package.html
index 3d20be416f..ee4d8381d1 100644
--- a/java/org/apache/tomcat/util/digester/package.html
+++ b/java/org/apache/tomcat/util/digester/package.html
@@ -777,7 +777,7 @@ matching namespace prefix patterns might be a better 
strategy.
 
 When you set the NamespaceAware property to false, digester 
uses
 the qualified element name (which includes the namespace prefix) rather than 
the
-local name as the patten component for the element. This means that your 
pattern
+local name as the pattern component for the element. This means that your 
pattern
 matches can include namespace prefixes as well as element names. So, rather 
than
 create namespace-aware rules, create pattern matches including the namespace
 prefixes.
diff --git a/modules/jdbc-pool/doc/jdbc-pool.xml 
b/modules/jdbc-pool/doc/jdbc-pool.xml
index d96e2877cc..08a7c2f691 100644
--- a/modules/jdbc-pool/doc/jdbc-pool.xml
+++ b/modules/jdbc-pool/doc/jdbc-pool.xml
@@ -455,7 +455,7 @@
 
 
 
-  (int) Connections that have been abandoned (timed out) wont get 
closed and reported up unless
+  (int) Connections that have been abandoned (timed out) won't get 
closed and reported up unless
  the number of connections in use are above the percentage defined by 
abandonWhenPercentageFull.
  The value should be between 0-100.
  The default value is 0, which implies that connections 
are eligible for closure as soon
@@ -719,7 +719,7 @@
   
 Extends the SlowQueryReport and in addition to log entries 
it issues JMX notification
for monitoring tools to react to. Inherits all the attributes from its 
parent class.
-   This class uses Tomcat's JMX engine so it wont work outside of the 
Tomcat container.
+   This class uses Tomcat's JMX engine so it won't work outside of the 
Tomcat container.
By default, JMX notifications are sent through the ConnectionPool mbean 
if it is enabled.
The SlowQueryReportJmx can also register an MBean if 
notifyPool=false
 
diff --git a/modules/jdbc-pool/doc/package.xsl 
b/modules/jdbc-pool/doc/package.xsl
index d3fd7eab8c..a987c80bd2 100644
--- a/modules/jdbc-pool/doc/package.xsl
+++ b/modules/jdbc-pool/doc/package.xsl
@@ -30,14 +30,14 @@
   encoding="UTF-8"
   indent="no"/>
 
-  
+  
   
   
   
   https://bz.apache.org/bugzilla/show_bug.cgi?id='"/>
   https://svn.apache.org/viewvc?view=revrev='"/>
 
-  
+  
   
   
   
diff --git a/webapps/examples/websocket/drawboard.xhtml 
b/webapps/examples/websocket/drawboard.xhtml
index 52df651749..ccf0d382f6 100644
--- a/webapps/examples/websocket/drawboard.xhtml
+++ b/webapps/examples/websocket/drawboard.xhtml
@@ -538,7 +538,7 @@
 }
 
 function refreshDisplayCanvas() {
-if (!isActive) { // Don't draw a curser when not active.
+if (!isActive) { // Don't draw a cursor when not active.
 return;
 }
 
diff --git a/webapps/manager/WEB-INF/jsp/sessionsList.jsp 
b/webapps/manager/WEB-INF/jsp/sessionsList.jsp
index f051bcf8bd..7fa43dacb8 100644
--- a/webapps/manager/WEB-INF/jsp/sessionsList.jsp
+++ b/webapps/manager/WEB-INF/jsp/sessionsList.jsp
@@ -59,7 +59,7 @@
 <%= JspHelper.escapeXml(request.getAttribute("message")) 
%>
 
 
-Active HttpSessions informations
+Active HttpSessions information
 
 "/>
 <% String order = (String) request.getAttribute("order");


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

[tomcat] 02/06: Fix the typos in the documentation

[ebourg]

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

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

commit 1865e916fc2aac56c98fdca95e9b98ff96449e98
Author: Emmanuel Bourg 
AuthorDate: Wed Sep 28 13:40:05 2022 +0200

Fix the typos in the documentation
---
 webapps/docs/changelog.xml  | 4 ++--
 webapps/docs/config/cluster-interceptor.xml | 2 +-
 webapps/docs/config/context.xml | 2 +-
 webapps/docs/config/filter.xml  | 2 +-
 webapps/docs/config/globalresources.xml | 2 +-
 webapps/docs/config/http.xml| 4 ++--
 webapps/docs/config/http2.xml   | 2 +-
 webapps/docs/config/jaspic.xml  | 2 +-
 webapps/docs/config/listeners.xml   | 2 +-
 webapps/docs/config/realm.xml   | 2 +-
 webapps/docs/config/sessionidgenerator.xml  | 2 +-
 webapps/docs/config/systemprops.xml | 4 ++--
 webapps/docs/config/valve.xml   | 6 +++---
 webapps/docs/jasper-howto.xml   | 2 +-
 webapps/docs/monitoring.xml | 4 ++--
 webapps/docs/rewrite.xml| 2 +-
 webapps/docs/ssi-howto.xml  | 2 +-
 webapps/docs/ssl-howto.xml  | 4 ++--
 webapps/docs/tomcat-docs.xsl| 2 +-
 19 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8247e4aa34..9cbd8f06ba 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -661,7 +661,7 @@
   
  Effectively disable the
  WebappClassLoaderBase.getResources() method as it is not
- used and if something accidently exposes the class loader this method
+ used and if something accidentally exposes the class loader this 
method
  can be used to gain access to Tomcat internals. (markt)
   
 
@@ -1183,7 +1183,7 @@
 getting the passord of a user. (remm)
   
   
-Add Javadoc comment which listeners must be nested whithin
+Add Javadoc comment which listeners must be nested within
 Server elements only. (michaelo)
   
   
diff --git a/webapps/docs/config/cluster-interceptor.xml 
b/webapps/docs/config/cluster-interceptor.xml
index 836c4cddcd..1adfcf3336 100644
--- a/webapps/docs/config/cluster-interceptor.xml
+++ b/webapps/docs/config/cluster-interceptor.xml
@@ -36,7 +36,7 @@
 
   
   Apache Tribes supports an interceptor architecture to intercept both 
messages and membership notifications.
-  This architecture allows decoupling of logic and opens the way for some very 
useful feature add ons.
+  This architecture allows decoupling of logic and opens the way for some very 
useful feature add-ons.
   
 
 
diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml
index 5129e7bbc0..9a2f1ec89f 100644
--- a/webapps/docs/config/context.xml
+++ b/webapps/docs/config/context.xml
@@ -1106,7 +1106,7 @@
 
   
 The parameter value that will be presented to the application
-when requested from the JNDI context.  This value must be convertable
+when requested from the JNDI context.  This value must be convertible
 to the Java type defined by the type attribute.
   
 
diff --git a/webapps/docs/config/filter.xml b/webapps/docs/config/filter.xml
index 253ec44f73..4070f77e28 100644
--- a/webapps/docs/config/filter.xml
+++ b/webapps/docs/config/filter.xml
@@ -1120,7 +1120,7 @@ FINE: Request "/docs/config/manager.html" with response 
status "200"
   IPv6 are both fully supported.
 
 
-This filter mimicks Apache httpd's Order,
+This filter mimics Apache httpd's Order,
   Allow from and Deny from directives,
   with the following limitations:
 
diff --git a/webapps/docs/config/globalresources.xml 
b/webapps/docs/config/globalresources.xml
index 35b533e77a..fba311ff82 100644
--- a/webapps/docs/config/globalresources.xml
+++ b/webapps/docs/config/globalresources.xml
@@ -118,7 +118,7 @@
 
   
 The parameter value that will be presented to the application
-when requested from the JNDI context.  This value must be convertable
+when requested from the JNDI context.  This value must be convertible
 to the Java type defined by the type attribute.
   
 
diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index 5c2f232942..47d0b923bf 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -59,7 +59,7 @@
   received, Tomcat will accept new connections until the current number of
   connections reaches maxConnections. Connections are queued 
inside
   the server socket created by the Connector until a thread
-  becomes avaialble to process the connection. Once maxConnections
+  becomes available to process the connection. Once maxConnections
   has been reached the operating system will queue further connections. The 
size

[tomcat] branch 8.5.x updated (eb3d307982 -> 764c350bbd)

[ebourg]

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

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


from eb3d307982 Fix Javadoc typo
 new ad7b58a80a Fix the typos in the XML schemas
 new 1865e916fc Fix the typos in the documentation
 new a0a157abb1 Fix the typos in the source code
 new 254d187d43 Fix the typos in the resource bundles
 new 7ffac0533a Fix the typos in the build files
 new 764c350bbd Fix more typos

The 6 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.xml | 4 ++--
 java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java | 2 +-
 java/javax/servlet/jsp/resources/jspxml.xsd   | 2 +-
 java/javax/servlet/resources/javaee_web_services_1_2.xsd  | 2 +-
 java/javax/servlet/resources/javaee_web_services_1_3.xsd  | 2 +-
 java/javax/servlet/resources/javaee_web_services_1_4.xsd  | 2 +-
 java/javax/servlet/resources/javaee_web_services_client_1_2.xsd   | 2 +-
 java/javax/servlet/resources/javaee_web_services_client_1_3.xsd   | 2 +-
 java/javax/servlet/resources/javaee_web_services_client_1_4.xsd   | 2 +-
 java/javax/servlet/resources/jsp_2_1.xsd  | 2 +-
 java/javax/servlet/resources/web-app_3_0.xsd  | 2 +-
 java/javax/servlet/resources/web-app_3_1.xsd  | 2 +-
 java/javax/servlet/resources/web-fragment_3_0.xsd | 2 +-
 java/javax/servlet/resources/web-fragment_3_1.xsd | 2 +-
 java/javax/servlet/resources/web-jsptaglibrary_2_1.xsd| 2 +-
 java/org/apache/catalina/Context.java | 2 +-
 java/org/apache/catalina/ha/session/LocalStrings.properties   | 4 ++--
 java/org/apache/catalina/mapper/MapperListener.java   | 4 ++--
 java/org/apache/catalina/servlets/CGIServlet.java | 2 +-
 java/org/apache/catalina/tribes/ByteMessage.java  | 2 +-
 .../catalina/tribes/group/interceptors/TcpFailureDetector.java| 2 +-
 .../catalina/tribes/group/interceptors/TcpPingInterceptor.java| 2 +-
 .../tribes/group/interceptors/TwoPhaseCommitInterceptor.java  | 2 +-
 java/org/apache/catalina/tribes/membership/McastServiceImpl.java  | 4 ++--
 .../org/apache/catalina/webresources/AbstractFileResourceSet.java | 2 +-
 java/org/apache/coyote/ActionHook.java| 2 +-
 java/org/apache/coyote/RequestInfo.java   | 2 +-
 java/org/apache/coyote/Response.java  | 2 +-
 java/org/apache/coyote/http11/Http11Processor.java| 2 +-
 java/org/apache/coyote/http2/AbstractNonZeroStream.java   | 6 +++---
 java/org/apache/jasper/compiler/Parser.java   | 2 +-
 java/org/apache/jasper/compiler/ServletWriter.java| 8 
 java/org/apache/jasper/tagplugins/jstl/core/ForEach.java  | 2 +-
 java/org/apache/naming/factory/webservices/ServiceRefFactory.java | 4 ++--
 java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java   | 2 +-
 java/org/apache/tomcat/util/buf/LocalStrings.properties   | 2 +-
 java/org/apache/tomcat/util/digester/package.html | 2 +-
 java/org/apache/tomcat/util/net/jsse/JSSEKeyManager.java  | 4 ++--
 java/org/apache/tomcat/util/net/jsse/PEMFile.java | 2 +-
 java/org/apache/tomcat/util/threads/TaskQueue.java| 2 +-
 modules/jdbc-pool/doc/jdbc-pool.xml   | 4 ++--
 modules/jdbc-pool/doc/package.xsl | 4 ++--
 .../src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java | 2 +-
 .../apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java  | 2 +-
 .../src/test/java/org/apache/tomcat/jdbc/test/TestValidation.java | 2 +-
 res/maven/mvn-pub.xml | 2 +-
 res/scripts/check-mime.pl | 2 +-
 .../catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java  | 2 +-
 test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java  | 8 
 test/org/apache/catalina/tribes/demos/MapDemo.java| 2 +-
 test/org/apache/coyote/http11/TestHttp11Processor.java| 2 +-
 test/org/apache/coyote/http2/Http2TestBase.java   | 2 +-
 test/org/apache/coyote/http2/TestCancelledUpload.java | 2 +-
 test/org/apache/tomcat/websocket/TestWsSubprotocols.java  | 2 +-
 webapps/docs/changelog.xml| 4 ++--
 webapps/docs/config/cluster-interceptor.xml   | 2 +-
 webapps/docs/config/context.xml 

[tomcat] 01/06: Fix the typos in the XML schemas

[ebourg]

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

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

commit ad7b58a80aca18c684491f724b9444bbf434d955
Author: Emmanuel Bourg 
AuthorDate: Wed Sep 28 13:20:59 2022 +0200

Fix the typos in the XML schemas

enpoint -> endpoint
expressable -> expressible
interaces   -> interfaces
mulitple-> multiple
occurence   -> occurrence
prefered-> preferred
refered -> referred
varaible-> variable
---
 java/javax/servlet/jsp/resources/jspxml.xsd | 2 +-
 java/javax/servlet/resources/javaee_web_services_1_2.xsd| 2 +-
 java/javax/servlet/resources/javaee_web_services_1_3.xsd| 2 +-
 java/javax/servlet/resources/javaee_web_services_1_4.xsd| 2 +-
 java/javax/servlet/resources/javaee_web_services_client_1_2.xsd | 2 +-
 java/javax/servlet/resources/javaee_web_services_client_1_3.xsd | 2 +-
 java/javax/servlet/resources/javaee_web_services_client_1_4.xsd | 2 +-
 java/javax/servlet/resources/jsp_2_1.xsd| 2 +-
 java/javax/servlet/resources/web-app_3_0.xsd| 2 +-
 java/javax/servlet/resources/web-app_3_1.xsd| 2 +-
 java/javax/servlet/resources/web-fragment_3_0.xsd   | 2 +-
 java/javax/servlet/resources/web-fragment_3_1.xsd   | 2 +-
 java/javax/servlet/resources/web-jsptaglibrary_2_1.xsd  | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/java/javax/servlet/jsp/resources/jspxml.xsd 
b/java/javax/servlet/jsp/resources/jspxml.xsd
index 0e5eba0b36..1634d208d9 100644
--- a/java/javax/servlet/jsp/resources/jspxml.xsd
+++ b/java/javax/servlet/jsp/resources/jspxml.xsd
@@ -414,7 +414,7 @@
 jsp:useBean action or a custom action with an associated
 VariableInfo entry for this name.
 
-Exact valid combinations are not expressable in XML Schema.
+Exact valid combinations are not expressible in XML Schema.
 They are:
 
 name="Identifier" property="*"
diff --git a/java/javax/servlet/resources/javaee_web_services_1_2.xsd 
b/java/javax/servlet/resources/javaee_web_services_1_2.xsd
index 43914742ff..ec5540dd6c 100644
--- a/java/javax/servlet/resources/javaee_web_services_1_2.xsd
+++ b/java/javax/servlet/resources/javaee_web_services_1_2.xsd
@@ -336,7 +336,7 @@
   com.wombat.empl.EmployeeService
 
   This may not be specified in case there is no Service
-  Enpoint Interface as is the case with directly using an
+  Endpoint Interface as is the case with directly using an
   implementation class with the @WebService annotation.
 
   When the port component is a Provider implementation
diff --git a/java/javax/servlet/resources/javaee_web_services_1_3.xsd 
b/java/javax/servlet/resources/javaee_web_services_1_3.xsd
index d69d723e1d..71d4b33f73 100644
--- a/java/javax/servlet/resources/javaee_web_services_1_3.xsd
+++ b/java/javax/servlet/resources/javaee_web_services_1_3.xsd
@@ -332,7 +332,7 @@
   com.wombat.empl.EmployeeService
 
 This may not be specified in case there is no Service
-Enpoint Interface as is the case with directly using an
+Endpoint Interface as is the case with directly using an
 implementation class with the @WebService annotation.
 
 When the port component is a Provider implementation
diff --git a/java/javax/servlet/resources/javaee_web_services_1_4.xsd 
b/java/javax/servlet/resources/javaee_web_services_1_4.xsd
index e32c5b7d0c..032e6b7492 100644
--- a/java/javax/servlet/resources/javaee_web_services_1_4.xsd
+++ b/java/javax/servlet/resources/javaee_web_services_1_4.xsd
@@ -332,7 +332,7 @@
   com.wombat.empl.EmployeeService
 
 This may not be specified in case there is no Service
-Enpoint Interface as is the case with directly using an
+Endpoint Interface as is the case with directly using an
 implementation class with the @WebService annotation.
 
 When the port component is a Provider implementation
diff --git a/java/javax/servlet/resources/javaee_web_services_client_1_2.xsd 
b/java/javax/servlet/resources/javaee_web_services_client_1_2.xsd
index e95308a0a8..e32af449b3 100644
--- a/java/javax/servlet/resources/javaee_web_services_client_1_2.xsd
+++ b/java/javax/servlet/resources/javaee_web_services_client_1_2.xsd
@@ -260,7 +260,7 @@
   
 
 The service-qname element declares the specific WSDL service
-element that is being refered to.  It is not specified if no
+element that is being referred to.  It is not specified if no
 wsdl-file is declared.
 
   
diff --git a/java/javax/servlet/resources/javaee_web_services_client_1_3.xsd 

[tomcat] 04/06: Fix the typos in the resource bundles

[ebourg]

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

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

commit 254d187d43fed13f4ad44db92d9bd2240783daf2
Author: Emmanuel Bourg 
AuthorDate: Wed Sep 28 13:47:50 2022 +0200

Fix the typos in the resource bundles
---
 java/org/apache/catalina/ha/session/LocalStrings.properties | 4 ++--
 java/org/apache/tomcat/util/buf/LocalStrings.properties | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/catalina/ha/session/LocalStrings.properties 
b/java/org/apache/catalina/ha/session/LocalStrings.properties
index 5ba274aeea..d894dd3c64 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings.properties
@@ -75,12 +75,12 @@ deltaSession.writeSession=writeObject() storing session 
[{0}]
 
 jvmRoute.cannotFindSession=Cannot find session [{0}]
 jvmRoute.changeSession=Changed session from [{0}] to [{1}]
-jvmRoute.failover=Detected a failover with different jvmRoute - orginal route: 
[{0}] new one: [{1}] at session id [{2}]
+jvmRoute.failover=Detected a failover with different jvmRoute - original 
route: [{0}] new one: [{1}] at session id [{2}]
 jvmRoute.foundManager=Found Cluster Manager [{0}] at [{1}]
 jvmRoute.missingJvmRouteAttribute=No engine jvmRoute attribute configured!
 jvmRoute.noCluster=The JvmRouterBinderValve is configured, but clustering is 
not being used. Fail over will still work, providing a PersistentManager is 
used.
 jvmRoute.notFoundManager=Not found Cluster Manager at [{0}]
-jvmRoute.set.originalsessionid=Set Orginal Session id at request attribute 
[{0}] value: [{1}]
+jvmRoute.set.originalsessionid=Set Original Session id at request attribute 
[{0}] value: [{1}]
 jvmRoute.turnoverInfo=Turnover Check time [{0}] msec
 jvmRoute.valve.started=JvmRouteBinderValve started
 jvmRoute.valve.stopped=JvmRouteBinderValve stopped
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings.properties 
b/java/org/apache/tomcat/util/buf/LocalStrings.properties
index d7eace5fa4..b02e4b0c55 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings.properties
@@ -32,7 +32,7 @@ hexUtils.fromHex.oddDigits=The input must consist of an even 
number of hex digit
 uDecoder.eof=End of file (EOF)
 uDecoder.noSlash=The encoded slash character is not allowed
 uDecoder.urlDecode.conversionError=Failed to decode [{0}] using character set 
[{1}]
-uDecoder.urlDecode.missingDigit=Failed to decode [{0}] because the % character 
must be followed by two hexademical digits
+uDecoder.urlDecode.missingDigit=Failed to decode [{0}] because the % character 
must be followed by two hexadecimal digits
 uDecoder.urlDecode.uee=Unable to URL decode the specified input since the 
encoding [{0}] is not supported.
 
 udecoder.urlDecode.iae=It is practical to %nn decode a byte array since how 
the %nn is encoded will vary by character set


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

[tomcat] 03/06: Fix the typos in the source code

[ebourg]

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

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

commit a0a157abb1cc4b7bc16f87b693c3d851c7ec3431
Author: Emmanuel Bourg 
AuthorDate: Wed Sep 28 13:46:55 2022 +0200

Fix the typos in the source code
---
 java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java | 2 +-
 java/org/apache/catalina/Context.java | 2 +-
 java/org/apache/catalina/mapper/MapperListener.java   | 4 ++--
 java/org/apache/catalina/servlets/CGIServlet.java | 2 +-
 java/org/apache/catalina/tribes/ByteMessage.java  | 2 +-
 .../catalina/tribes/group/interceptors/TcpFailureDetector.java| 2 +-
 .../catalina/tribes/group/interceptors/TcpPingInterceptor.java| 2 +-
 .../tribes/group/interceptors/TwoPhaseCommitInterceptor.java  | 2 +-
 java/org/apache/catalina/tribes/membership/McastServiceImpl.java  | 4 ++--
 .../org/apache/catalina/webresources/AbstractFileResourceSet.java | 2 +-
 java/org/apache/coyote/ActionHook.java| 2 +-
 java/org/apache/coyote/RequestInfo.java   | 2 +-
 java/org/apache/coyote/Response.java  | 2 +-
 java/org/apache/coyote/http11/Http11Processor.java| 2 +-
 java/org/apache/coyote/http2/AbstractNonZeroStream.java   | 6 +++---
 java/org/apache/jasper/compiler/Parser.java   | 2 +-
 java/org/apache/jasper/compiler/ServletWriter.java| 8 
 java/org/apache/jasper/tagplugins/jstl/core/ForEach.java  | 2 +-
 java/org/apache/naming/factory/webservices/ServiceRefFactory.java | 4 ++--
 java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java   | 2 +-
 java/org/apache/tomcat/util/net/jsse/JSSEKeyManager.java  | 4 ++--
 java/org/apache/tomcat/util/net/jsse/PEMFile.java | 2 +-
 java/org/apache/tomcat/util/threads/TaskQueue.java| 2 +-
 .../src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java | 2 +-
 .../apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java  | 2 +-
 .../src/test/java/org/apache/tomcat/jdbc/test/TestValidation.java | 2 +-
 .../catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java  | 2 +-
 test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java  | 8 
 test/org/apache/catalina/tribes/demos/MapDemo.java| 2 +-
 test/org/apache/coyote/http11/TestHttp11Processor.java| 2 +-
 test/org/apache/coyote/http2/Http2TestBase.java   | 2 +-
 test/org/apache/coyote/http2/TestCancelledUpload.java | 2 +-
 test/org/apache/tomcat/websocket/TestWsSubprotocols.java  | 2 +-
 33 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java 
b/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java
index d690f326df..b84cd18d2f 100644
--- a/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java
+++ b/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java
@@ -85,7 +85,7 @@ public interface JspPropertyGroupDescriptor {
 public String getDeferredSyntaxAllowedAsLiteral();
 
 /**
- * Should the JSPs in this group have template text that onyl contains
+ * Should the JSPs in this group have template text that only contains
  * whitespace removed?
  *
  * @return {@code true} if the whitespace be removed, otherwise
diff --git a/java/org/apache/catalina/Context.java 
b/java/org/apache/catalina/Context.java
index 329fd2e8d8..9215394bad 100644
--- a/java/org/apache/catalina/Context.java
+++ b/java/org/apache/catalina/Context.java
@@ -1843,7 +1843,7 @@ public interface Context extends Container, ContextBind {
 
 /**
  * Are paths used in calls to obtain a request dispatcher expected to be
- * encoded? This applys to both how Tomcat handles calls to obtain a 
request
+ * encoded? This applies to both how Tomcat handles calls to obtain a 
request
  * dispatcher as well as how Tomcat generates paths used to obtain request
  * dispatchers internally.
  *
diff --git a/java/org/apache/catalina/mapper/MapperListener.java 
b/java/org/apache/catalina/mapper/MapperListener.java
index 2c0cc05582..80139206d4 100644
--- a/java/org/apache/catalina/mapper/MapperListener.java
+++ b/java/org/apache/catalina/mapper/MapperListener.java
@@ -512,7 +512,7 @@ public class MapperListener extends LifecycleMBeanBase
 /**
  * Add this mapper to the container and all child containers
  *
- * @param container the container (and any associated childern) to which
+ * @param container the container (and any associated children) to which
  *the mapper is to be added
  */
 private void addListeners(Container container) {
@@ -527,7 +527,7 @@ public class MapperListener extends LifecycleMBeanBase
 /**
  

[tomcat] 03/06: Fix the typos in the source code

[ebourg]

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

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

commit c26907516d7493d44e38239e569d0850c0e11d4a
Author: Emmanuel Bourg 
AuthorDate: Wed Sep 28 13:46:55 2022 +0200

Fix the typos in the source code
---
 java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java | 2 +-
 java/org/apache/catalina/Context.java | 2 +-
 java/org/apache/catalina/mapper/MapperListener.java   | 4 ++--
 java/org/apache/catalina/mbeans/SparseUserDatabaseMBean.java  | 2 +-
 java/org/apache/catalina/servlets/CGIServlet.java | 2 +-
 java/org/apache/catalina/tribes/ByteMessage.java  | 2 +-
 .../catalina/tribes/group/interceptors/TcpFailureDetector.java| 2 +-
 .../catalina/tribes/group/interceptors/TcpPingInterceptor.java| 2 +-
 .../tribes/group/interceptors/TwoPhaseCommitInterceptor.java  | 2 +-
 java/org/apache/catalina/tribes/membership/McastServiceImpl.java  | 4 ++--
 java/org/apache/catalina/users/DataSourceUserDatabase.java| 2 +-
 .../org/apache/catalina/webresources/AbstractFileResourceSet.java | 2 +-
 java/org/apache/coyote/ActionHook.java| 2 +-
 java/org/apache/coyote/RequestInfo.java   | 2 +-
 java/org/apache/coyote/Response.java  | 2 +-
 java/org/apache/coyote/http11/Http11Processor.java| 2 +-
 java/org/apache/coyote/http2/AbstractNonZeroStream.java   | 6 +++---
 java/org/apache/jasper/compiler/Parser.java   | 2 +-
 java/org/apache/jasper/compiler/ServletWriter.java| 8 
 java/org/apache/jasper/runtime/PageContextImpl.java   | 2 +-
 java/org/apache/jasper/tagplugins/jstl/core/ForEach.java  | 2 +-
 java/org/apache/naming/factory/webservices/ServiceRefFactory.java | 4 ++--
 java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java   | 2 +-
 java/org/apache/tomcat/util/json/ParseException.java  | 2 +-
 java/org/apache/tomcat/util/net/NioEndpoint.java  | 2 +-
 java/org/apache/tomcat/util/net/jsse/JSSEKeyManager.java  | 4 ++--
 java/org/apache/tomcat/util/net/jsse/PEMFile.java | 2 +-
 java/org/apache/tomcat/util/threads/TaskQueue.java| 2 +-
 .../src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java | 2 +-
 .../apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java  | 2 +-
 .../src/test/java/org/apache/tomcat/jdbc/test/TestValidation.java | 2 +-
 .../catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java  | 2 +-
 test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java  | 8 
 test/org/apache/catalina/tribes/demos/MapDemo.java| 2 +-
 test/org/apache/coyote/http11/TestHttp11Processor.java| 2 +-
 test/org/apache/coyote/http2/Http2TestBase.java   | 2 +-
 test/org/apache/coyote/http2/TestCancelledUpload.java | 2 +-
 test/org/apache/tomcat/websocket/TestWsSubprotocols.java  | 2 +-
 38 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java 
b/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java
index d690f326df..b84cd18d2f 100644
--- a/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java
+++ b/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java
@@ -85,7 +85,7 @@ public interface JspPropertyGroupDescriptor {
 public String getDeferredSyntaxAllowedAsLiteral();
 
 /**
- * Should the JSPs in this group have template text that onyl contains
+ * Should the JSPs in this group have template text that only contains
  * whitespace removed?
  *
  * @return {@code true} if the whitespace be removed, otherwise
diff --git a/java/org/apache/catalina/Context.java 
b/java/org/apache/catalina/Context.java
index c2fc2c5b84..562a6e9230 100644
--- a/java/org/apache/catalina/Context.java
+++ b/java/org/apache/catalina/Context.java
@@ -1845,7 +1845,7 @@ public interface Context extends Container, ContextBind {
 
 /**
  * Are paths used in calls to obtain a request dispatcher expected to be
- * encoded? This applys to both how Tomcat handles calls to obtain a 
request
+ * encoded? This applies to both how Tomcat handles calls to obtain a 
request
  * dispatcher as well as how Tomcat generates paths used to obtain request
  * dispatchers internally.
  *
diff --git a/java/org/apache/catalina/mapper/MapperListener.java 
b/java/org/apache/catalina/mapper/MapperListener.java
index fa303c47fc..67be0a7537 100644
--- a/java/org/apache/catalina/mapper/MapperListener.java
+++ b/java/org/apache/catalina/mapper/MapperListener.java
@@ -508,7 +508,7 @@ public class MapperListener extends LifecycleMBeanBase
 /**
  * Add this mapper to the container and all 

[tomcat] 02/06: Fix the typos in the documentation

[ebourg]

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

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

commit 5b1b80a62993dbcc6af101c68693af9c9b55a229
Author: Emmanuel Bourg 
AuthorDate: Wed Sep 28 13:40:05 2022 +0200

Fix the typos in the documentation
---
 webapps/docs/changelog.xml  | 4 ++--
 webapps/docs/config/ajp.xml | 2 +-
 webapps/docs/config/cluster-interceptor.xml | 2 +-
 webapps/docs/config/context.xml | 2 +-
 webapps/docs/config/filter.xml  | 2 +-
 webapps/docs/config/globalresources.xml | 2 +-
 webapps/docs/config/http.xml| 6 +++---
 webapps/docs/config/jaspic.xml  | 2 +-
 webapps/docs/config/realm.xml   | 2 +-
 webapps/docs/config/sessionidgenerator.xml  | 2 +-
 webapps/docs/config/systemprops.xml | 4 ++--
 webapps/docs/config/valve.xml   | 4 ++--
 webapps/docs/jasper-howto.xml   | 2 +-
 webapps/docs/monitoring.xml | 4 ++--
 webapps/docs/realm-howto.xml| 2 +-
 webapps/docs/rewrite.xml| 2 +-
 webapps/docs/ssi-howto.xml  | 2 +-
 webapps/docs/ssl-howto.xml  | 2 +-
 webapps/docs/tomcat-docs.xsl| 2 +-
 19 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7394872d6c..aaa0db5c05 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -712,7 +712,7 @@
   
  Effectively disable the
  WebappClassLoaderBase.getResources() method as it is not
- used and if something accidently exposes the class loader this method
+ used and if something accidentally exposes the class loader this 
method
  can be used to gain access to Tomcat internals. (markt)
   
 
@@ -1302,7 +1302,7 @@
 getting the passord of a user. (remm)
   
   
-Add Javadoc comment which listeners must be nested whithin
+Add Javadoc comment which listeners must be nested within
 Server elements only. (michaelo)
   
   
diff --git a/webapps/docs/config/ajp.xml b/webapps/docs/config/ajp.xml
index 88a1a7b882..505ee56b50 100644
--- a/webapps/docs/config/ajp.xml
+++ b/webapps/docs/config/ajp.xml
@@ -87,7 +87,7 @@
   7231 section 4.3.8, cookie and authorization headers will be excluded 
from
   the response to the TRACE request. If you wish to include these, you can
   implement the doTrace() method for the target Servlet and
-  gain full control over the reponse.
+  gain full control over the response.
 
 
 
diff --git a/webapps/docs/config/cluster-interceptor.xml 
b/webapps/docs/config/cluster-interceptor.xml
index 836c4cddcd..1adfcf3336 100644
--- a/webapps/docs/config/cluster-interceptor.xml
+++ b/webapps/docs/config/cluster-interceptor.xml
@@ -36,7 +36,7 @@
 
   
   Apache Tribes supports an interceptor architecture to intercept both 
messages and membership notifications.
-  This architecture allows decoupling of logic and opens the way for some very 
useful feature add ons.
+  This architecture allows decoupling of logic and opens the way for some very 
useful feature add-ons.
   
 
 
diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml
index 0f7480bae6..312731410d 100644
--- a/webapps/docs/config/context.xml
+++ b/webapps/docs/config/context.xml
@@ -1127,7 +1127,7 @@
 
   
 The parameter value that will be presented to the application
-when requested from the JNDI context.  This value must be convertable
+when requested from the JNDI context.  This value must be convertible
 to the Java type defined by the type attribute.
   
 
diff --git a/webapps/docs/config/filter.xml b/webapps/docs/config/filter.xml
index 253ec44f73..4070f77e28 100644
--- a/webapps/docs/config/filter.xml
+++ b/webapps/docs/config/filter.xml
@@ -1120,7 +1120,7 @@ FINE: Request "/docs/config/manager.html" with response 
status "200"
   IPv6 are both fully supported.
 
 
-This filter mimicks Apache httpd's Order,
+This filter mimics Apache httpd's Order,
   Allow from and Deny from directives,
   with the following limitations:
 
diff --git a/webapps/docs/config/globalresources.xml 
b/webapps/docs/config/globalresources.xml
index 35b533e77a..fba311ff82 100644
--- a/webapps/docs/config/globalresources.xml
+++ b/webapps/docs/config/globalresources.xml
@@ -118,7 +118,7 @@
 
   
 The parameter value that will be presented to the application
-when requested from the JNDI context.  This value must be convertable
+when requested from the JNDI context.  This value must be convertible
 to the Java type defined by the type attribute.
   
 
diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index 710cbbd9dd..8f5501044d 

[tomcat] 04/06: Fix the typos in the resource bundles

[ebourg]

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

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

commit 5af06a1b83ab04d960b64b65d3acb877c544ecc2
Author: Emmanuel Bourg 
AuthorDate: Wed Sep 28 13:47:50 2022 +0200

Fix the typos in the resource bundles
---
 java/org/apache/catalina/ha/session/LocalStrings.properties | 4 ++--
 java/org/apache/tomcat/util/buf/LocalStrings.properties | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/catalina/ha/session/LocalStrings.properties 
b/java/org/apache/catalina/ha/session/LocalStrings.properties
index 5ba274aeea..d894dd3c64 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings.properties
@@ -75,12 +75,12 @@ deltaSession.writeSession=writeObject() storing session 
[{0}]
 
 jvmRoute.cannotFindSession=Cannot find session [{0}]
 jvmRoute.changeSession=Changed session from [{0}] to [{1}]
-jvmRoute.failover=Detected a failover with different jvmRoute - orginal route: 
[{0}] new one: [{1}] at session id [{2}]
+jvmRoute.failover=Detected a failover with different jvmRoute - original 
route: [{0}] new one: [{1}] at session id [{2}]
 jvmRoute.foundManager=Found Cluster Manager [{0}] at [{1}]
 jvmRoute.missingJvmRouteAttribute=No engine jvmRoute attribute configured!
 jvmRoute.noCluster=The JvmRouterBinderValve is configured, but clustering is 
not being used. Fail over will still work, providing a PersistentManager is 
used.
 jvmRoute.notFoundManager=Not found Cluster Manager at [{0}]
-jvmRoute.set.originalsessionid=Set Orginal Session id at request attribute 
[{0}] value: [{1}]
+jvmRoute.set.originalsessionid=Set Original Session id at request attribute 
[{0}] value: [{1}]
 jvmRoute.turnoverInfo=Turnover Check time [{0}] msec
 jvmRoute.valve.started=JvmRouteBinderValve started
 jvmRoute.valve.stopped=JvmRouteBinderValve stopped
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings.properties 
b/java/org/apache/tomcat/util/buf/LocalStrings.properties
index 2dd62b93e9..cd883e6f57 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings.properties
@@ -30,4 +30,4 @@ hexUtils.fromHex.oddDigits=The input must consist of an even 
number of hex digit
 uDecoder.eof=End of file (EOF)
 uDecoder.noSlash=The encoded slash character is not allowed
 uDecoder.urlDecode.conversionError=Failed to decode [{0}] using character set 
[{1}]
-uDecoder.urlDecode.missingDigit=Failed to decode [{0}] because the % character 
must be followed by two hexademical digits
+uDecoder.urlDecode.missingDigit=Failed to decode [{0}] because the % character 
must be followed by two hexadecimal digits


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

[tomcat] 01/06: Fix the typos in the XML schemas

[ebourg]

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

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

commit 4cab8699492fbb0c79b61e0dc00469cf63b06ea1
Author: Emmanuel Bourg 
AuthorDate: Wed Sep 28 13:20:59 2022 +0200

Fix the typos in the XML schemas

enpoint -> endpoint
expressable -> expressible
interaces   -> interfaces
mulitple-> multiple
occurence   -> occurrence
prefered-> preferred
refered -> referred
varaible-> variable
---
 java/javax/servlet/jsp/resources/jspxml.xsd | 2 +-
 java/javax/servlet/resources/javaee_web_services_1_2.xsd| 2 +-
 java/javax/servlet/resources/javaee_web_services_1_3.xsd| 2 +-
 java/javax/servlet/resources/javaee_web_services_1_4.xsd| 2 +-
 java/javax/servlet/resources/javaee_web_services_client_1_2.xsd | 2 +-
 java/javax/servlet/resources/javaee_web_services_client_1_3.xsd | 2 +-
 java/javax/servlet/resources/javaee_web_services_client_1_4.xsd | 2 +-
 java/javax/servlet/resources/web-app_3_0.xsd| 2 +-
 java/javax/servlet/resources/web-app_3_1.xsd| 2 +-
 java/javax/servlet/resources/web-app_4_0.xsd| 2 +-
 java/javax/servlet/resources/web-fragment_3_0.xsd   | 2 +-
 java/javax/servlet/resources/web-fragment_3_1.xsd   | 2 +-
 java/javax/servlet/resources/web-fragment_4_0.xsd   | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/java/javax/servlet/jsp/resources/jspxml.xsd 
b/java/javax/servlet/jsp/resources/jspxml.xsd
index 0e5eba0b36..1634d208d9 100644
--- a/java/javax/servlet/jsp/resources/jspxml.xsd
+++ b/java/javax/servlet/jsp/resources/jspxml.xsd
@@ -414,7 +414,7 @@
 jsp:useBean action or a custom action with an associated
 VariableInfo entry for this name.
 
-Exact valid combinations are not expressable in XML Schema.
+Exact valid combinations are not expressible in XML Schema.
 They are:
 
 name="Identifier" property="*"
diff --git a/java/javax/servlet/resources/javaee_web_services_1_2.xsd 
b/java/javax/servlet/resources/javaee_web_services_1_2.xsd
index 43914742ff..ec5540dd6c 100644
--- a/java/javax/servlet/resources/javaee_web_services_1_2.xsd
+++ b/java/javax/servlet/resources/javaee_web_services_1_2.xsd
@@ -336,7 +336,7 @@
   com.wombat.empl.EmployeeService
 
   This may not be specified in case there is no Service
-  Enpoint Interface as is the case with directly using an
+  Endpoint Interface as is the case with directly using an
   implementation class with the @WebService annotation.
 
   When the port component is a Provider implementation
diff --git a/java/javax/servlet/resources/javaee_web_services_1_3.xsd 
b/java/javax/servlet/resources/javaee_web_services_1_3.xsd
index d69d723e1d..71d4b33f73 100644
--- a/java/javax/servlet/resources/javaee_web_services_1_3.xsd
+++ b/java/javax/servlet/resources/javaee_web_services_1_3.xsd
@@ -332,7 +332,7 @@
   com.wombat.empl.EmployeeService
 
 This may not be specified in case there is no Service
-Enpoint Interface as is the case with directly using an
+Endpoint Interface as is the case with directly using an
 implementation class with the @WebService annotation.
 
 When the port component is a Provider implementation
diff --git a/java/javax/servlet/resources/javaee_web_services_1_4.xsd 
b/java/javax/servlet/resources/javaee_web_services_1_4.xsd
index e32c5b7d0c..032e6b7492 100644
--- a/java/javax/servlet/resources/javaee_web_services_1_4.xsd
+++ b/java/javax/servlet/resources/javaee_web_services_1_4.xsd
@@ -332,7 +332,7 @@
   com.wombat.empl.EmployeeService
 
 This may not be specified in case there is no Service
-Enpoint Interface as is the case with directly using an
+Endpoint Interface as is the case with directly using an
 implementation class with the @WebService annotation.
 
 When the port component is a Provider implementation
diff --git a/java/javax/servlet/resources/javaee_web_services_client_1_2.xsd 
b/java/javax/servlet/resources/javaee_web_services_client_1_2.xsd
index e95308a0a8..e32af449b3 100644
--- a/java/javax/servlet/resources/javaee_web_services_client_1_2.xsd
+++ b/java/javax/servlet/resources/javaee_web_services_client_1_2.xsd
@@ -260,7 +260,7 @@
   
 
 The service-qname element declares the specific WSDL service
-element that is being refered to.  It is not specified if no
+element that is being referred to.  It is not specified if no
 wsdl-file is declared.
 
   
diff --git a/java/javax/servlet/resources/javaee_web_services_client_1_3.xsd 

[tomcat] 05/06: Fix the typos in the build files

[ebourg]

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

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

commit c6e3ad20474102c0678682791c5efdef5f4b5942
Author: Emmanuel Bourg 
AuthorDate: Wed Sep 28 13:51:12 2022 +0200

Fix the typos in the build files
---
 build.xml   | 4 ++--
 res/maven/mvn-pub.xml   | 4 ++--
 res/maven/tomcat-embed-programmatic.pom | 2 +-
 res/scripts/check-mime.pl   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.xml b/build.xml
index c037bac436..fde8898f1b 100644
--- a/build.xml
+++ b/build.xml
@@ -2619,7 +2619,7 @@ version.dev=
 # Ensure consistent timestamps for reproducible builds.
 ant.tstamp.now.iso=${tstamp.iso.release}
 
-# Enable insertion of detatched signatures into the Windows installer.
+# Enable insertion of detached signatures into the Windows installer.
 do.codesigning=true
 
 # Re-use the same GPG executable.
@@ -2637,7 +2637,7 @@ gpg.exec=${gpg.exec}
 # Java Version:${java.vm.version}
 
 # The following is provided for information only. Builds will be repeatable
-# whether or not the build ennvironment in consistent with this information.
+# whether or not the build environment in consistent with this information.
 #
 # OS:  ${os.arch} ${os.name} ${os.version}
 # File encoding:   ${file.encoding}
diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml
index 1bf4932808..d9977e63fb 100644
--- a/res/maven/mvn-pub.xml
+++ b/res/maven/mvn-pub.xml
@@ -344,7 +344,7 @@
  
  
 
- 
+ 
  
 
 
-
+
 
 org.apache.tomcat.experimental
   tomcat-embed-programmatic
   @MAVEN.DEPLOY.VERSION@
-  Exerimental Minimal Tomcat for Programmatic Use
+  Experimental Minimal Tomcat for Programmatic Use
   https://tomcat.apache.org/
   
 
diff --git a/res/scripts/check-mime.pl b/res/scripts/check-mime.pl
index a589022e18..e3359bd8d5 100755
--- a/res/scripts/check-mime.pl
+++ b/res/scripts/check-mime.pl
@@ -37,7 +37,7 @@
 #new web.xml.
 # B) Mime type differences for the same extension between httpd
 #and Tomcat that are not part of TOMCAT_KEEP are logged.
-#They will be overwritten wit the httpd definition in the generated
+#They will be overwritten with the httpd definition in the generated
 #new web.xml. If you want to keep their Tomcat definition, add them
 #to TOMCAT_KEEP and run the script again. If you want to use the
 #definitions from httpd, commit the generated new web.xml.


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

[tomcat] 06/06: Fix more typos

[ebourg]

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

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

commit bd8a350942a74d699349d25cb3aef617b846ddb3
Author: Emmanuel Bourg 
AuthorDate: Wed Sep 28 13:51:34 2022 +0200

Fix more typos
---
 java/org/apache/tomcat/util/digester/package.html | 2 +-
 modules/jdbc-pool/doc/jdbc-pool.xml   | 4 ++--
 modules/jdbc-pool/doc/package.xsl | 4 ++--
 webapps/examples/websocket/drawboard.xhtml| 2 +-
 webapps/manager/WEB-INF/jsp/sessionsList.jsp  | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/tomcat/util/digester/package.html 
b/java/org/apache/tomcat/util/digester/package.html
index 3d20be416f..ee4d8381d1 100644
--- a/java/org/apache/tomcat/util/digester/package.html
+++ b/java/org/apache/tomcat/util/digester/package.html
@@ -777,7 +777,7 @@ matching namespace prefix patterns might be a better 
strategy.
 
 When you set the NamespaceAware property to false, digester 
uses
 the qualified element name (which includes the namespace prefix) rather than 
the
-local name as the patten component for the element. This means that your 
pattern
+local name as the pattern component for the element. This means that your 
pattern
 matches can include namespace prefixes as well as element names. So, rather 
than
 create namespace-aware rules, create pattern matches including the namespace
 prefixes.
diff --git a/modules/jdbc-pool/doc/jdbc-pool.xml 
b/modules/jdbc-pool/doc/jdbc-pool.xml
index b1ed9935d9..f0b5e00639 100644
--- a/modules/jdbc-pool/doc/jdbc-pool.xml
+++ b/modules/jdbc-pool/doc/jdbc-pool.xml
@@ -455,7 +455,7 @@
 
 
 
-  (int) Connections that have been abandoned (timed out) wont get 
closed and reported up unless
+  (int) Connections that have been abandoned (timed out) won't get 
closed and reported up unless
  the number of connections in use are above the percentage defined by 
abandonWhenPercentageFull.
  The value should be between 0-100.
  The default value is 0, which implies that connections 
are eligible for closure as soon
@@ -724,7 +724,7 @@
   
 Extends the SlowQueryReport and in addition to log entries 
it issues JMX notification
for monitoring tools to react to. Inherits all the attributes from its 
parent class.
-   This class uses Tomcat's JMX engine so it wont work outside of the 
Tomcat container.
+   This class uses Tomcat's JMX engine so it won't work outside of the 
Tomcat container.
By default, JMX notifications are sent through the ConnectionPool mbean 
if it is enabled.
The SlowQueryReportJmx can also register an MBean if 
notifyPool=false
 
diff --git a/modules/jdbc-pool/doc/package.xsl 
b/modules/jdbc-pool/doc/package.xsl
index d3fd7eab8c..a987c80bd2 100644
--- a/modules/jdbc-pool/doc/package.xsl
+++ b/modules/jdbc-pool/doc/package.xsl
@@ -30,14 +30,14 @@
   encoding="UTF-8"
   indent="no"/>
 
-  
+  
   
   
   
   https://bz.apache.org/bugzilla/show_bug.cgi?id='"/>
   https://svn.apache.org/viewvc?view=revrev='"/>
 
-  
+  
   
   
   
diff --git a/webapps/examples/websocket/drawboard.xhtml 
b/webapps/examples/websocket/drawboard.xhtml
index 14c5b2a7bd..a2edf3c71b 100644
--- a/webapps/examples/websocket/drawboard.xhtml
+++ b/webapps/examples/websocket/drawboard.xhtml
@@ -538,7 +538,7 @@
 }
 
 function refreshDisplayCanvas() {
-if (!isActive) { // Don't draw a curser when not active.
+if (!isActive) { // Don't draw a cursor when not active.
 return;
 }
 
diff --git a/webapps/manager/WEB-INF/jsp/sessionsList.jsp 
b/webapps/manager/WEB-INF/jsp/sessionsList.jsp
index f051bcf8bd..7fa43dacb8 100644
--- a/webapps/manager/WEB-INF/jsp/sessionsList.jsp
+++ b/webapps/manager/WEB-INF/jsp/sessionsList.jsp
@@ -59,7 +59,7 @@
 <%= JspHelper.escapeXml(request.getAttribute("message")) 
%>
 
 
-Active HttpSessions informations
+Active HttpSessions information
 
 "/>
 <% String order = (String) request.getAttribute("order");


-
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 (d6e9d0afbf -> bd8a350942)

[ebourg]

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

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


from d6e9d0afbf Fix Javadoc typo
 new 4cab869949 Fix the typos in the XML schemas
 new 5b1b80a629 Fix the typos in the documentation
 new c26907516d Fix the typos in the source code
 new 5af06a1b83 Fix the typos in the resource bundles
 new c6e3ad2047 Fix the typos in the build files
 new bd8a350942 Fix more typos

The 6 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.xml | 4 ++--
 java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java | 2 +-
 java/javax/servlet/jsp/resources/jspxml.xsd   | 2 +-
 java/javax/servlet/resources/javaee_web_services_1_2.xsd  | 2 +-
 java/javax/servlet/resources/javaee_web_services_1_3.xsd  | 2 +-
 java/javax/servlet/resources/javaee_web_services_1_4.xsd  | 2 +-
 java/javax/servlet/resources/javaee_web_services_client_1_2.xsd   | 2 +-
 java/javax/servlet/resources/javaee_web_services_client_1_3.xsd   | 2 +-
 java/javax/servlet/resources/javaee_web_services_client_1_4.xsd   | 2 +-
 java/javax/servlet/resources/web-app_3_0.xsd  | 2 +-
 java/javax/servlet/resources/web-app_3_1.xsd  | 2 +-
 java/javax/servlet/resources/web-app_4_0.xsd  | 2 +-
 java/javax/servlet/resources/web-fragment_3_0.xsd | 2 +-
 java/javax/servlet/resources/web-fragment_3_1.xsd | 2 +-
 java/javax/servlet/resources/web-fragment_4_0.xsd | 2 +-
 java/org/apache/catalina/Context.java | 2 +-
 java/org/apache/catalina/ha/session/LocalStrings.properties   | 4 ++--
 java/org/apache/catalina/mapper/MapperListener.java   | 4 ++--
 java/org/apache/catalina/mbeans/SparseUserDatabaseMBean.java  | 2 +-
 java/org/apache/catalina/servlets/CGIServlet.java | 2 +-
 java/org/apache/catalina/tribes/ByteMessage.java  | 2 +-
 .../catalina/tribes/group/interceptors/TcpFailureDetector.java| 2 +-
 .../catalina/tribes/group/interceptors/TcpPingInterceptor.java| 2 +-
 .../tribes/group/interceptors/TwoPhaseCommitInterceptor.java  | 2 +-
 java/org/apache/catalina/tribes/membership/McastServiceImpl.java  | 4 ++--
 java/org/apache/catalina/users/DataSourceUserDatabase.java| 2 +-
 .../org/apache/catalina/webresources/AbstractFileResourceSet.java | 2 +-
 java/org/apache/coyote/ActionHook.java| 2 +-
 java/org/apache/coyote/RequestInfo.java   | 2 +-
 java/org/apache/coyote/Response.java  | 2 +-
 java/org/apache/coyote/http11/Http11Processor.java| 2 +-
 java/org/apache/coyote/http2/AbstractNonZeroStream.java   | 6 +++---
 java/org/apache/jasper/compiler/Parser.java   | 2 +-
 java/org/apache/jasper/compiler/ServletWriter.java| 8 
 java/org/apache/jasper/runtime/PageContextImpl.java   | 2 +-
 java/org/apache/jasper/tagplugins/jstl/core/ForEach.java  | 2 +-
 java/org/apache/naming/factory/webservices/ServiceRefFactory.java | 4 ++--
 java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java   | 2 +-
 java/org/apache/tomcat/util/buf/LocalStrings.properties   | 2 +-
 java/org/apache/tomcat/util/digester/package.html | 2 +-
 java/org/apache/tomcat/util/json/ParseException.java  | 2 +-
 java/org/apache/tomcat/util/net/NioEndpoint.java  | 2 +-
 java/org/apache/tomcat/util/net/jsse/JSSEKeyManager.java  | 4 ++--
 java/org/apache/tomcat/util/net/jsse/PEMFile.java | 2 +-
 java/org/apache/tomcat/util/threads/TaskQueue.java| 2 +-
 modules/jdbc-pool/doc/jdbc-pool.xml   | 4 ++--
 modules/jdbc-pool/doc/package.xsl | 4 ++--
 .../src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java | 2 +-
 .../apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java  | 2 +-
 .../src/test/java/org/apache/tomcat/jdbc/test/TestValidation.java | 2 +-
 res/maven/mvn-pub.xml | 4 ++--
 res/maven/tomcat-embed-programmatic.pom   | 2 +-
 res/scripts/check-mime.pl | 2 +-
 .../catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java  | 2 +-
 test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java  | 8 
 test/org/apache/catalina/tribes/demos/MapDemo.java| 2 +-
 

[tomcat] branch 10.0.x updated (9eb2d683dd -> 354b994d2e)

[ebourg]

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

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


from 9eb2d683dd Add release date for 10.0.26
 new 43c66d94fa Fix the typos in the XML schemas
 new 1ada6748a9 Fix the typos in the documentation
 new c1170212fa Fix the typos in the source code
 new ed812fb4b8 Fix the typos in the resource bundles
 new 6548bac39c Fix the typos in the build files
 new 354b994d2e Fix more typos

The 6 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.xml | 4 ++--
 java/jakarta/servlet/descriptor/JspPropertyGroupDescriptor.java   | 2 +-
 java/jakarta/servlet/jsp/resources/jspxml.xsd | 2 +-
 java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd | 4 ++--
 .../servlet/resources/jakartaee_web_services_client_2_0.xsd   | 4 ++--
 java/jakarta/servlet/resources/javaee_web_services_1_2.xsd| 2 +-
 java/jakarta/servlet/resources/javaee_web_services_1_3.xsd| 2 +-
 java/jakarta/servlet/resources/javaee_web_services_1_4.xsd| 2 +-
 java/jakarta/servlet/resources/javaee_web_services_client_1_2.xsd | 2 +-
 java/jakarta/servlet/resources/javaee_web_services_client_1_3.xsd | 2 +-
 java/jakarta/servlet/resources/javaee_web_services_client_1_4.xsd | 2 +-
 java/jakarta/servlet/resources/jsp_3_0.xsd| 2 +-
 java/jakarta/servlet/resources/web-app_3_0.xsd| 2 +-
 java/jakarta/servlet/resources/web-app_3_1.xsd| 2 +-
 java/jakarta/servlet/resources/web-app_4_0.xsd| 2 +-
 java/jakarta/servlet/resources/web-app_5_0.xsd| 2 +-
 java/jakarta/servlet/resources/web-fragment_3_0.xsd   | 2 +-
 java/jakarta/servlet/resources/web-fragment_3_1.xsd   | 2 +-
 java/jakarta/servlet/resources/web-fragment_4_0.xsd   | 2 +-
 java/jakarta/servlet/resources/web-fragment_5_0.xsd   | 2 +-
 java/jakarta/servlet/resources/web-jsptaglibrary_3_0.xsd  | 4 ++--
 java/org/apache/catalina/Context.java | 2 +-
 java/org/apache/catalina/ha/session/LocalStrings.properties   | 4 ++--
 java/org/apache/catalina/mapper/MapperListener.java   | 4 ++--
 java/org/apache/catalina/mbeans/SparseUserDatabaseMBean.java  | 2 +-
 java/org/apache/catalina/servlets/CGIServlet.java | 2 +-
 java/org/apache/catalina/tribes/ByteMessage.java  | 2 +-
 .../catalina/tribes/group/interceptors/TcpFailureDetector.java| 2 +-
 .../catalina/tribes/group/interceptors/TcpPingInterceptor.java| 2 +-
 .../tribes/group/interceptors/TwoPhaseCommitInterceptor.java  | 2 +-
 java/org/apache/catalina/tribes/membership/McastServiceImpl.java  | 4 ++--
 java/org/apache/catalina/users/DataSourceUserDatabase.java| 2 +-
 .../org/apache/catalina/webresources/AbstractFileResourceSet.java | 2 +-
 java/org/apache/coyote/ActionHook.java| 2 +-
 java/org/apache/coyote/RequestInfo.java   | 2 +-
 java/org/apache/coyote/Response.java  | 2 +-
 java/org/apache/coyote/http11/Http11Processor.java| 2 +-
 java/org/apache/coyote/http2/AbstractNonZeroStream.java   | 6 +++---
 java/org/apache/jasper/compiler/Parser.java   | 2 +-
 java/org/apache/jasper/compiler/ServletWriter.java| 8 
 java/org/apache/jasper/runtime/PageContextImpl.java   | 2 +-
 java/org/apache/jasper/tagplugins/jstl/core/ForEach.java  | 2 +-
 java/org/apache/naming/factory/webservices/ServiceRefFactory.java | 4 ++--
 java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java   | 2 +-
 java/org/apache/tomcat/util/buf/LocalStrings.properties   | 2 +-
 java/org/apache/tomcat/util/digester/package.html | 2 +-
 java/org/apache/tomcat/util/json/ParseException.java  | 2 +-
 java/org/apache/tomcat/util/net/NioEndpoint.java  | 2 +-
 java/org/apache/tomcat/util/net/jsse/JSSEKeyManager.java  | 4 ++--
 java/org/apache/tomcat/util/net/jsse/PEMFile.java | 2 +-
 java/org/apache/tomcat/util/threads/TaskQueue.java| 2 +-
 modules/jdbc-pool/doc/jdbc-pool.xml   | 4 ++--
 modules/jdbc-pool/doc/package.xsl | 4 ++--
 .../src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java | 2 +-
 .../apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java  | 2 +-
 .../src/test/java/org/apache/tomcat/jdbc/test/TestValidation.java | 2 +-
 res/maven/mvn-pub.xml

[tomcat] 04/06: Fix the typos in the resource bundles

[ebourg]

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

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

commit ed812fb4b80266d7908fc292155dd87e6f96f054
Author: Emmanuel Bourg 
AuthorDate: Wed Sep 28 13:47:50 2022 +0200

Fix the typos in the resource bundles
---
 java/org/apache/catalina/ha/session/LocalStrings.properties | 4 ++--
 java/org/apache/tomcat/util/buf/LocalStrings.properties | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/catalina/ha/session/LocalStrings.properties 
b/java/org/apache/catalina/ha/session/LocalStrings.properties
index 5ba274aeea..d894dd3c64 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings.properties
@@ -75,12 +75,12 @@ deltaSession.writeSession=writeObject() storing session 
[{0}]
 
 jvmRoute.cannotFindSession=Cannot find session [{0}]
 jvmRoute.changeSession=Changed session from [{0}] to [{1}]
-jvmRoute.failover=Detected a failover with different jvmRoute - orginal route: 
[{0}] new one: [{1}] at session id [{2}]
+jvmRoute.failover=Detected a failover with different jvmRoute - original 
route: [{0}] new one: [{1}] at session id [{2}]
 jvmRoute.foundManager=Found Cluster Manager [{0}] at [{1}]
 jvmRoute.missingJvmRouteAttribute=No engine jvmRoute attribute configured!
 jvmRoute.noCluster=The JvmRouterBinderValve is configured, but clustering is 
not being used. Fail over will still work, providing a PersistentManager is 
used.
 jvmRoute.notFoundManager=Not found Cluster Manager at [{0}]
-jvmRoute.set.originalsessionid=Set Orginal Session id at request attribute 
[{0}] value: [{1}]
+jvmRoute.set.originalsessionid=Set Original Session id at request attribute 
[{0}] value: [{1}]
 jvmRoute.turnoverInfo=Turnover Check time [{0}] msec
 jvmRoute.valve.started=JvmRouteBinderValve started
 jvmRoute.valve.stopped=JvmRouteBinderValve stopped
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings.properties 
b/java/org/apache/tomcat/util/buf/LocalStrings.properties
index 2dd62b93e9..cd883e6f57 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings.properties
@@ -30,4 +30,4 @@ hexUtils.fromHex.oddDigits=The input must consist of an even 
number of hex digit
 uDecoder.eof=End of file (EOF)
 uDecoder.noSlash=The encoded slash character is not allowed
 uDecoder.urlDecode.conversionError=Failed to decode [{0}] using character set 
[{1}]
-uDecoder.urlDecode.missingDigit=Failed to decode [{0}] because the % character 
must be followed by two hexademical digits
+uDecoder.urlDecode.missingDigit=Failed to decode [{0}] because the % character 
must be followed by two hexadecimal digits


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

[tomcat] 06/06: Fix more typos

[ebourg]

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

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

commit 354b994d2ea88baf134c2b7b34c0db441c7dbf63
Author: Emmanuel Bourg 
AuthorDate: Wed Sep 28 13:51:34 2022 +0200

Fix more typos
---
 java/org/apache/tomcat/util/digester/package.html | 2 +-
 modules/jdbc-pool/doc/jdbc-pool.xml   | 4 ++--
 modules/jdbc-pool/doc/package.xsl | 4 ++--
 webapps/examples/websocket/drawboard.xhtml| 2 +-
 webapps/manager/WEB-INF/jsp/sessionsList.jsp  | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/tomcat/util/digester/package.html 
b/java/org/apache/tomcat/util/digester/package.html
index 3d20be416f..ee4d8381d1 100644
--- a/java/org/apache/tomcat/util/digester/package.html
+++ b/java/org/apache/tomcat/util/digester/package.html
@@ -777,7 +777,7 @@ matching namespace prefix patterns might be a better 
strategy.
 
 When you set the NamespaceAware property to false, digester 
uses
 the qualified element name (which includes the namespace prefix) rather than 
the
-local name as the patten component for the element. This means that your 
pattern
+local name as the pattern component for the element. This means that your 
pattern
 matches can include namespace prefixes as well as element names. So, rather 
than
 create namespace-aware rules, create pattern matches including the namespace
 prefixes.
diff --git a/modules/jdbc-pool/doc/jdbc-pool.xml 
b/modules/jdbc-pool/doc/jdbc-pool.xml
index b1ed9935d9..f0b5e00639 100644
--- a/modules/jdbc-pool/doc/jdbc-pool.xml
+++ b/modules/jdbc-pool/doc/jdbc-pool.xml
@@ -455,7 +455,7 @@
 
 
 
-  (int) Connections that have been abandoned (timed out) wont get 
closed and reported up unless
+  (int) Connections that have been abandoned (timed out) won't get 
closed and reported up unless
  the number of connections in use are above the percentage defined by 
abandonWhenPercentageFull.
  The value should be between 0-100.
  The default value is 0, which implies that connections 
are eligible for closure as soon
@@ -724,7 +724,7 @@
   
 Extends the SlowQueryReport and in addition to log entries 
it issues JMX notification
for monitoring tools to react to. Inherits all the attributes from its 
parent class.
-   This class uses Tomcat's JMX engine so it wont work outside of the 
Tomcat container.
+   This class uses Tomcat's JMX engine so it won't work outside of the 
Tomcat container.
By default, JMX notifications are sent through the ConnectionPool mbean 
if it is enabled.
The SlowQueryReportJmx can also register an MBean if 
notifyPool=false
 
diff --git a/modules/jdbc-pool/doc/package.xsl 
b/modules/jdbc-pool/doc/package.xsl
index d3fd7eab8c..a987c80bd2 100644
--- a/modules/jdbc-pool/doc/package.xsl
+++ b/modules/jdbc-pool/doc/package.xsl
@@ -30,14 +30,14 @@
   encoding="UTF-8"
   indent="no"/>
 
-  
+  
   
   
   
   https://bz.apache.org/bugzilla/show_bug.cgi?id='"/>
   https://svn.apache.org/viewvc?view=revrev='"/>
 
-  
+  
   
   
   
diff --git a/webapps/examples/websocket/drawboard.xhtml 
b/webapps/examples/websocket/drawboard.xhtml
index 14c5b2a7bd..a2edf3c71b 100644
--- a/webapps/examples/websocket/drawboard.xhtml
+++ b/webapps/examples/websocket/drawboard.xhtml
@@ -538,7 +538,7 @@
 }
 
 function refreshDisplayCanvas() {
-if (!isActive) { // Don't draw a curser when not active.
+if (!isActive) { // Don't draw a cursor when not active.
 return;
 }
 
diff --git a/webapps/manager/WEB-INF/jsp/sessionsList.jsp 
b/webapps/manager/WEB-INF/jsp/sessionsList.jsp
index f051bcf8bd..7fa43dacb8 100644
--- a/webapps/manager/WEB-INF/jsp/sessionsList.jsp
+++ b/webapps/manager/WEB-INF/jsp/sessionsList.jsp
@@ -59,7 +59,7 @@
 <%= JspHelper.escapeXml(request.getAttribute("message")) 
%>
 
 
-Active HttpSessions informations
+Active HttpSessions information
 
 "/>
 <% String order = (String) request.getAttribute("order");


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

[tomcat] 05/06: Fix the typos in the build files

[ebourg]

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

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

commit 6548bac39c9245c964070389acd7eca79c2bd764
Author: Emmanuel Bourg 
AuthorDate: Wed Sep 28 13:51:12 2022 +0200

Fix the typos in the build files
---
 build.xml   | 4 ++--
 res/maven/mvn-pub.xml   | 4 ++--
 res/maven/tomcat-embed-programmatic.pom | 2 +-
 res/scripts/check-mime.pl   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.xml b/build.xml
index 774e25ea37..6485bc5c1d 100644
--- a/build.xml
+++ b/build.xml
@@ -2637,7 +2637,7 @@ version.dev=
 # Ensure consistent timestamps for reproducible builds.
 ant.tstamp.now.iso=${tstamp.iso.release}
 
-# Enable insertion of detatched signatures into the Windows installer.
+# Enable insertion of detached signatures into the Windows installer.
 do.codesigning=true
 
 # Re-use the same GPG executable.
@@ -2655,7 +2655,7 @@ gpg.exec=${gpg.exec}
 # Java Version:${java.vm.version}
 
 # The following is provided for information only. Builds will be repeatable
-# whether or not the build ennvironment in consistent with this information.
+# whether or not the build environment in consistent with this information.
 #
 # OS:  ${os.arch} ${os.name} ${os.version}
 # File encoding:   ${file.encoding}
diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml
index ef9e0903ad..af14fa5fe9 100644
--- a/res/maven/mvn-pub.xml
+++ b/res/maven/mvn-pub.xml
@@ -344,7 +344,7 @@
  
  
 
- 
+ 
  
 
 
-
+
 
 org.apache.tomcat.experimental
   tomcat-embed-programmatic
   @MAVEN.DEPLOY.VERSION@
-  Exerimental Minimal Tomcat for Programmatic Use
+  Experimental Minimal Tomcat for Programmatic Use
   https://tomcat.apache.org/
   
 
diff --git a/res/scripts/check-mime.pl b/res/scripts/check-mime.pl
index a589022e18..e3359bd8d5 100755
--- a/res/scripts/check-mime.pl
+++ b/res/scripts/check-mime.pl
@@ -37,7 +37,7 @@
 #new web.xml.
 # B) Mime type differences for the same extension between httpd
 #and Tomcat that are not part of TOMCAT_KEEP are logged.
-#They will be overwritten wit the httpd definition in the generated
+#They will be overwritten with the httpd definition in the generated
 #new web.xml. If you want to keep their Tomcat definition, add them
 #to TOMCAT_KEEP and run the script again. If you want to use the
 #definitions from httpd, commit the generated new web.xml.


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

[tomcat] 02/06: Fix the typos in the documentation

[ebourg]

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

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

commit 1ada6748a9442db3bffaecbc5c8f8e653878308d
Author: Emmanuel Bourg 
AuthorDate: Wed Sep 28 13:40:05 2022 +0200

Fix the typos in the documentation
---
 webapps/docs/changelog.xml  | 6 +++---
 webapps/docs/config/ajp.xml | 2 +-
 webapps/docs/config/cluster-interceptor.xml | 2 +-
 webapps/docs/config/context.xml | 2 +-
 webapps/docs/config/filter.xml  | 2 +-
 webapps/docs/config/globalresources.xml | 2 +-
 webapps/docs/config/http.xml| 6 +++---
 webapps/docs/config/jaspic.xml  | 2 +-
 webapps/docs/config/realm.xml   | 2 +-
 webapps/docs/config/sessionidgenerator.xml  | 2 +-
 webapps/docs/config/systemprops.xml | 4 ++--
 webapps/docs/config/valve.xml   | 4 ++--
 webapps/docs/jasper-howto.xml   | 2 +-
 webapps/docs/monitoring.xml | 4 ++--
 webapps/docs/realm-howto.xml| 2 +-
 webapps/docs/rewrite.xml| 2 +-
 webapps/docs/ssi-howto.xml  | 2 +-
 webapps/docs/ssl-howto.xml  | 2 +-
 webapps/docs/tomcat-docs.xsl| 2 +-
 19 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d563dcb0c4..6db5c14808 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -739,7 +739,7 @@
   
  Effectively disable the
  WebappClassLoaderBase.getResources() method as it is not
- used and if something accidently exposes the class loader this method
+ used and if something accidentally exposes the class loader this 
method
  can be used to gain access to Tomcat internals. (markt)
   
 
@@ -1331,7 +1331,7 @@
 getting the passord of a user. (remm)
   
   
-Add Javadoc comment which listeners must be nested whithin
+Add Javadoc comment which listeners must be nested within
 Server elements only. (michaelo)
   
   
@@ -4333,7 +4333,7 @@
   
 
   
-This release contains all of the changes upto and including those in
+This release contains all of the changes up to and including those in
 Apache Tomcat 9.0.31 plus the additional changes listed below. (markt)
   
 
diff --git a/webapps/docs/config/ajp.xml b/webapps/docs/config/ajp.xml
index 0fe0864d2f..34721f7b8d 100644
--- a/webapps/docs/config/ajp.xml
+++ b/webapps/docs/config/ajp.xml
@@ -96,7 +96,7 @@
   7231 section 4.3.8, cookie and authorization headers will be excluded 
from
   the response to the TRACE request. If you wish to include these, you can
   implement the doTrace() method for the target Servlet and
-  gain full control over the reponse.
+  gain full control over the response.
 
 
 
diff --git a/webapps/docs/config/cluster-interceptor.xml 
b/webapps/docs/config/cluster-interceptor.xml
index 2dfc362024..d1b845dbc8 100644
--- a/webapps/docs/config/cluster-interceptor.xml
+++ b/webapps/docs/config/cluster-interceptor.xml
@@ -36,7 +36,7 @@
 
   
   Apache Tribes supports an interceptor architecture to intercept both 
messages and membership notifications.
-  This architecture allows decoupling of logic and opens the way for some very 
useful feature add ons.
+  This architecture allows decoupling of logic and opens the way for some very 
useful feature add-ons.
   
 
 
diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml
index 80309e8010..6ac0b4a09b 100644
--- a/webapps/docs/config/context.xml
+++ b/webapps/docs/config/context.xml
@@ -1156,7 +1156,7 @@
 
   
 The parameter value that will be presented to the application
-when requested from the JNDI context.  This value must be convertable
+when requested from the JNDI context.  This value must be convertible
 to the Java type defined by the type attribute.
   
 
diff --git a/webapps/docs/config/filter.xml b/webapps/docs/config/filter.xml
index da25ecb550..90880bced0 100644
--- a/webapps/docs/config/filter.xml
+++ b/webapps/docs/config/filter.xml
@@ -1120,7 +1120,7 @@ FINE: Request "/docs/config/manager.html" with response 
status "200"
   IPv6 are both fully supported.
 
 
-This filter mimicks Apache httpd's Order,
+This filter mimics Apache httpd's Order,
   Allow from and Deny from directives,
   with the following limitations:
 
diff --git a/webapps/docs/config/globalresources.xml 
b/webapps/docs/config/globalresources.xml
index 35b533e77a..fba311ff82 100644
--- a/webapps/docs/config/globalresources.xml
+++ b/webapps/docs/config/globalresources.xml
@@ -118,7 +118,7 @@
 
   
 The parameter value that will be presented to the application
-when requested from the 

[tomcat] 03/06: Fix the typos in the source code

[ebourg]

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

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

commit c1170212fa38018b0953527810e833d5dbe67a82
Author: Emmanuel Bourg 
AuthorDate: Wed Sep 28 13:46:55 2022 +0200

Fix the typos in the source code
---
 java/jakarta/servlet/descriptor/JspPropertyGroupDescriptor.java   | 2 +-
 java/org/apache/catalina/Context.java | 2 +-
 java/org/apache/catalina/mapper/MapperListener.java   | 4 ++--
 java/org/apache/catalina/mbeans/SparseUserDatabaseMBean.java  | 2 +-
 java/org/apache/catalina/servlets/CGIServlet.java | 2 +-
 java/org/apache/catalina/tribes/ByteMessage.java  | 2 +-
 .../catalina/tribes/group/interceptors/TcpFailureDetector.java| 2 +-
 .../catalina/tribes/group/interceptors/TcpPingInterceptor.java| 2 +-
 .../tribes/group/interceptors/TwoPhaseCommitInterceptor.java  | 2 +-
 java/org/apache/catalina/tribes/membership/McastServiceImpl.java  | 4 ++--
 java/org/apache/catalina/users/DataSourceUserDatabase.java| 2 +-
 .../org/apache/catalina/webresources/AbstractFileResourceSet.java | 2 +-
 java/org/apache/coyote/ActionHook.java| 2 +-
 java/org/apache/coyote/RequestInfo.java   | 2 +-
 java/org/apache/coyote/Response.java  | 2 +-
 java/org/apache/coyote/http11/Http11Processor.java| 2 +-
 java/org/apache/coyote/http2/AbstractNonZeroStream.java   | 6 +++---
 java/org/apache/jasper/compiler/Parser.java   | 2 +-
 java/org/apache/jasper/compiler/ServletWriter.java| 8 
 java/org/apache/jasper/runtime/PageContextImpl.java   | 2 +-
 java/org/apache/jasper/tagplugins/jstl/core/ForEach.java  | 2 +-
 java/org/apache/naming/factory/webservices/ServiceRefFactory.java | 4 ++--
 java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java   | 2 +-
 java/org/apache/tomcat/util/json/ParseException.java  | 2 +-
 java/org/apache/tomcat/util/net/NioEndpoint.java  | 2 +-
 java/org/apache/tomcat/util/net/jsse/JSSEKeyManager.java  | 4 ++--
 java/org/apache/tomcat/util/net/jsse/PEMFile.java | 2 +-
 java/org/apache/tomcat/util/threads/TaskQueue.java| 2 +-
 .../src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java | 2 +-
 .../apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java  | 2 +-
 .../src/test/java/org/apache/tomcat/jdbc/test/TestValidation.java | 2 +-
 .../catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java  | 2 +-
 test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java  | 8 
 test/org/apache/catalina/tribes/demos/MapDemo.java| 2 +-
 test/org/apache/coyote/http11/TestHttp11Processor.java| 2 +-
 test/org/apache/coyote/http2/Http2TestBase.java   | 2 +-
 test/org/apache/coyote/http2/TestCancelledUpload.java | 2 +-
 test/org/apache/tomcat/websocket/TestWsSubprotocols.java  | 2 +-
 38 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/java/jakarta/servlet/descriptor/JspPropertyGroupDescriptor.java 
b/java/jakarta/servlet/descriptor/JspPropertyGroupDescriptor.java
index a1c53568f9..93d4cfe112 100644
--- a/java/jakarta/servlet/descriptor/JspPropertyGroupDescriptor.java
+++ b/java/jakarta/servlet/descriptor/JspPropertyGroupDescriptor.java
@@ -85,7 +85,7 @@ public interface JspPropertyGroupDescriptor {
 public String getDeferredSyntaxAllowedAsLiteral();
 
 /**
- * Should the JSPs in this group have template text that onyl contains
+ * Should the JSPs in this group have template text that only contains
  * whitespace removed?
  *
  * @return {@code true} if the whitespace be removed, otherwise
diff --git a/java/org/apache/catalina/Context.java 
b/java/org/apache/catalina/Context.java
index 030c13566a..a24e215773 100644
--- a/java/org/apache/catalina/Context.java
+++ b/java/org/apache/catalina/Context.java
@@ -1807,7 +1807,7 @@ public interface Context extends Container, ContextBind {
 
 /**
  * Are paths used in calls to obtain a request dispatcher expected to be
- * encoded? This applys to both how Tomcat handles calls to obtain a 
request
+ * encoded? This applies to both how Tomcat handles calls to obtain a 
request
  * dispatcher as well as how Tomcat generates paths used to obtain request
  * dispatchers internally.
  *
diff --git a/java/org/apache/catalina/mapper/MapperListener.java 
b/java/org/apache/catalina/mapper/MapperListener.java
index fa303c47fc..67be0a7537 100644
--- a/java/org/apache/catalina/mapper/MapperListener.java
+++ b/java/org/apache/catalina/mapper/MapperListener.java
@@ -508,7 +508,7 @@ public class MapperListener extends LifecycleMBeanBase
 /**
  * Add this mapper to the container and 

[tomcat] 01/06: Fix the typos in the XML schemas

[ebourg]

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

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

commit 43c66d94fa71cec746d6a4018194ee40fc6f2248
Author: Emmanuel Bourg 
AuthorDate: Wed Sep 28 13:20:59 2022 +0200

Fix the typos in the XML schemas

enpoint -> endpoint
expressable -> expressible
interaces   -> interfaces
mulitple-> multiple
occurence   -> occurrence
prefered-> preferred
refered -> referred
varaible-> variable
---
 java/jakarta/servlet/jsp/resources/jspxml.xsd| 2 +-
 java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd| 4 ++--
 java/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd | 4 ++--
 java/jakarta/servlet/resources/javaee_web_services_1_2.xsd   | 2 +-
 java/jakarta/servlet/resources/javaee_web_services_1_3.xsd   | 2 +-
 java/jakarta/servlet/resources/javaee_web_services_1_4.xsd   | 2 +-
 java/jakarta/servlet/resources/javaee_web_services_client_1_2.xsd| 2 +-
 java/jakarta/servlet/resources/javaee_web_services_client_1_3.xsd| 2 +-
 java/jakarta/servlet/resources/javaee_web_services_client_1_4.xsd| 2 +-
 java/jakarta/servlet/resources/jsp_3_0.xsd   | 2 +-
 java/jakarta/servlet/resources/web-app_3_0.xsd   | 2 +-
 java/jakarta/servlet/resources/web-app_3_1.xsd   | 2 +-
 java/jakarta/servlet/resources/web-app_4_0.xsd   | 2 +-
 java/jakarta/servlet/resources/web-app_5_0.xsd   | 2 +-
 java/jakarta/servlet/resources/web-fragment_3_0.xsd  | 2 +-
 java/jakarta/servlet/resources/web-fragment_3_1.xsd  | 2 +-
 java/jakarta/servlet/resources/web-fragment_4_0.xsd  | 2 +-
 java/jakarta/servlet/resources/web-fragment_5_0.xsd  | 2 +-
 java/jakarta/servlet/resources/web-jsptaglibrary_3_0.xsd | 4 ++--
 19 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/java/jakarta/servlet/jsp/resources/jspxml.xsd 
b/java/jakarta/servlet/jsp/resources/jspxml.xsd
index 0e5eba0b36..1634d208d9 100644
--- a/java/jakarta/servlet/jsp/resources/jspxml.xsd
+++ b/java/jakarta/servlet/jsp/resources/jspxml.xsd
@@ -414,7 +414,7 @@
 jsp:useBean action or a custom action with an associated
 VariableInfo entry for this name.
 
-Exact valid combinations are not expressable in XML Schema.
+Exact valid combinations are not expressible in XML Schema.
 They are:
 
 name="Identifier" property="*"
diff --git a/java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd 
b/java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd
index 9f5716b32f..c9963a7540 100644
--- a/java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd
+++ b/java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd
@@ -303,7 +303,7 @@
   com.wombat.empl.EmployeeService
 
 This may not be specified in case there is no Service
-Enpoint Interface as is the case with directly using an
+Endpoint Interface as is the case with directly using an
 implementation class with the @WebService annotation.
 
 When the port component is a Provider implementation
@@ -464,7 +464,7 @@
   
 
 The jaxrpc-mapping-file element contains the name of a file that
-describes the Jakarta XML RPC mapping between the Java interaces 
used by
+describes the Jakarta XML RPC mapping between the Java interfaces 
used by
 the application and the WSDL description in the wsdl-file.  The
 file name is a relative path within the module.
 
diff --git 
a/java/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd 
b/java/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd
index dd01c6f5a3..5547d5e50a 100644
--- a/java/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd
+++ b/java/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd
@@ -122,7 +122,7 @@
   
 
 The jaxrpc-mapping-file element contains the name of a file that
-describes the Jakarta XML RPC mapping between the Java interaces 
used by
+describes the Jakarta XML RPC mapping between the Java interfaces 
used by
 the application and the WSDL description in the wsdl-file.  The
 file name is a relative path within the module file.
 
@@ -140,7 +140,7 @@
   
 
 The service-qname element declares the specific WSDL service
-element that is being refered to.  It is not specified if no
+element that is being referred to.  It is not specified if no
 wsdl-file is declared.
 
   
diff --git a/java/jakarta/servlet/resources/javaee_web_services_1_2.xsd 

[tomcat] 02/06: Fix the typos in the documentation

[ebourg]

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

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

commit 2dc855cc9e1b902f88d5a1bde2d3cc2aae3b4142
Author: Emmanuel Bourg 
AuthorDate: Wed Sep 28 13:40:05 2022 +0200

Fix the typos in the documentation
---
 webapps/docs/changelog.xml  | 4 ++--
 webapps/docs/config/ajp.xml | 2 +-
 webapps/docs/config/cluster-interceptor.xml | 2 +-
 webapps/docs/config/context.xml | 2 +-
 webapps/docs/config/filter.xml  | 2 +-
 webapps/docs/config/globalresources.xml | 2 +-
 webapps/docs/config/http.xml| 6 +++---
 webapps/docs/config/jaspic.xml  | 2 +-
 webapps/docs/config/realm.xml   | 2 +-
 webapps/docs/config/sessionidgenerator.xml  | 2 +-
 webapps/docs/config/systemprops.xml | 4 ++--
 webapps/docs/config/valve.xml   | 4 ++--
 webapps/docs/jasper-howto.xml   | 2 +-
 webapps/docs/jndi-datasource-examples-howto.xml | 2 +-
 webapps/docs/monitoring.xml | 4 ++--
 webapps/docs/realm-howto.xml| 2 +-
 webapps/docs/rewrite.xml| 2 +-
 webapps/docs/ssi-howto.xml  | 2 +-
 webapps/docs/ssl-howto.xml  | 2 +-
 webapps/docs/tomcat-docs.xsl| 2 +-
 20 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2ead6b3120..ebfcbd7c4e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -846,7 +846,7 @@
   
   
  Remove the WebappClassLoaderBase.getResources() method as
- it is not used and if something accidently exposes the class loader
+ it is not used and if something accidentally exposes the class loader
  this method can be used to gain access to Tomcat internals. (markt)
   
 
@@ -1545,7 +1545,7 @@
 getting the passord of a user. (remm)
   
   
-Add Javadoc comment which listeners must be nested whithin
+Add Javadoc comment which listeners must be nested within
 Server elements only. (michaelo)
   
   
diff --git a/webapps/docs/config/ajp.xml b/webapps/docs/config/ajp.xml
index 7f132a0ad8..c8b20ab573 100644
--- a/webapps/docs/config/ajp.xml
+++ b/webapps/docs/config/ajp.xml
@@ -93,7 +93,7 @@
   7231 section 4.3.8, cookie and authorization headers will be excluded 
from
   the response to the TRACE request. If you wish to include these, you can
   implement the doTrace() method for the target Servlet and
-  gain full control over the reponse.
+  gain full control over the response.
 
 
 
diff --git a/webapps/docs/config/cluster-interceptor.xml 
b/webapps/docs/config/cluster-interceptor.xml
index 2dfc362024..d1b845dbc8 100644
--- a/webapps/docs/config/cluster-interceptor.xml
+++ b/webapps/docs/config/cluster-interceptor.xml
@@ -36,7 +36,7 @@
 
   
   Apache Tribes supports an interceptor architecture to intercept both 
messages and membership notifications.
-  This architecture allows decoupling of logic and opens the way for some very 
useful feature add ons.
+  This architecture allows decoupling of logic and opens the way for some very 
useful feature add-ons.
   
 
 
diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml
index 0fa30a07f2..0b093a2664 100644
--- a/webapps/docs/config/context.xml
+++ b/webapps/docs/config/context.xml
@@ -1155,7 +1155,7 @@
 
   
 The parameter value that will be presented to the application
-when requested from the JNDI context.  This value must be convertable
+when requested from the JNDI context.  This value must be convertible
 to the Java type defined by the type attribute.
   
 
diff --git a/webapps/docs/config/filter.xml b/webapps/docs/config/filter.xml
index da25ecb550..90880bced0 100644
--- a/webapps/docs/config/filter.xml
+++ b/webapps/docs/config/filter.xml
@@ -1120,7 +1120,7 @@ FINE: Request "/docs/config/manager.html" with response 
status "200"
   IPv6 are both fully supported.
 
 
-This filter mimicks Apache httpd's Order,
+This filter mimics Apache httpd's Order,
   Allow from and Deny from directives,
   with the following limitations:
 
diff --git a/webapps/docs/config/globalresources.xml 
b/webapps/docs/config/globalresources.xml
index 35b533e77a..fba311ff82 100644
--- a/webapps/docs/config/globalresources.xml
+++ b/webapps/docs/config/globalresources.xml
@@ -118,7 +118,7 @@
 
   
 The parameter value that will be presented to the application
-when requested from the JNDI context.  This value must be convertable
+when requested from the JNDI context.  This value must be convertible
 to the Java type defined by the type attribute.

[tomcat] 01/06: Fix the typos in the XML schemas

[ebourg]

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

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

commit 2609b760e969cdbd096816fac65dd4a97cdc585c
Author: Emmanuel Bourg 
AuthorDate: Wed Sep 28 13:20:59 2022 +0200

Fix the typos in the XML schemas

enpoint -> endpoint
expressable -> expressible
interaces   -> interfaces
mulitple-> multiple
occurence   -> occurrence
prefered-> preferred
refered -> referred
varaible-> variable
---
 java/jakarta/servlet/jsp/resources/jspxml.xsd| 2 +-
 java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd| 4 ++--
 java/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd | 4 ++--
 java/jakarta/servlet/resources/javaee_web_services_1_2.xsd   | 2 +-
 java/jakarta/servlet/resources/javaee_web_services_1_3.xsd   | 2 +-
 java/jakarta/servlet/resources/javaee_web_services_1_4.xsd   | 2 +-
 java/jakarta/servlet/resources/javaee_web_services_client_1_2.xsd| 2 +-
 java/jakarta/servlet/resources/javaee_web_services_client_1_3.xsd| 2 +-
 java/jakarta/servlet/resources/javaee_web_services_client_1_4.xsd| 2 +-
 java/jakarta/servlet/resources/jsp_3_0.xsd   | 2 +-
 java/jakarta/servlet/resources/jsp_3_1.xsd   | 2 +-
 java/jakarta/servlet/resources/web-app_3_0.xsd   | 2 +-
 java/jakarta/servlet/resources/web-app_3_1.xsd   | 2 +-
 java/jakarta/servlet/resources/web-app_4_0.xsd   | 2 +-
 java/jakarta/servlet/resources/web-app_5_0.xsd   | 2 +-
 java/jakarta/servlet/resources/web-app_6_0.xsd   | 2 +-
 java/jakarta/servlet/resources/web-fragment_3_0.xsd  | 2 +-
 java/jakarta/servlet/resources/web-fragment_3_1.xsd  | 2 +-
 java/jakarta/servlet/resources/web-fragment_4_0.xsd  | 2 +-
 java/jakarta/servlet/resources/web-fragment_5_0.xsd  | 2 +-
 java/jakarta/servlet/resources/web-fragment_6_0.xsd  | 2 +-
 java/jakarta/servlet/resources/web-jsptaglibrary_3_0.xsd | 4 ++--
 java/jakarta/servlet/resources/web-jsptaglibrary_3_1.xsd | 4 ++--
 23 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/java/jakarta/servlet/jsp/resources/jspxml.xsd 
b/java/jakarta/servlet/jsp/resources/jspxml.xsd
index 4cad6bb2bc..d93c6156e6 100644
--- a/java/jakarta/servlet/jsp/resources/jspxml.xsd
+++ b/java/jakarta/servlet/jsp/resources/jspxml.xsd
@@ -415,7 +415,7 @@
 jsp:useBean action or a custom action with an associated
 VariableInfo entry for this name.
 
-Exact valid combinations are not expressable in XML Schema.
+Exact valid combinations are not expressible in XML Schema.
 They are:
 
 name="Identifier" property="*"
diff --git a/java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd 
b/java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd
index 9f5716b32f..c9963a7540 100644
--- a/java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd
+++ b/java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd
@@ -303,7 +303,7 @@
   com.wombat.empl.EmployeeService
 
 This may not be specified in case there is no Service
-Enpoint Interface as is the case with directly using an
+Endpoint Interface as is the case with directly using an
 implementation class with the @WebService annotation.
 
 When the port component is a Provider implementation
@@ -464,7 +464,7 @@
   
 
 The jaxrpc-mapping-file element contains the name of a file that
-describes the Jakarta XML RPC mapping between the Java interaces 
used by
+describes the Jakarta XML RPC mapping between the Java interfaces 
used by
 the application and the WSDL description in the wsdl-file.  The
 file name is a relative path within the module.
 
diff --git 
a/java/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd 
b/java/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd
index dd01c6f5a3..5547d5e50a 100644
--- a/java/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd
+++ b/java/jakarta/servlet/resources/jakartaee_web_services_client_2_0.xsd
@@ -122,7 +122,7 @@
   
 
 The jaxrpc-mapping-file element contains the name of a file that
-describes the Jakarta XML RPC mapping between the Java interaces 
used by
+describes the Jakarta XML RPC mapping between the Java interfaces 
used by
 the application and the WSDL description in the wsdl-file.  The
 file name is a relative path within the module file.
 
@@ -140,7 +140,7 @@
   
 
 The service-qname element declares the specific 

[tomcat] 06/06: Fix more typos

[ebourg]

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

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

commit ffa48e5d37bfadd086103a30e9679f3c5965433d
Author: Emmanuel Bourg 
AuthorDate: Wed Sep 28 13:51:34 2022 +0200

Fix more typos
---
 java/org/apache/tomcat/util/digester/package.html | 2 +-
 modules/jdbc-pool/doc/jdbc-pool.xml   | 4 ++--
 modules/jdbc-pool/doc/package.xsl | 4 ++--
 webapps/examples/websocket/drawboard.xhtml| 2 +-
 webapps/manager/WEB-INF/jsp/sessionsList.jsp  | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/tomcat/util/digester/package.html 
b/java/org/apache/tomcat/util/digester/package.html
index 207cafebfd..d95fd5258c 100644
--- a/java/org/apache/tomcat/util/digester/package.html
+++ b/java/org/apache/tomcat/util/digester/package.html
@@ -777,7 +777,7 @@ matching namespace prefix patterns might be a better 
strategy.
 
 When you set the NamespaceAware property to false, digester 
uses
 the qualified element name (which includes the namespace prefix) rather than 
the
-local name as the patten component for the element. This means that your 
pattern
+local name as the pattern component for the element. This means that your 
pattern
 matches can include namespace prefixes as well as element names. So, rather 
than
 create namespace-aware rules, create pattern matches including the namespace
 prefixes.
diff --git a/modules/jdbc-pool/doc/jdbc-pool.xml 
b/modules/jdbc-pool/doc/jdbc-pool.xml
index b1ed9935d9..f0b5e00639 100644
--- a/modules/jdbc-pool/doc/jdbc-pool.xml
+++ b/modules/jdbc-pool/doc/jdbc-pool.xml
@@ -455,7 +455,7 @@
 
 
 
-  (int) Connections that have been abandoned (timed out) wont get 
closed and reported up unless
+  (int) Connections that have been abandoned (timed out) won't get 
closed and reported up unless
  the number of connections in use are above the percentage defined by 
abandonWhenPercentageFull.
  The value should be between 0-100.
  The default value is 0, which implies that connections 
are eligible for closure as soon
@@ -724,7 +724,7 @@
   
 Extends the SlowQueryReport and in addition to log entries 
it issues JMX notification
for monitoring tools to react to. Inherits all the attributes from its 
parent class.
-   This class uses Tomcat's JMX engine so it wont work outside of the 
Tomcat container.
+   This class uses Tomcat's JMX engine so it won't work outside of the 
Tomcat container.
By default, JMX notifications are sent through the ConnectionPool mbean 
if it is enabled.
The SlowQueryReportJmx can also register an MBean if 
notifyPool=false
 
diff --git a/modules/jdbc-pool/doc/package.xsl 
b/modules/jdbc-pool/doc/package.xsl
index d3fd7eab8c..a987c80bd2 100644
--- a/modules/jdbc-pool/doc/package.xsl
+++ b/modules/jdbc-pool/doc/package.xsl
@@ -30,14 +30,14 @@
   encoding="UTF-8"
   indent="no"/>
 
-  
+  
   
   
   
   https://bz.apache.org/bugzilla/show_bug.cgi?id='"/>
   https://svn.apache.org/viewvc?view=revrev='"/>
 
-  
+  
   
   
   
diff --git a/webapps/examples/websocket/drawboard.xhtml 
b/webapps/examples/websocket/drawboard.xhtml
index 14c5b2a7bd..a2edf3c71b 100644
--- a/webapps/examples/websocket/drawboard.xhtml
+++ b/webapps/examples/websocket/drawboard.xhtml
@@ -538,7 +538,7 @@
 }
 
 function refreshDisplayCanvas() {
-if (!isActive) { // Don't draw a curser when not active.
+if (!isActive) { // Don't draw a cursor when not active.
 return;
 }
 
diff --git a/webapps/manager/WEB-INF/jsp/sessionsList.jsp 
b/webapps/manager/WEB-INF/jsp/sessionsList.jsp
index f051bcf8bd..7fa43dacb8 100644
--- a/webapps/manager/WEB-INF/jsp/sessionsList.jsp
+++ b/webapps/manager/WEB-INF/jsp/sessionsList.jsp
@@ -59,7 +59,7 @@
 <%= JspHelper.escapeXml(request.getAttribute("message")) 
%>
 
 
-Active HttpSessions informations
+Active HttpSessions information
 
 "/>
 <% String order = (String) request.getAttribute("order");


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

[tomcat] 04/06: Fix the typos in the resource bundles

[ebourg]

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

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

commit 200e146e7a9bd2c7aef396d9fdaf98afb2753f11
Author: Emmanuel Bourg 
AuthorDate: Wed Sep 28 13:47:50 2022 +0200

Fix the typos in the resource bundles
---
 java/org/apache/catalina/ha/session/LocalStrings.properties | 4 ++--
 java/org/apache/tomcat/util/buf/LocalStrings.properties | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/catalina/ha/session/LocalStrings.properties 
b/java/org/apache/catalina/ha/session/LocalStrings.properties
index 5ba274aeea..d894dd3c64 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings.properties
@@ -75,12 +75,12 @@ deltaSession.writeSession=writeObject() storing session 
[{0}]
 
 jvmRoute.cannotFindSession=Cannot find session [{0}]
 jvmRoute.changeSession=Changed session from [{0}] to [{1}]
-jvmRoute.failover=Detected a failover with different jvmRoute - orginal route: 
[{0}] new one: [{1}] at session id [{2}]
+jvmRoute.failover=Detected a failover with different jvmRoute - original 
route: [{0}] new one: [{1}] at session id [{2}]
 jvmRoute.foundManager=Found Cluster Manager [{0}] at [{1}]
 jvmRoute.missingJvmRouteAttribute=No engine jvmRoute attribute configured!
 jvmRoute.noCluster=The JvmRouterBinderValve is configured, but clustering is 
not being used. Fail over will still work, providing a PersistentManager is 
used.
 jvmRoute.notFoundManager=Not found Cluster Manager at [{0}]
-jvmRoute.set.originalsessionid=Set Orginal Session id at request attribute 
[{0}] value: [{1}]
+jvmRoute.set.originalsessionid=Set Original Session id at request attribute 
[{0}] value: [{1}]
 jvmRoute.turnoverInfo=Turnover Check time [{0}] msec
 jvmRoute.valve.started=JvmRouteBinderValve started
 jvmRoute.valve.stopped=JvmRouteBinderValve stopped
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings.properties 
b/java/org/apache/tomcat/util/buf/LocalStrings.properties
index da283cb3f4..b4d5a4eccb 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings.properties
@@ -32,4 +32,4 @@ messageBytes.illegalCharacter=The Unicode character [{0}] at 
code point [{1}] ca
 uDecoder.eof=End of file (EOF)
 uDecoder.noSlash=The encoded slash character is not allowed
 uDecoder.urlDecode.conversionError=Failed to decode [{0}] using character set 
[{1}]
-uDecoder.urlDecode.missingDigit=Failed to decode [{0}] because the % character 
must be followed by two hexademical digits
+uDecoder.urlDecode.missingDigit=Failed to decode [{0}] because the % character 
must be followed by two hexadecimal digits


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

[tomcat] 03/06: Fix the typos in the source code

[ebourg]

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

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

commit 8806dcba9e0d857008d010d6024336973012fef2
Author: Emmanuel Bourg 
AuthorDate: Wed Sep 28 13:46:55 2022 +0200

Fix the typos in the source code
---
 java/jakarta/servlet/descriptor/JspPropertyGroupDescriptor.java   | 2 +-
 java/org/apache/catalina/Context.java | 2 +-
 java/org/apache/catalina/core/DefaultInstanceManager.java | 4 ++--
 java/org/apache/catalina/mapper/MapperListener.java   | 4 ++--
 java/org/apache/catalina/mbeans/SparseUserDatabaseMBean.java  | 2 +-
 java/org/apache/catalina/servlets/CGIServlet.java | 2 +-
 java/org/apache/catalina/tribes/ByteMessage.java  | 2 +-
 .../catalina/tribes/group/interceptors/TcpFailureDetector.java| 2 +-
 .../catalina/tribes/group/interceptors/TcpPingInterceptor.java| 2 +-
 .../tribes/group/interceptors/TwoPhaseCommitInterceptor.java  | 2 +-
 java/org/apache/catalina/tribes/membership/McastServiceImpl.java  | 4 ++--
 java/org/apache/catalina/users/DataSourceUserDatabase.java| 2 +-
 .../org/apache/catalina/webresources/AbstractFileResourceSet.java | 2 +-
 java/org/apache/coyote/ActionHook.java| 2 +-
 java/org/apache/coyote/RequestInfo.java   | 2 +-
 java/org/apache/coyote/Response.java  | 2 +-
 java/org/apache/coyote/http11/Http11Processor.java| 2 +-
 java/org/apache/coyote/http2/AbstractNonZeroStream.java   | 6 +++---
 java/org/apache/jasper/compiler/Parser.java   | 2 +-
 java/org/apache/jasper/compiler/ServletWriter.java| 8 
 java/org/apache/jasper/runtime/PageContextImpl.java   | 2 +-
 java/org/apache/jasper/tagplugins/jstl/core/ForEach.java  | 2 +-
 java/org/apache/naming/factory/webservices/ServiceRefFactory.java | 4 ++--
 java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java   | 2 +-
 java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java  | 2 +-
 java/org/apache/tomcat/util/json/ParseException.java  | 2 +-
 java/org/apache/tomcat/util/net/NioEndpoint.java  | 2 +-
 java/org/apache/tomcat/util/net/jsse/JSSEKeyManager.java  | 4 ++--
 java/org/apache/tomcat/util/net/jsse/PEMFile.java | 2 +-
 java/org/apache/tomcat/util/threads/TaskQueue.java| 2 +-
 .../src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java | 2 +-
 .../apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java  | 2 +-
 .../src/test/java/org/apache/tomcat/jdbc/test/TestValidation.java | 2 +-
 .../catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java  | 2 +-
 test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java  | 8 
 test/org/apache/catalina/tribes/demos/MapDemo.java| 2 +-
 test/org/apache/coyote/http11/TestHttp11Processor.java| 2 +-
 test/org/apache/coyote/http2/Http2TestBase.java   | 2 +-
 test/org/apache/coyote/http2/TestCancelledUpload.java | 2 +-
 test/org/apache/tomcat/websocket/TestWsSubprotocols.java  | 2 +-
 40 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/java/jakarta/servlet/descriptor/JspPropertyGroupDescriptor.java 
b/java/jakarta/servlet/descriptor/JspPropertyGroupDescriptor.java
index 19b28ed172..84555c0c8f 100644
--- a/java/jakarta/servlet/descriptor/JspPropertyGroupDescriptor.java
+++ b/java/jakarta/servlet/descriptor/JspPropertyGroupDescriptor.java
@@ -95,7 +95,7 @@ public interface JspPropertyGroupDescriptor {
 public String getDeferredSyntaxAllowedAsLiteral();
 
 /**
- * Should the JSPs in this group have template text that onyl contains
+ * Should the JSPs in this group have template text that only contains
  * whitespace removed?
  *
  * @return {@code true} if the whitespace be removed, otherwise
diff --git a/java/org/apache/catalina/Context.java 
b/java/org/apache/catalina/Context.java
index 030c13566a..a24e215773 100644
--- a/java/org/apache/catalina/Context.java
+++ b/java/org/apache/catalina/Context.java
@@ -1807,7 +1807,7 @@ public interface Context extends Container, ContextBind {
 
 /**
  * Are paths used in calls to obtain a request dispatcher expected to be
- * encoded? This applys to both how Tomcat handles calls to obtain a 
request
+ * encoded? This applies to both how Tomcat handles calls to obtain a 
request
  * dispatcher as well as how Tomcat generates paths used to obtain request
  * dispatchers internally.
  *
diff --git a/java/org/apache/catalina/core/DefaultInstanceManager.java 
b/java/org/apache/catalina/core/DefaultInstanceManager.java
index 9a91775891..8ef9c3ea28 100644
--- a/java/org/apache/catalina/core/DefaultInstanceManager.java
+++ 

[tomcat] 05/06: Fix the typos in the build files

[ebourg]

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

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

commit 635043c8fa66b386c8c94ec34468921823a875e6
Author: Emmanuel Bourg 
AuthorDate: Wed Sep 28 13:51:12 2022 +0200

Fix the typos in the build files
---
 build.xml   | 4 ++--
 res/maven/mvn-pub.xml   | 4 ++--
 res/maven/tomcat-embed-programmatic.pom | 2 +-
 res/scripts/check-mime.pl   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.xml b/build.xml
index bdd08019f5..b76fbcd3bf 100644
--- a/build.xml
+++ b/build.xml
@@ -2676,7 +2676,7 @@ version.dev=
 # Ensure consistent timestamps for reproducible builds.
 ant.tstamp.now.iso=${tstamp.iso.release}
 
-# Enable insertion of detatched signatures into the Windows installer.
+# Enable insertion of detached signatures into the Windows installer.
 do.codesigning=true
 
 # Re-use the same GPG executable.
@@ -2694,7 +2694,7 @@ gpg.exec=${gpg.exec}
 # Java Version:${java.vm.version}
 
 # The following is provided for information only. Builds will be repeatable
-# whether or not the build ennvironment in consistent with this information.
+# whether or not the build environment in consistent with this information.
 #
 # OS:  ${os.arch} ${os.name} ${os.version}
 # File encoding:   ${file.encoding}
diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml
index 924a64352f..9781949fa5 100644
--- a/res/maven/mvn-pub.xml
+++ b/res/maven/mvn-pub.xml
@@ -348,7 +348,7 @@
  
  
 
- 
+ 
  
 
 
-
+
 
 org.apache.tomcat.experimental
   tomcat-embed-programmatic
   @MAVEN.DEPLOY.VERSION@
-  Exerimental Minimal Tomcat for Programmatic Use
+  Experimental Minimal Tomcat for Programmatic Use
   https://tomcat.apache.org/
   
 
diff --git a/res/scripts/check-mime.pl b/res/scripts/check-mime.pl
index a589022e18..e3359bd8d5 100755
--- a/res/scripts/check-mime.pl
+++ b/res/scripts/check-mime.pl
@@ -37,7 +37,7 @@
 #new web.xml.
 # B) Mime type differences for the same extension between httpd
 #and Tomcat that are not part of TOMCAT_KEEP are logged.
-#They will be overwritten wit the httpd definition in the generated
+#They will be overwritten with the httpd definition in the generated
 #new web.xml. If you want to keep their Tomcat definition, add them
 #to TOMCAT_KEEP and run the script again. If you want to use the
 #definitions from httpd, commit the generated new web.xml.


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

[tomcat] branch main updated (c386d43bdc -> ffa48e5d37)

[ebourg]

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

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


from c386d43bdc Fix Javadoc typo
 new 2609b760e9 Fix the typos in the XML schemas
 new 2dc855cc9e Fix the typos in the documentation
 new 8806dcba9e Fix the typos in the source code
 new 200e146e7a Fix the typos in the resource bundles
 new 635043c8fa Fix the typos in the build files
 new ffa48e5d37 Fix more typos

The 6 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.xml | 4 ++--
 java/jakarta/servlet/descriptor/JspPropertyGroupDescriptor.java   | 2 +-
 java/jakarta/servlet/jsp/resources/jspxml.xsd | 2 +-
 java/jakarta/servlet/resources/jakartaee_web_services_2_0.xsd | 4 ++--
 .../servlet/resources/jakartaee_web_services_client_2_0.xsd   | 4 ++--
 java/jakarta/servlet/resources/javaee_web_services_1_2.xsd| 2 +-
 java/jakarta/servlet/resources/javaee_web_services_1_3.xsd| 2 +-
 java/jakarta/servlet/resources/javaee_web_services_1_4.xsd| 2 +-
 java/jakarta/servlet/resources/javaee_web_services_client_1_2.xsd | 2 +-
 java/jakarta/servlet/resources/javaee_web_services_client_1_3.xsd | 2 +-
 java/jakarta/servlet/resources/javaee_web_services_client_1_4.xsd | 2 +-
 java/jakarta/servlet/resources/jsp_3_0.xsd| 2 +-
 java/jakarta/servlet/resources/jsp_3_1.xsd| 2 +-
 java/jakarta/servlet/resources/web-app_3_0.xsd| 2 +-
 java/jakarta/servlet/resources/web-app_3_1.xsd| 2 +-
 java/jakarta/servlet/resources/web-app_4_0.xsd| 2 +-
 java/jakarta/servlet/resources/web-app_5_0.xsd| 2 +-
 java/jakarta/servlet/resources/web-app_6_0.xsd| 2 +-
 java/jakarta/servlet/resources/web-fragment_3_0.xsd   | 2 +-
 java/jakarta/servlet/resources/web-fragment_3_1.xsd   | 2 +-
 java/jakarta/servlet/resources/web-fragment_4_0.xsd   | 2 +-
 java/jakarta/servlet/resources/web-fragment_5_0.xsd   | 2 +-
 java/jakarta/servlet/resources/web-fragment_6_0.xsd   | 2 +-
 java/jakarta/servlet/resources/web-jsptaglibrary_3_0.xsd  | 4 ++--
 java/jakarta/servlet/resources/web-jsptaglibrary_3_1.xsd  | 4 ++--
 java/org/apache/catalina/Context.java | 2 +-
 java/org/apache/catalina/core/DefaultInstanceManager.java | 4 ++--
 java/org/apache/catalina/ha/session/LocalStrings.properties   | 4 ++--
 java/org/apache/catalina/mapper/MapperListener.java   | 4 ++--
 java/org/apache/catalina/mbeans/SparseUserDatabaseMBean.java  | 2 +-
 java/org/apache/catalina/servlets/CGIServlet.java | 2 +-
 java/org/apache/catalina/tribes/ByteMessage.java  | 2 +-
 .../catalina/tribes/group/interceptors/TcpFailureDetector.java| 2 +-
 .../catalina/tribes/group/interceptors/TcpPingInterceptor.java| 2 +-
 .../tribes/group/interceptors/TwoPhaseCommitInterceptor.java  | 2 +-
 java/org/apache/catalina/tribes/membership/McastServiceImpl.java  | 4 ++--
 java/org/apache/catalina/users/DataSourceUserDatabase.java| 2 +-
 .../org/apache/catalina/webresources/AbstractFileResourceSet.java | 2 +-
 java/org/apache/coyote/ActionHook.java| 2 +-
 java/org/apache/coyote/RequestInfo.java   | 2 +-
 java/org/apache/coyote/Response.java  | 2 +-
 java/org/apache/coyote/http11/Http11Processor.java| 2 +-
 java/org/apache/coyote/http2/AbstractNonZeroStream.java   | 6 +++---
 java/org/apache/jasper/compiler/Parser.java   | 2 +-
 java/org/apache/jasper/compiler/ServletWriter.java| 8 
 java/org/apache/jasper/runtime/PageContextImpl.java   | 2 +-
 java/org/apache/jasper/tagplugins/jstl/core/ForEach.java  | 2 +-
 java/org/apache/naming/factory/webservices/ServiceRefFactory.java | 4 ++--
 java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java   | 2 +-
 java/org/apache/tomcat/util/buf/LocalStrings.properties   | 2 +-
 java/org/apache/tomcat/util/digester/package.html | 2 +-
 java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java  | 2 +-
 java/org/apache/tomcat/util/json/ParseException.java  | 2 +-
 java/org/apache/tomcat/util/net/NioEndpoint.java  | 2 +-
 java/org/apache/tomcat/util/net/jsse/JSSEKeyManager.java  | 4 ++--
 java/org/apache/tomcat/util/net/jsse/PEMFile.java | 2 +-
 java/org/apache/tomcat/util/threads/TaskQueue.java 

[tomcat] branch 10.0.x updated: Add release date for 10.0.26

[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 9eb2d683dd Add release date for 10.0.26
9eb2d683dd is described below

commit 9eb2d683dd9bd60e740fd1249eae303aca6da6d2
Author: Mark Thomas 
AuthorDate: Wed Sep 28 12:26:11 2022 +0100

Add release date for 10.0.26
---
 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 73af52e761..d563dcb0c4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -122,7 +122,7 @@
 
   
 
-
+
   
 
   


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

Re: Missing recent release versions in Bugzilla

[Mark Thomas]

On 28/09/2022 12:14, Konstantin Kolinko wrote:

Hi!

Some release managers forget the step to add the version number to Bugzilla.

E.g. 10.0.26, 10.1.0 are missing.

See the step in
https://cwiki.apache.org/confluence/display/TOMCAT/ReleaseProcess

A direct lhe link for this action is
https://bz.apache.org/bugzilla/editversions.cgi

I usually silently did this step,
but it is not my priority at the moment.


Ack.

I was aware that you took care of this so hadn't been checking. I'll add 
this to my list of things to check after a release.


Mark

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

Missing recent release versions in Bugzilla

[Konstantin Kolinko]

Hi!

Some release managers forget the step to add the version number to Bugzilla.

E.g. 10.0.26, 10.1.0 are missing.

See the step in
https://cwiki.apache.org/confluence/display/TOMCAT/ReleaseProcess

A direct lhe link for this action is
https://bz.apache.org/bugzilla/editversions.cgi

I usually silently did this step,
but it is not my priority at the moment.

Best regards,
Konstantin Kolinko

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

Re: HTTP2 with NIO2 broken?

[Mark Thomas]

On 28/09/2022 11:03, Rainer Jung wrote:

Am 28.09.2022 um 11:40 schrieb Rainer Jung:

Hi all,

I observe the following behavior:

NIO2 connector with HTTP2 and JSSE.
Client is (recent) curl or recent Firefox or Chrome.

If I call a JSP, that sleep for 8 seconds before responding, then the 
client gets after 5 seconds:


curl: (92) HTTP/2 stream 1 was not closed cleanly before end of the 
underlying stream


The JSP is:


Begin Sleeping ...
<%
Thread.sleep(8000);
%>
Done

Turning on debug logging I see:

28-Sep-2022 11:11:11.408 FINE [https-jsse-nio2-8444-exec-5] 
org.apache.coyote.http2.Http2AsyncParser$FrameCompletionHandler.failed 
Connection [0], Stream [0], Frame type [null], Error

 java.net.SocketTimeoutException
 at 
org.apache.tomcat.util.net.SocketWrapperBase$VectoredIOCompletionHandler.failed(SocketWrapperBase.java:1124) 

 at 
org.apache.tomcat.util.net.SocketWrapperBase$VectoredIOCompletionHandler.failed(SocketWrapperBase.java:1066) 

 at 
org.apache.tomcat.util.net.SecureNio2Channel$2.failed(SecureNio2Channel.java:1158) 

 at 
java.base/sun.nio.ch.Invoker.invokeUnchecked(Invoker.java:129)

 at java.base/sun.nio.ch.Invoker$2.run(Invoker.java:219)
 at 
java.base/sun.nio.ch.AsynchronousChannelGroupImpl$1.run(AsynchronousChannelGroupImpl.java:112) 

 at 
org.apache.tomcat.util.threads.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1191) 

 at 
org.apache.tomcat.util.threads.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:659) 

 at 
org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61) 


 at java.base/java.lang.Thread.run(Thread.java:829)


The request actually finished in Tomvcat, but when it tries to start 
back the response it gets another exception because of the closed stream



28-Sep-2022 11:11:14.809 FINE [https-jsse-nio2-8444-exec-4] 
org.apache.coyote.AbstractProcessor.setErrorState Error state 
[CLOSE_NOW] reported while processing request
 org.apache.coyote.CloseNowException: Connection [0], Stream 
[1], This stream is not writable
 at 
org.apache.coyote.http2.Stream.doStreamCancel(Stream.java:269)
 at 
org.apache.coyote.http2.Http2UpgradeHandler.reserveWindowSize(Http2UpgradeHandler.java:939) 


...


This only happens for NIO2, not NIO.

It happens for 10.1.0, 10.0.26, 9.0.67 but also for the older e.g. 
10.0.20 and 9.0.60.


Should I open an issue?


Also happens with 10.0.10 and 10.0.0, so an old bug.


I don't think we'll forget about this problem but please open a BZ issue 
so we can track / reference it easily.


Mark

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

Re: HTTP2 with NIO2 broken?

[Rainer Jung]

Am 28.09.2022 um 11:40 schrieb Rainer Jung:

Hi all,

I observe the following behavior:

NIO2 connector with HTTP2 and JSSE.
Client is (recent) curl or recent Firefox or Chrome.

If I call a JSP, that sleep for 8 seconds before responding, then the 
client gets after 5 seconds:


curl: (92) HTTP/2 stream 1 was not closed cleanly before end of the 
underlying stream


The JSP is:


Begin Sleeping ...
<%
Thread.sleep(8000);
%>
Done

Turning on debug logging I see:

28-Sep-2022 11:11:11.408 FINE [https-jsse-nio2-8444-exec-5] 
org.apache.coyote.http2.Http2AsyncParser$FrameCompletionHandler.failed 
Connection [0], Stream [0], Frame type [null], Error

     java.net.SocketTimeoutException
     at 
org.apache.tomcat.util.net.SocketWrapperBase$VectoredIOCompletionHandler.failed(SocketWrapperBase.java:1124)
     at 
org.apache.tomcat.util.net.SocketWrapperBase$VectoredIOCompletionHandler.failed(SocketWrapperBase.java:1066)
     at 
org.apache.tomcat.util.net.SecureNio2Channel$2.failed(SecureNio2Channel.java:1158)
     at 
java.base/sun.nio.ch.Invoker.invokeUnchecked(Invoker.java:129)

     at java.base/sun.nio.ch.Invoker$2.run(Invoker.java:219)
     at 
java.base/sun.nio.ch.AsynchronousChannelGroupImpl$1.run(AsynchronousChannelGroupImpl.java:112)
     at 
org.apache.tomcat.util.threads.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1191)
     at 
org.apache.tomcat.util.threads.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:659)
     at 
org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)

     at java.base/java.lang.Thread.run(Thread.java:829)


The request actually finished in Tomvcat, but when it tries to start 
back the response it gets another exception because of the closed stream



28-Sep-2022 11:11:14.809 FINE [https-jsse-nio2-8444-exec-4] 
org.apache.coyote.AbstractProcessor.setErrorState Error state 
[CLOSE_NOW] reported while processing request
     org.apache.coyote.CloseNowException: Connection [0], Stream 
[1], This stream is not writable
     at 
org.apache.coyote.http2.Stream.doStreamCancel(Stream.java:269)
     at 
org.apache.coyote.http2.Http2UpgradeHandler.reserveWindowSize(Http2UpgradeHandler.java:939)

...


This only happens for NIO2, not NIO.

It happens for 10.1.0, 10.0.26, 9.0.67 but also for the older e.g. 
10.0.20 and 9.0.60.


Should I open an issue?


Also happens with 10.0.10 and 10.0.0, so an old bug.

Connector config I use:

protocol="org.apache.coyote.http11.Http11Nio2Protocol"

   maxThreads="150" SSLEnabled="true">
className="org.apache.coyote.http2.Http2Protocol" />


certificateKeystoreFile="${catalina.base}/conf/keystore/keystore.jks"

 certificateKeystorePassword="mypass" />



and for comparison with the working NIO(1):

protocol="org.apache.coyote.http11.Http11NioProtocol"

   maxThreads="150" SSLEnabled="true">
className="org.apache.coyote.http2.Http2Protocol" />


certificateKeystoreFile="${catalina.base}/conf/keystore/keystore.jks"

 certificateKeystorePassword="mypass" />



Regards,

Rainer

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

HTTP2 with NIO2 broken?

[Rainer Jung]

Hi all,

I observe the following behavior:

NIO2 connector with HTTP2 and JSSE.
Client is (recent) curl or recent Firefox or Chrome.

If I call a JSP, that sleep for 8 seconds before responding, then the 
client gets after 5 seconds:


curl: (92) HTTP/2 stream 1 was not closed cleanly before end of the 
underlying stream


The JSP is:


Begin Sleeping ...
<%
Thread.sleep(8000);
%>
Done

Turning on debug logging I see:

28-Sep-2022 11:11:11.408 FINE [https-jsse-nio2-8444-exec-5] 
org.apache.coyote.http2.Http2AsyncParser$FrameCompletionHandler.failed 
Connection [0], Stream [0], Frame type [null], Error

java.net.SocketTimeoutException
at 
org.apache.tomcat.util.net.SocketWrapperBase$VectoredIOCompletionHandler.failed(SocketWrapperBase.java:1124)
at 
org.apache.tomcat.util.net.SocketWrapperBase$VectoredIOCompletionHandler.failed(SocketWrapperBase.java:1066)
at 
org.apache.tomcat.util.net.SecureNio2Channel$2.failed(SecureNio2Channel.java:1158)
at 
java.base/sun.nio.ch.Invoker.invokeUnchecked(Invoker.java:129)

at java.base/sun.nio.ch.Invoker$2.run(Invoker.java:219)
at 
java.base/sun.nio.ch.AsynchronousChannelGroupImpl$1.run(AsynchronousChannelGroupImpl.java:112)
at 
org.apache.tomcat.util.threads.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1191)
at 
org.apache.tomcat.util.threads.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:659)
at 
org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)

at java.base/java.lang.Thread.run(Thread.java:829)


The request actually finished in Tomvcat, but when it tries to start 
back the response it gets another exception because of the closed stream



28-Sep-2022 11:11:14.809 FINE [https-jsse-nio2-8444-exec-4] 
org.apache.coyote.AbstractProcessor.setErrorState Error state 
[CLOSE_NOW] reported while processing request
org.apache.coyote.CloseNowException: Connection [0], Stream 
[1], This stream is not writable
at 
org.apache.coyote.http2.Stream.doStreamCancel(Stream.java:269)
at 
org.apache.coyote.http2.Http2UpgradeHandler.reserveWindowSize(Http2UpgradeHandler.java:939)

...


This only happens for NIO2, not NIO.

It happens for 10.1.0, 10.0.26, 9.0.67 but also for the older e.g. 
10.0.20 and 9.0.60.


Should I open an issue?

Best regards,

Rainer

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

svn commit: r57047 - in /release/tomcat/tomcat-10/v10.0.26/bin: apache-tomcat-10.0.26.tar.gz.asc apache-tomcat-10.0.26.zip.asc

[markt]

Author: markt
Date: Wed Sep 28 09:30:09 2022
New Revision: 57047

Log:
Add missing signatures

Added:
release/tomcat/tomcat-10/v10.0.26/bin/apache-tomcat-10.0.26.tar.gz.asc
release/tomcat/tomcat-10/v10.0.26/bin/apache-tomcat-10.0.26.zip.asc

Added: release/tomcat/tomcat-10/v10.0.26/bin/apache-tomcat-10.0.26.tar.gz.asc
==
--- release/tomcat/tomcat-10/v10.0.26/bin/apache-tomcat-10.0.26.tar.gz.asc 
(added)
+++ release/tomcat/tomcat-10/v10.0.26/bin/apache-tomcat-10.0.26.tar.gz.asc Wed 
Sep 28 09:30:09 2022
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAmM0E+IACgkQEMAcWi9g
+WedP6g/8DYr/JdeymMh8/wPjEmhucghpzlJo9PkvzYB1MoOb4kLOjU+AEE97fMCI
+9nTTqrbhcSj4fNIHhlPdExQQZQsNDJyhiwAPjR5PhkzXEgwPO+Qba6qvyekAesBR
+sbqjxsdMDDHz7QQvIbboCDEJZkzlawqtfa9QE5t5YFcP2QMNNXvTRyF8h701tXyB
+THkeNKDGfAJvzJZq2UaFP+ITHslaOTMFgGPc8lesqxJ6VOjjeLcD3nFnYGDETur1
+rxX2Lj+y1plNXeTB58qNFL9VdeQsLyozAiLscyYmTCpEnNQdCdVA5wvT8RIITNUj
+D/VQBbLucTaRcy19/LrpvWA9jhKiwLYHUW11jwk/IyCxDdKh0hQGuanT0ir70sXG
+Muh/IQ5GI8yY1MNGeW0WFaad0CfIdBMfLYwV9turcIk0Otld6dg5eOLkuAx/mn1c
+LDrGSaokpfhBb2IbOUvD69dem/1vbFlE9r0VhlH6U2m6pzxAIs3H8+fFgcBeQA81
+Cjfm0Tr8DlQrS45eBM3QPHrIha5J34PZQxjmSnXZKw3+N0F5I1ezwLEzgskDLQ9q
+CfuaxUiece7cFkF4Rd+Tzi0Acst4cSqx8oWw4F0i0+XuSjl+fYoM/MQpx2ztbRNc
+34uHJ70MkhldczF7u49dzcnetC4S3eRRb+oLghZhurDVJc4T4TA=
+=fJ9Y
+-END PGP SIGNATURE-

Added: release/tomcat/tomcat-10/v10.0.26/bin/apache-tomcat-10.0.26.zip.asc
==
--- release/tomcat/tomcat-10/v10.0.26/bin/apache-tomcat-10.0.26.zip.asc (added)
+++ release/tomcat/tomcat-10/v10.0.26/bin/apache-tomcat-10.0.26.zip.asc Wed Sep 
28 09:30:09 2022
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAmM0E+MACgkQEMAcWi9g
+Wee4Ig//WFpyjktZq/LpfD/EvBBwKfalh2Wvs3WmE4rQfQmPSmkgmzqqRauLyNcM
++01Obj1+SIc0W7DWbB12o3CZnOErgdg6elq3QC4FLpXwHK4RuvQJ6wFYYmkQXTQa
+gWtE4bgs+4ZOEc0yhGyf3AZZdYRGc4JbeEYt+ay9sStHfkrSOk/Ko8jiWVdgM0E0
+FqwcouDkokiyz1/sYnxbry7DQsAfZDlK5DTbvtUO671yMJ4H1CbcSH9XFLo3Pagg
+djKTETX6gaYlilFZx/OjONfs27+/uV1kEQA46O5UZzXB+6VehD6afTq50cuj4BBT
+la4cLzfNCQr2P7dmdc+UlDWt3azFn1DFYr5IUT2AWALTFyu9aQYyWrw71CDwArIF
+qwvezlhy8iySM3+HRZbzMKfpEaWkih1xmfp2iEXIs3mN0sZGsVaUmsvz9USYjIWs
+GSADF4blTLCJt9jPbwA4uvxitv3FP8Ua0Ol78WJOgE8Bch+MLElfYO8Y6Itz11Pq
+vSTl1nTJ6c+OJNCJSKl+PjZ1jq5bU//JYLAc1em9sXy5bttOW+I5rst/6OgHVEhC
+A+TSnZzD/vcj5GLWWP1EdFkmyiOsSvJy7gIJqM5ReNgP3ha3avLdJW66f5xUt04C
+/p0XqZaZTaK/4zmVLHZodK/W2GaSS3VxpMkCzhS48mMHdPTV4PM=
+=bjfE
+-END PGP SIGNATURE-



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