Tomcat 11 Release Date

2023-06-08 Thread William Crowell
Good afternoon,

I know we are in milestone 7 of Apache Tomcat 11, but do any of you know when 
the release date will be for Apache Tomcat 11?  It does not have to be an exact 
date, but just a ballpark date.

Regards,

William Crowell


This e-mail may contain information that is privileged or confidential. If you 
are not the intended recipient, please delete the e-mail and any attachments 
and notify us immediately.



[Bug 66627] Regression due to MessageBytes refactoring

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

--- Comment #5 from WJCarpenter  ---
Thanks for the quick turnaround, Mark!

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



Buildbot failure in on tomcat-9.0.x

2023-06-08 Thread buildbot
Build status: BUILD FAILED: failed compile (failure)
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/37/builds/587
Blamelist: Mark Thomas 
Build Text: failed compile (failure)
Status Detected: new failure
Build Source Stamp: [branch 9.0.x] c36be6c31babe31277e8f39fc13366850391ffdb


Steps:

  worker_preparation: 0

  git: 0

  shell: 0

  shell_1: 0

  shell_2: 0

  shell_3: 0

  shell_4: 0

  shell_5: 0

  compile: 1

  shell_6: 0

  shell_7: 0

  shell_8: 0

  shell_9: 0

  Rsync docs to nightlies.apache.org: 0

  shell_10: 0

  Rsync RAT to nightlies.apache.org: 0

  compile_1: 2

  shell_11: 0

  Rsync Logs to nightlies.apache.org: 0


-- ASF Buildbot


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



[Bug 66627] Regression due to MessageBytes refactoring

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #4 from Mark Thomas  ---
Fixed in:
- 11.0.x for 11.0.0-M8 onwards
- 10.1.x for 10.1.11 onwards
-  9.0.x for  9.0.77 onwards
-  8.5.x for  8.5.91 onwards

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



[tomcat] branch 8.5.x updated: Fix BZ 66627 - restore documented behaviour of MessageBytes.getType()

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 4aed0be935 Fix BZ 66627 - restore documented behaviour of 
MessageBytes.getType()
4aed0be935 is described below

commit 4aed0be935e475c25852aaa8f858605b5ec96ceb
Author: Mark Thomas 
AuthorDate: Thu Jun 8 13:58:09 2023 +0100

Fix BZ 66627 - restore documented behaviour of MessageBytes.getType()
---
 java/org/apache/tomcat/util/buf/MessageBytes.java |  4 
 webapps/docs/changelog.xml| 10 ++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/tomcat/util/buf/MessageBytes.java 
b/java/org/apache/tomcat/util/buf/MessageBytes.java
index 76ebee4c1b..df0a0dea1f 100644
--- a/java/org/apache/tomcat/util/buf/MessageBytes.java
+++ b/java/org/apache/tomcat/util/buf/MessageBytes.java
@@ -170,11 +170,9 @@ public final class MessageBytes implements Cloneable, 
Serializable {
 // No conversion required
 break;
 case T_BYTES:
-type = T_STR;
 strValue = byteC.toString();
 break;
 case T_CHARS:
-type = T_STR;
 strValue = charC.toString();
 break;
 }
@@ -272,7 +270,6 @@ public final class MessageBytes implements Cloneable, 
Serializable {
 }
 
 byteC.setBytes(bb.array(), bb.arrayOffset(), bb.limit());
-type = T_BYTES;
 }
 
 
@@ -316,7 +313,6 @@ public final class MessageBytes implements Cloneable, 
Serializable {
 toString();
 //$FALL-THROUGH$
 case T_STR: {
-type = T_CHARS;
 char cc[] = strValue.toCharArray();
 charC.setChars(cc, 0, cc.length);
 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0dbe05d39c..ce1d7a9719 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -114,6 +114,16 @@
   
 
   
+  
+
+  
+66627: Restore the documented behaviour of
+MessageBytes.getType() that it returns the type of the
+original content rather than reflecting the most recent conversion.
+(markt)
+  
+
+  
   
 
   


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



[tomcat] branch 9.0.x updated: Fix BZ 66627 - restore documented behaviour of MessageBytes.getType()

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new c36be6c31b Fix BZ 66627 - restore documented behaviour of 
MessageBytes.getType()
c36be6c31b is described below

commit c36be6c31babe31277e8f39fc13366850391ffdb
Author: Mark Thomas 
AuthorDate: Thu Jun 8 13:58:09 2023 +0100

Fix BZ 66627 - restore documented behaviour of MessageBytes.getType()
---
 java/org/apache/tomcat/util/buf/MessageBytes.java |  4 
 webapps/docs/changelog.xml| 10 ++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/tomcat/util/buf/MessageBytes.java 
b/java/org/apache/tomcat/util/buf/MessageBytes.java
index 083125da31..83289a8b45 100644
--- a/java/org/apache/tomcat/util/buf/MessageBytes.java
+++ b/java/org/apache/tomcat/util/buf/MessageBytes.java
@@ -170,11 +170,9 @@ public final class MessageBytes implements Cloneable, 
Serializable {
 // No conversion required
 break;
 case T_BYTES:
-type = T_STR;
 strValue = byteC.toString();
 break;
 case T_CHARS:
-type = T_STR;
 strValue = charC.toString();
 break;
 }
@@ -272,7 +270,6 @@ public final class MessageBytes implements Cloneable, 
Serializable {
 }
 
 byteC.setBytes(bb.array(), bb.arrayOffset(), bb.limit());
-type = T_BYTES;
 }
 
 
@@ -316,7 +313,6 @@ public final class MessageBytes implements Cloneable, 
Serializable {
 toString();
 //$FALL-THROUGH$
 case T_STR: {
-type = T_CHARS;
 char cc[] = strValue.toCharArray();
 charC.setChars(cc, 0, cc.length);
 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f72cf7ac37..0549964faa 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -114,6 +114,16 @@
   
 
   
+  
+
+  
+66627: Restore the documented behaviour of
+MessageBytes.getType() that it returns the type of the
+original content rather than reflecting the most recent conversion.
+(markt)
+  
+
+  
   
 
   


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



[tomcat] branch 10.1.x updated: Fix BZ 66627 - restore documented behaviour of MessageBytes.getType()

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

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new 22ee9573b7 Fix BZ 66627 - restore documented behaviour of 
MessageBytes.getType()
22ee9573b7 is described below

commit 22ee9573b7ace5a20892a42016fbb51c12eb65ff
Author: Mark Thomas 
AuthorDate: Thu Jun 8 13:58:09 2023 +0100

Fix BZ 66627 - restore documented behaviour of MessageBytes.getType()
---
 java/org/apache/tomcat/util/buf/MessageBytes.java |  4 
 webapps/docs/changelog.xml| 10 ++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/tomcat/util/buf/MessageBytes.java 
b/java/org/apache/tomcat/util/buf/MessageBytes.java
index 083125da31..83289a8b45 100644
--- a/java/org/apache/tomcat/util/buf/MessageBytes.java
+++ b/java/org/apache/tomcat/util/buf/MessageBytes.java
@@ -170,11 +170,9 @@ public final class MessageBytes implements Cloneable, 
Serializable {
 // No conversion required
 break;
 case T_BYTES:
-type = T_STR;
 strValue = byteC.toString();
 break;
 case T_CHARS:
-type = T_STR;
 strValue = charC.toString();
 break;
 }
@@ -272,7 +270,6 @@ public final class MessageBytes implements Cloneable, 
Serializable {
 }
 
 byteC.setBytes(bb.array(), bb.arrayOffset(), bb.limit());
-type = T_BYTES;
 }
 
 
@@ -316,7 +313,6 @@ public final class MessageBytes implements Cloneable, 
Serializable {
 toString();
 //$FALL-THROUGH$
 case T_STR: {
-type = T_CHARS;
 char cc[] = strValue.toCharArray();
 charC.setChars(cc, 0, cc.length);
 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d60a4115e5..d013c64e19 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -114,6 +114,16 @@
   
 
   
+  
+
+  
+66627: Restore the documented behaviour of
+MessageBytes.getType() that it returns the type of the
+original content rather than reflecting the most recent conversion.
+(markt)
+  
+
+  
   
 
   


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



[tomcat] branch main updated: Fix BZ 66627 - restore documented behaviour of MessageBytes.getType()

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

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


The following commit(s) were added to refs/heads/main by this push:
 new 897931b68c Fix BZ 66627 - restore documented behaviour of 
MessageBytes.getType()
897931b68c is described below

commit 897931b68c89788eeb71398c8e6dfda1d5bae161
Author: Mark Thomas 
AuthorDate: Thu Jun 8 13:58:09 2023 +0100

Fix BZ 66627 - restore documented behaviour of MessageBytes.getType()
---
 java/org/apache/tomcat/util/buf/MessageBytes.java |  4 
 webapps/docs/changelog.xml| 10 ++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/tomcat/util/buf/MessageBytes.java 
b/java/org/apache/tomcat/util/buf/MessageBytes.java
index 0aacbd83d6..e47d91fc95 100644
--- a/java/org/apache/tomcat/util/buf/MessageBytes.java
+++ b/java/org/apache/tomcat/util/buf/MessageBytes.java
@@ -169,11 +169,9 @@ public final class MessageBytes implements Cloneable, 
Serializable {
 // No conversion required
 break;
 case T_BYTES:
-type = T_STR;
 strValue = byteC.toString();
 break;
 case T_CHARS:
-type = T_STR;
 strValue = charC.toString();
 break;
 }
@@ -272,7 +270,6 @@ public final class MessageBytes implements Cloneable, 
Serializable {
 }
 
 byteC.setBytes(bb.array(), bb.arrayOffset(), bb.limit());
-type = T_BYTES;
 }
 
 
@@ -294,7 +291,6 @@ public final class MessageBytes implements Cloneable, 
Serializable {
 toString();
 //$FALL-THROUGH$
 case T_STR: {
-type = T_CHARS;
 char cc[] = strValue.toCharArray();
 charC.setChars(cc, 0, cc.length);
 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d588713061..ac699016b3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -114,6 +114,16 @@
   
 
   
+  
+
+  
+66627: Restore the documented behaviour of
+MessageBytes.getType() that it returns the type of the
+original content rather than reflecting the most recent conversion.
+(markt)
+  
+
+  
   
 
   


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



[tomcat] branch main updated: Review use of [...] in translated strings and add missing

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

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


The following commit(s) were added to refs/heads/main by this push:
 new 414be860a4 Review use of [...] in translated strings and add missing
414be860a4 is described below

commit 414be860a49a7b7ecfe5659a470b477e2d623bb1
Author: Mark Thomas 
AuthorDate: Thu Jun 8 12:17:17 2023 +0100

Review use of [...] in translated strings and add missing
---
 java/jakarta/el/LocalStrings_de.properties   |  2 +-
 java/jakarta/el/LocalStrings_pt_BR.properties|  2 +-
 .../apache/catalina/core/LocalStrings_es.properties  |  2 +-
 .../catalina/core/LocalStrings_zh_CN.properties  |  4 ++--
 .../apache/catalina/filters/LocalStrings.properties  |  2 +-
 .../catalina/filters/LocalStrings_zh_CN.properties   |  4 ++--
 .../catalina/manager/LocalStrings_zh_CN.properties   |  2 +-
 .../catalina/manager/host/LocalStrings_ru.properties |  2 +-
 .../catalina/mapper/LocalStrings_zh_CN.properties|  8 
 .../apache/catalina/realm/LocalStrings_fr.properties |  2 +-
 .../catalina/realm/LocalStrings_pt_BR.properties |  2 +-
 .../catalina/realm/LocalStrings_zh_CN.properties |  2 +-
 .../catalina/security/LocalStrings_fr.properties |  4 ++--
 .../catalina/servlets/LocalStrings_zh_CN.properties  |  2 +-
 .../catalina/session/LocalStrings_zh_CN.properties   |  4 ++--
 .../catalina/startup/LocalStrings_ja.properties  |  2 +-
 .../tribes/transport/LocalStrings_zh_CN.properties   |  2 +-
 .../catalina/util/LocalStrings_zh_CN.properties  |  4 ++--
 .../catalina/valves/LocalStrings_zh_CN.properties|  6 +++---
 .../webresources/LocalStrings_zh_CN.properties   |  2 +-
 .../coyote/http2/LocalStrings_zh_CN.properties   | 20 ++--
 java/org/apache/el/LocalStrings_zh_CN.properties |  2 +-
 .../jasper/resources/LocalStrings_zh_CN.properties   | 20 ++--
 .../descriptor/web/LocalStrings_zh_CN.properties |  4 ++--
 .../tomcat/util/digester/LocalStrings_de.properties  |  2 +-
 .../tomcat/util/digester/LocalStrings_ko.properties  |  2 +-
 .../tomcat/util/net/LocalStrings_zh_CN.properties|  2 +-
 .../tomcat/websocket/LocalStrings_zh_CN.properties   |  2 +-
 .../websocket/pojo/LocalStrings_zh_CN.properties |  2 +-
 29 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/java/jakarta/el/LocalStrings_de.properties 
b/java/jakarta/el/LocalStrings_de.properties
index 62668d0aa1..dfa2c0bafa 100644
--- a/java/jakarta/el/LocalStrings_de.properties
+++ b/java/jakarta/el/LocalStrings_de.properties
@@ -26,7 +26,7 @@ expressionFactory.cannotCreate=Die Ausdruckfactory vom Typ 
[{0}] konnte nicht er
 expressionFactory.cannotFind=Die Ausdruckfactory vom Typ [{0}] konnte nicht 
gefunden werden.
 expressionFactory.readFailed=Fehler beim Lesen von [{0}]
 
-importHandler.ambiguousImport=Die Klasse {0}] konnte nicht importiert werden, 
weil sie mit dem bereits durchgeführten Import von [{1}] in Konflikt steht.
+importHandler.ambiguousImport=Die Klasse [{0}] konnte nicht importiert werden, 
weil sie mit dem bereits durchgeführten Import von [{1}] in Konflikt steht.
 importHandler.ambiguousStaticImport=Der statische Import [{0}] konnte nicht 
verarbeitet werden, weil er mit dem bereits durchgeführten Import von [{1}] in 
Konflikt steht.
 importHandler.classNotFound=Die Klasse [{0}] konnte nicht importiert werden, 
weil sie nicht gefunden wurde.
 importHandler.invalidClass=Die Klasse [{0}] muss eine öffentliche, in einem 
exportierten Paket (für Java 9+), nicht abstrakte Klasse und darf keine 
Schnittstelle sein.
diff --git a/java/jakarta/el/LocalStrings_pt_BR.properties 
b/java/jakarta/el/LocalStrings_pt_BR.properties
index a9ccd089dd..5dd86ddea7 100644
--- a/java/jakarta/el/LocalStrings_pt_BR.properties
+++ b/java/jakarta/el/LocalStrings_pt_BR.properties
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-beanNameELResolver.beanReadOnly=O nome do bean {0}] é somente leitura
+beanNameELResolver.beanReadOnly=O nome do bean [{0}] é somente leitura
 
 elProcessor.defineFunctionInvalidClass=A classe [{0}] não é pública
 elProcessor.defineFunctionInvalidMethod=O método [{0}] na classe [{1}] não é 
um método estático público
diff --git a/java/org/apache/catalina/core/LocalStrings_es.properties 
b/java/org/apache/catalina/core/LocalStrings_es.properties
index 0a76519c96..dc863717dd 100644
--- a/java/org/apache/catalina/core/LocalStrings_es.properties
+++ b/java/org/apache/catalina/core/LocalStrings_es.properties
@@ -120,7 +120,7 @@ standardContext.notWrapper=El Hijo de un Contexto debe de 
ser un Arropador (Wrap
 standardContext.parameter.duplicate=Duplicado parámetro de inicialización de 
contexto [{0}]
 standardContext.parameter.required=Es necesario poner nombre de parámetro y 
valor de parámetro
 

[Bug 66633] Inconsistent Java requirement compared to whichversion.html

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

--- Comment #3 from Mark Thomas  ---
Well neither is Tomcat 11 ;)

We wanted to pick up virtual thread support and, given virtual threads just
moved out of preview and Jakarta EE 11 will have a minimum of Java 21, we
decided now was a good time to make the switch.

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



[Bug 66633] Inconsistent Java requirement compared to whichversion.html

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

--- Comment #2 from Michael Osipov  ---
(In reply to Mark Thomas from comment #1)
> The Tomcat website always shows information for the latest release, not the
> current HEAD of the development.
> 
> The minimum Java version was updated when 11.0.0-M7 was released which was
> the release where the minimum Java version was raised to 21.

Fair deal, just turned out to be a surprise especially because Java 21 isn't GA
yet.

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



[Bug 66634] Reference links contain incorrect version for Servlet API

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

--- Comment #3 from Michael Osipov  ---
(In reply to Mark Thomas from comment #2)
> All reviewed and fixed. The changes will be visible once the July releases
> are published.


Appreciated.

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



[Bug 66634] Reference links contain incorrect version for Servlet API

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #2 from Mark Thomas  ---
All reviewed and fixed. The changes will be visible once the July releases are
published.

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



[tomcat] branch 8.5.x updated: Correct Servlet spec version in Javadoc menu

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 58dd34d352 Correct Servlet spec version in Javadoc menu
58dd34d352 is described below

commit 58dd34d352aa4d77315413ce45a2ef94623e2667
Author: Mark Thomas 
AuthorDate: Thu Jun 8 10:22:25 2023 +0100

Correct Servlet spec version in Javadoc menu
---
 webapps/docs/project.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/project.xml b/webapps/docs/project.xml
index 76a71d8448..c1278137e5 100644
--- a/webapps/docs/project.xml
+++ b/webapps/docs/project.xml
@@ -82,7 +82,7 @@
 
 
 
-
+
 
 
 

[tomcat] branch 10.1.x updated: Correct Jakarta Annotations version in Javadoc menu

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

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new 6d87fad5b8 Correct Jakarta Annotations version in Javadoc menu
6d87fad5b8 is described below

commit 6d87fad5b83aa750c37724a9619d463a0ae2daad
Author: Mark Thomas 
AuthorDate: Thu Jun 8 10:16:08 2023 +0100

Correct Jakarta Annotations version in Javadoc menu
---
 webapps/docs/project.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/project.xml b/webapps/docs/project.xml
index 00aa8135ca..d50acf4d46 100644
--- a/webapps/docs/project.xml
+++ b/webapps/docs/project.xml
@@ -90,7 +90,7 @@
   href="websocketapi/index.html"/>
 
-
 https://tomcat.apache.org/connectors-doc/"/>


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



[tomcat] branch main updated: Update spec versions to those planned for Jakarta EE 11

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

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


The following commit(s) were added to refs/heads/main by this push:
 new 5d626f3b80 Update spec versions to those planned for Jakarta EE 11
5d626f3b80 is described below

commit 5d626f3b801c71a5d2a2bb72d2f165c2b156f266
Author: Mark Thomas 
AuthorDate: Thu Jun 8 10:14:50 2023 +0100

Update spec versions to those planned for Jakarta EE 11

Haven't started work on some of these yet but all are marked as
-SNAPSHOT so that should be OK.
---
 build.xml| 12 ++--
 webapps/docs/project.xml |  8 
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/build.xml b/build.xml
index b8f940bd86..099ee65b82 100644
--- a/build.xml
+++ b/build.xml
@@ -63,12 +63,12 @@
   
   
   
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
 
   
   
diff --git a/webapps/docs/project.xml b/webapps/docs/project.xml
index 4520165ce7..e3b60532c0 100644
--- a/webapps/docs/project.xml
+++ b/webapps/docs/project.xml
@@ -81,14 +81,14 @@
 
 
 
-
+
 
 
-
-
-
 https://tomcat.apache.org/connectors-doc/"/>


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



[Bug 66634] Reference links contain incorrect version for Servlet API

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

--- Comment #1 from Mark Thomas  ---
Looks like there is a wider issue. The versions in the Tomcat 11 docs aren't
right either.

I'll go through and check them all.

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



[Bug 66633] Inconsistent Java requirement compared to whichversion.html

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |INVALID

--- Comment #1 from Mark Thomas  ---
The Tomcat website always shows information for the latest release, not the
current HEAD of the development.

The minimum Java version was updated when 11.0.0-M7 was released which was the
release where the minimum Java version was raised to 21.

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



Re: [tomcat] branch 9.0.x updated: Fix BZ 66548 - Add validation of Sec-Websocket-Key header

2023-06-08 Thread Mark Thomas

On 08/06/2023 09:57, Rémy Maucherat wrote:

On Thu, Jun 8, 2023 at 6:07 AM Rainer Jung  wrote:


Am 08.06.23 um 05:50 schrieb Rainer Jung:

The new TestKeyHeader fails for me very frequently for TC 9 and TC 8.5,
but not for 10.1 or 11.

For TC 9 it fails roughly 30-50% of the times I run it. It fails for
jsse and for tcnative and for a wide range of JDKs and RHEL/SLES Linux
versions.

The failure happens only for NIO2, not for NIO. When it fails, the test
case takes about 60 seconds longer than when it is OK. The failing test
case is often testValid - the first test case that runs - and sometime
the second one testTooLong01.

It seems the pattern for TC 8.5 is the same but the tests are still
running.


You probably already fixed it for 10.1 and 11, but for 9.0 and 8.5 the
backport of 44e7282b54 seems to be missing.


I'm not running into the issue but I added the commit to the two branches.


Thanks.

Arguably, reading and ignoring the response was fixing the symptom not 
the cause. The root cause being that:

- Tomcat was stopped while processing an HTTP upgrade to WebSocket
- the upgrade did not complete
- the error was swallowed so the connection wasn't cleaned-up

https://github.com/apache/tomcat/commit/a2c34d6569f2b959413b06852d7a957ff9e9c39d

(back-ported to all versions) should have addressed the root cause.

Mark

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



[Bug 66634] Reference links contain incorrect version for Servlet API

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

Michael Osipov  changed:

   What|Removed |Added

 CC||micha...@apache.org

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



[Bug 66634] New: Reference links contain incorrect version for Servlet API

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

Bug ID: 66634
   Summary: Reference links contain incorrect version for Servlet
API
   Product: Tomcat 8
   Version: 8.5.x-trunk
  Hardware: All
OS: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Documentation
  Assignee: dev@tomcat.apache.org
  Reporter: micha...@apache.org
  Target Milestone: 

https://tomcat.apache.org/tomcat-8.5-doc/index.html says:
Servlet 4.0 Javadocs
but https://tomcat.apache.org/whichversion.html for 8.5.x says:
Apache Tomcat 8.0.x builds on Tomcat 7.0.x and implements the Servlet 3.1, JSP
2.3, EL 3.0 and WebSocket 1.1 specifications. In addition to that, it includes
the following significant improvements:

A single, common resources implementation to replace the multiple resource
extension features provided in earlier versions.

Apache Tomcat 8.5.x supports the same Servlet, JSP, EL, and WebSocket
Specification versions as Apache Tomcat 8.0.x. In addition to that, it also
implements the JASPIC 1.1 specification. 

So I guess the menu on the left-hand side is incorrect.

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



[Bug 66633] Inconsistent Java requirement compared to whichversion.html

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

Michael Osipov  changed:

   What|Removed |Added

 CC||micha...@apache.org

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



[Bug 66633] New: Inconsistent Java requirement compared to whichversion.html

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

Bug ID: 66633
   Summary: Inconsistent Java requirement compared to
whichversion.html
   Product: Tomcat 11
   Version: unspecified
  Hardware: All
OS: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Documentation
  Assignee: dev@tomcat.apache.org
  Reporter: micha...@apache.org
  Target Milestone: ---

whichversion.html says about Tomcat 11:
Supported Java Versions:17 and later, but yet:
osipovmi@deblndw011x:/var/osipovmi/Projekte/tomcat (apache-main *=)
$ git diff
diff --git a/build.xml b/build.xml
index b8f940bd86..3162aef501 100644
--- a/build.xml
+++ b/build.xml
@@ -105,9 +105,9 @@

   
   
-  
-  
-  
+  
+  
+  

   
   

gives me

[javac]   location: class Thread
[javac] Note: Some input files use or override a deprecated API.
[javac] Note: Recompile with -Xlint:deprecation for details.
[javac] 12 errors
[javac] 2 warnings

BUILD FAILED
/var/osipovmi/Projekte/tomcat/build.xml:992: Compile failed; see the compiler
error output for details.

I guess docs are outdated.

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



svn commit: r62344 - /release/tomcat/tomcat-11/v11.0.0-M6/

2023-06-08 Thread markt
Author: markt
Date: Thu Jun  8 09:00:56 2023
New Revision: 62344

Log:
Drop 11.0.0-M6 from CDN

Removed:
release/tomcat/tomcat-11/v11.0.0-M6/


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



svn commit: r1910303 - in /tomcat/site/trunk: docs/download-11.html docs/index.html docs/migration-11.0.html docs/oldnews.html docs/whichversion.html xdocs/download-11.xml xdocs/index.xml xdocs/migrat

2023-06-08 Thread markt
Author: markt
Date: Thu Jun  8 08:59:51 2023
New Revision: 1910303

URL: http://svn.apache.org/viewvc?rev=1910303=rev
Log:
Update site for release of Tomcat 11.0.0-M7

Modified:
tomcat/site/trunk/docs/download-11.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/migration-11.0.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/download-11.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/migration-11.0.xml
tomcat/site/trunk/xdocs/oldnews.xml
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/docs/download-11.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-11.html?rev=1910303=1910302=1910303=diff
==
--- tomcat/site/trunk/docs/download-11.html (original)
+++ tomcat/site/trunk/docs/download-11.html Thu Jun  8 08:59:51 2023
@@ -19,7 +19,7 @@
 
   Quick Navigation
 
-[define v]11.0.0-M6[end]
+[define v]11.0.0-M7[end]
 https://downloads.apache.org/tomcat/tomcat-11/KEYS;>KEYS |
 [v] (alpha) |
 Browse |

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1910303=1910302=1910303=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Thu Jun  8 08:59:51 2023
@@ -34,6 +34,37 @@ wiki page.
 Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat
 project logo are trademarks of the Apache Software Foundation.
 
+2023-06-08 Tomcat 11.0.0-M7 Released
+
+The Apache Tomcat Project is proud to announce the release of version 11.0.0-M7
+(alpha) of Apache Tomcat. This release is a milestone release and is targeted 
at
+Jakarta EE 11.
+Users of Tomcat 10 onwards should be aware that, as a result of the move 
from
+Java EE to Jakarta EE as part of the transfer of Java EE to the Eclipse
+Foundation, the primary package for all implemented APIs has changed from
+javax.* to jakarta.*. This will almost certainly
+require code changes to enable applications to migrate from Tomcat 9 and 
earlier
+to Tomcat 10 and later. A
+https://github.com/apache/tomcat-jakartaee-migration;>migration
+tool is available to aid this process.
+The notable changes in this release are:
+
+The minimum Java version has been increased to Java 21.
+Add support for virtual threads.
+Add RateLimitFilter which can be used to mitigate DoS and brute force
+attacks.
+Update Tomcat Native to 2.0.4 which includes binaries for Windows built 
with
+OpenSSL 3.0.9. 
+
+
+Full details of these changes, and all the other changes, are available in the
+Tomcat 11
+(alpha) changelog.
+
+
+
+https://tomcat.apache.org/download-11.cgi;>Download
+
 2023-06-02 Tomcat Native 2.0.4 Released
 
 The Apache Tomcat Project is proud to announce the release of version 2.0.4 of
@@ -143,37 +174,6 @@ changelog.
 
 https://tomcat.apache.org/download-90.cgi;>Download
 
-2023-05-09 Tomcat 11.0.0-M6 Released
-
-The Apache Tomcat Project is proud to announce the release of version 11.0.0-M6
-(alpha) of Apache Tomcat. This release is a milestone release and is targeted 
at
-Jakarta EE 11.
-Users of Tomcat 10 onwards should be aware that, as a result of the move 
from
-Java EE to Jakarta EE as part of the transfer of Java EE to the Eclipse
-Foundation, the primary package for all implemented APIs has changed from
-javax.* to jakarta.*. This will almost certainly
-require code changes to enable applications to migrate from Tomcat 9 and 
earlier
-to Tomcat 10 and later. A
-https://github.com/apache/tomcat-jakartaee-migration;>migration
-tool is available to aid this process.
-The notable changes in this release are:
-
-Various improvements to access logging.
-Remove support for the HTTP Connector settings rejectIllegalHeader and
-allowHostHeaderMismatch. These are now hard-coded to the previous
-defaults.
-Update the packaged version of the Tomcat Migration Tool for Jakarta
-EE to 1.0.7. 
-
-
-Full details of these changes, and all the other changes, are available in the
-Tomcat 11
-(alpha) changelog.
-
-
-
-https://tomcat.apache.org/download-11.cgi;>Download
-
 2023-05-02 Tomcat Migration Tool for Jakarta EE 1.0.7 
Released
 
 The Apache Tomcat Project is proud to announce the release of 1.0.7 of the

Modified: tomcat/site/trunk/docs/migration-11.0.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-11.0.html?rev=1910303=1910302=1910303=diff
==
--- tomcat/site/trunk/docs/migration-11.0.html (original)
+++ tomcat/site/trunk/docs/migration-11.0.html Thu Jun  8 08:59:51 2023
@@ -142,15 +142,17 @@ versions of Apache Tomcat.
 11.0.0-M1
 11.0.0-M3
 11.0.0-M4
-11.0.0-M5
-11.0.0-M6
+11.0.0-M5
+11.0.0-M6
+  

svn commit: r1910302 - in /tomcat/site/trunk: ./ docs/tomcat-11.0-doc/ docs/tomcat-11.0-doc/annotationapi/ docs/tomcat-11.0-doc/annotationapi/jakarta/annotation/ docs/tomcat-11.0-doc/annotationapi/jak

2023-06-08 Thread markt
Author: markt
Date: Thu Jun  8 08:57:39 2023
New Revision: 1910302

URL: http://svn.apache.org/viewvc?rev=1910302=rev
Log:
Update docs for 11.0.0-M7 release


[This commit notification would consist of 282 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

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



Re: [tomcat] branch 9.0.x updated: Fix BZ 66548 - Add validation of Sec-Websocket-Key header

2023-06-08 Thread Rémy Maucherat
On Thu, Jun 8, 2023 at 6:07 AM Rainer Jung  wrote:
>
> Am 08.06.23 um 05:50 schrieb Rainer Jung:
> > The new TestKeyHeader fails for me very frequently for TC 9 and TC 8.5,
> > but not for 10.1 or 11.
> >
> > For TC 9 it fails roughly 30-50% of the times I run it. It fails for
> > jsse and for tcnative and for a wide range of JDKs and RHEL/SLES Linux
> > versions.
> >
> > The failure happens only for NIO2, not for NIO. When it fails, the test
> > case takes about 60 seconds longer than when it is OK. The failing test
> > case is often testValid - the first test case that runs - and sometime
> > the second one testTooLong01.
> >
> > It seems the pattern for TC 8.5 is the same but the tests are still
> > running.
>
> You probably already fixed it for 10.1 and 11, but for 9.0 and 8.5 the
> backport of 44e7282b54 seems to be missing.

I'm not running into the issue but I added the commit to the two branches.

Rémy

-
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 (07647966c6 -> 8c4b1470a5)

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

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


from 07647966c6 Align with 9.0.x/10.1.x/11.0.x
 new 655dc06a3c Improve unreliable test (failures on Windows and Intel Mac)
 new 8c4b1470a5 tabs -> spaces

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


Summary of changes:
 test/org/apache/tomcat/websocket/server/TestKeyHeader.java  | 5 +
 test/org/apache/tomcat/websocket/server/TesterWsClient.java | 4 
 2 files changed, 9 insertions(+)


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



[tomcat] 01/02: Improve unreliable test (failures on Windows and Intel Mac)

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

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

commit 655dc06a3c88db113c5d1a3004264899b7e47c59
Author: Mark Thomas 
AuthorDate: Wed Apr 12 14:26:16 2023 +0100

Improve unreliable test (failures on Windows and Intel Mac)
---
 test/org/apache/tomcat/websocket/server/TestKeyHeader.java  | 5 +
 test/org/apache/tomcat/websocket/server/TesterWsClient.java | 4 
 2 files changed, 9 insertions(+)

diff --git a/test/org/apache/tomcat/websocket/server/TestKeyHeader.java 
b/test/org/apache/tomcat/websocket/server/TestKeyHeader.java
index fa05e44304..de1b72711c 100644
--- a/test/org/apache/tomcat/websocket/server/TestKeyHeader.java
+++ b/test/org/apache/tomcat/websocket/server/TestKeyHeader.java
@@ -81,6 +81,11 @@ public class TestKeyHeader extends WebSocketBaseTest {
 
 if (expectedStatusCode == HttpServletResponse.SC_SWITCHING_PROTOCOLS) {
 client.sendCloseFrame(CloseCodes.NORMAL_CLOSURE);
+// Read (and ignore) the response
+byte[] buf = new byte[256];
+while (client.read(buf) > 0) {
+   // Ignore
+}
 }
 client.closeSocket();
 }
diff --git a/test/org/apache/tomcat/websocket/server/TesterWsClient.java 
b/test/org/apache/tomcat/websocket/server/TesterWsClient.java
index 7a5c9c4ee0..c90aa23ed6 100644
--- a/test/org/apache/tomcat/websocket/server/TesterWsClient.java
+++ b/test/org/apache/tomcat/websocket/server/TesterWsClient.java
@@ -99,6 +99,10 @@ public class TesterWsClient {
 socket.close();
 }
 
+public int read(byte[] bytes) throws IOException {
+return socket.getInputStream().read(bytes);
+}
+
 public void write(byte[] bytes) throws IOException {
 socket.getOutputStream().write(bytes);
 socket.getOutputStream().flush();


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



[tomcat] 02/02: tabs -> spaces

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

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

commit 8c4b1470a57697f4942f99935a08958ae9f90d7a
Author: Mark Thomas 
AuthorDate: Wed Apr 12 16:26:02 2023 +0100

tabs -> spaces
---
 test/org/apache/tomcat/websocket/server/TestKeyHeader.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/org/apache/tomcat/websocket/server/TestKeyHeader.java 
b/test/org/apache/tomcat/websocket/server/TestKeyHeader.java
index de1b72711c..bb8ab53476 100644
--- a/test/org/apache/tomcat/websocket/server/TestKeyHeader.java
+++ b/test/org/apache/tomcat/websocket/server/TestKeyHeader.java
@@ -84,7 +84,7 @@ public class TestKeyHeader extends WebSocketBaseTest {
 // Read (and ignore) the response
 byte[] buf = new byte[256];
 while (client.read(buf) > 0) {
-   // Ignore
+// Ignore
 }
 }
 client.closeSocket();


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



[tomcat] 01/02: Improve unreliable test (failures on Windows and Intel Mac)

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

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

commit 34d456d45633d96af0bf8ec8a43e22fd35054d8f
Author: Mark Thomas 
AuthorDate: Wed Apr 12 14:26:16 2023 +0100

Improve unreliable test (failures on Windows and Intel Mac)
---
 test/org/apache/tomcat/websocket/server/TestKeyHeader.java  | 5 +
 test/org/apache/tomcat/websocket/server/TesterWsClient.java | 4 
 2 files changed, 9 insertions(+)

diff --git a/test/org/apache/tomcat/websocket/server/TestKeyHeader.java 
b/test/org/apache/tomcat/websocket/server/TestKeyHeader.java
index fa05e44304..de1b72711c 100644
--- a/test/org/apache/tomcat/websocket/server/TestKeyHeader.java
+++ b/test/org/apache/tomcat/websocket/server/TestKeyHeader.java
@@ -81,6 +81,11 @@ public class TestKeyHeader extends WebSocketBaseTest {
 
 if (expectedStatusCode == HttpServletResponse.SC_SWITCHING_PROTOCOLS) {
 client.sendCloseFrame(CloseCodes.NORMAL_CLOSURE);
+// Read (and ignore) the response
+byte[] buf = new byte[256];
+while (client.read(buf) > 0) {
+   // Ignore
+}
 }
 client.closeSocket();
 }
diff --git a/test/org/apache/tomcat/websocket/server/TesterWsClient.java 
b/test/org/apache/tomcat/websocket/server/TesterWsClient.java
index 7a5c9c4ee0..c90aa23ed6 100644
--- a/test/org/apache/tomcat/websocket/server/TesterWsClient.java
+++ b/test/org/apache/tomcat/websocket/server/TesterWsClient.java
@@ -99,6 +99,10 @@ public class TesterWsClient {
 socket.close();
 }
 
+public int read(byte[] bytes) throws IOException {
+return socket.getInputStream().read(bytes);
+}
+
 public void write(byte[] bytes) throws IOException {
 socket.getOutputStream().write(bytes);
 socket.getOutputStream().flush();


-
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 (475f43bd1f -> 80f42f2d7f)

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

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


from 475f43bd1f Code clean-up - formatting. No functional change.
 new 34d456d456 Improve unreliable test (failures on Windows and Intel Mac)
 new 80f42f2d7f tabs -> spaces

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


Summary of changes:
 test/org/apache/tomcat/websocket/server/TestKeyHeader.java  | 5 +
 test/org/apache/tomcat/websocket/server/TesterWsClient.java | 4 
 2 files changed, 9 insertions(+)


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



[tomcat] 02/02: tabs -> spaces

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

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

commit 80f42f2d7f945cccebef100c2c825704b5a69984
Author: Mark Thomas 
AuthorDate: Wed Apr 12 16:26:02 2023 +0100

tabs -> spaces
---
 test/org/apache/tomcat/websocket/server/TestKeyHeader.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/org/apache/tomcat/websocket/server/TestKeyHeader.java 
b/test/org/apache/tomcat/websocket/server/TestKeyHeader.java
index de1b72711c..bb8ab53476 100644
--- a/test/org/apache/tomcat/websocket/server/TestKeyHeader.java
+++ b/test/org/apache/tomcat/websocket/server/TestKeyHeader.java
@@ -84,7 +84,7 @@ public class TestKeyHeader extends WebSocketBaseTest {
 // Read (and ignore) the response
 byte[] buf = new byte[256];
 while (client.read(buf) > 0) {
-   // Ignore
+// Ignore
 }
 }
 client.closeSocket();


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



svn commit: r62343 - /release/tomcat/tomcat-11/v11.0.0-M5/

2023-06-08 Thread markt
Author: markt
Date: Thu Jun  8 08:49:11 2023
New Revision: 62343

Log:
Drop 11.0.0-M5 from CDN

Removed:
release/tomcat/tomcat-11/v11.0.0-M5/


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



Re: [VOTE] Release Apache Tomcat 9.0.76

2023-06-08 Thread Rémy Maucherat
On Mon, Jun 5, 2023 at 9:49 AM Rémy Maucherat  wrote:
>
> The proposed Apache Tomcat 9.0.76 release is now available for voting.
>
> The notable changes compared to 9.0.75 are:
>
> - Add support for virtual threads. (Java 21+ only)
>
> - Update HTTP/2 to use the RFC-9218 prioritization scheme.
>
> - Deprecate the xssProtectionEnabled from HttpHeaderSecurityFilter
>and set the default value to false.
>
> - Update Tomcat Native to 2.0.4 which includes binaries for Windows
>built with OpenSSL 3.0.9.
>
> Along with lots of other bug fixes and improvements.
>
> For full details, see the changelog:
> https://nightlies.apache.org/tomcat/tomcat-9.0.x/docs/changelog.html
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.76/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1440
> The tag is:
> https://github.com/apache/tomcat/tree/9.0.76
> ff0629ca2bd82d6bff5245c02b42d932149df34d
> b6eac326b5
>
> The proposed 9.0.76 release is:
> [ ] -1, Broken - do not release
> [X] +1, Stable - go ahead and release as 9.0.76

Note: I will wrap up the vote tomorrow morning.

Rémy

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



svn commit: r62342 - /dev/tomcat/tomcat-11/v11.0.0-M7/ /release/tomcat/tomcat-11/v11.0.0-M7/

2023-06-08 Thread markt
Author: markt
Date: Thu Jun  8 07:16:19 2023
New Revision: 62342

Log:
Release Apache Tomcat 11.0.0-M7

Added:
release/tomcat/tomcat-11/v11.0.0-M7/
  - copied from r62341, dev/tomcat/tomcat-11/v11.0.0-M7/
Removed:
dev/tomcat/tomcat-11/v11.0.0-M7/


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



[VOTE] [RESULT] Release Apache Tomcat 11.0.0-M7

2023-06-08 Thread Mark Thomas

The following votes were cast:

Binding:
+1: lihan, remm, markt, isapir, schultz

Non-binding:
+1: Dimitris Soumis

The vote therefore passes.

Thanks to everyone who contributed to this release.

Mark

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