Re: [VOTE] Release Apache Tomcat 9.0.73

2023-03-01 Thread Mark Thomas

On 28/02/2023 20:03, Rémy Maucherat wrote:

On Tue, Feb 28, 2023 at 6:35 PM Mark Thomas  wrote:


On 27/02/2023 15:52, Rémy Maucherat wrote:


The proposed 9.0.73 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 9.0.73


Build is reproducible.

Tests pass on Linux, Windows and MacOs (Intel and M1).


So it seems ok then, but you forgot to check the box to cast the vote.


Whoops. Sorry.

+1 Stable.

Mark

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



[tomcat] branch main updated: Revert "Have 'pre-release' indicate the the release is in progress."

2023-03-01 Thread schultz
This is an automated email from the ASF dual-hosted git repository.

schultz 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 18706c3684 Revert "Have 'pre-release' indicate the the release is in 
progress."
18706c3684 is described below

commit 18706c36845eadd8e0f344c3e45248ab9ab4a527
Author: Christopher Schultz 
AuthorDate: Wed Mar 1 09:11:09 2023 -0500

Revert "Have 'pre-release' indicate the the release is in progress."

This reverts commit 96be7da23139ea52feb1e6f9fb3b6c45c354b7cf.
---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 31daa9189c..123b6002ce 100644
--- a/build.xml
+++ b/build.xml
@@ -2741,7 +2741,7 @@ asf.ldap.username=${release.asfusername}
 
+value="rtext=""" />
   
 
   

[tomcat] branch 10.1.x updated: Revert "Have 'pre-release' indicate the the release is in progress."

2023-03-01 Thread schultz
This is an automated email from the ASF dual-hosted git repository.

schultz 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 72adf60d0e Revert "Have 'pre-release' indicate the the release is in 
progress."
72adf60d0e is described below

commit 72adf60d0efe0972a087923e8ce36f14eee53d57
Author: Christopher Schultz 
AuthorDate: Wed Mar 1 09:11:49 2023 -0500

Revert "Have 'pre-release' indicate the the release is in progress."

This reverts commit 3e08c2790c2eb42e1692841d333ad71f53377086.
---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 10c63b480f..27ba36423b 100644
--- a/build.xml
+++ b/build.xml
@@ -2759,7 +2759,7 @@ asf.ldap.username=${release.asfusername}
 
+value="rtext=""" />
   
 
   

[tomcat] branch 9.0.x updated: Revert "Have 'pre-release' indicate the the release is in progress."

2023-03-01 Thread schultz
This is an automated email from the ASF dual-hosted git repository.

schultz 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 58f05a9534 Revert "Have 'pre-release' indicate the the release is in 
progress."
58f05a9534 is described below

commit 58f05a953482bd83eb95bb6bbaa29581e0876bca
Author: Christopher Schultz 
AuthorDate: Wed Mar 1 09:12:21 2023 -0500

Revert "Have 'pre-release' indicate the the release is in progress."

This reverts commit 626b48842ab68b0e55cbeffa7fb57241ddb849b2.
---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 7300ae58ae..ef15f37441 100644
--- a/build.xml
+++ b/build.xml
@@ -2701,7 +2701,7 @@ asf.ldap.username=${release.asfusername}
 
+value="rtext=""" />
   
 
   

[tomcat] branch 8.5.x updated: Revert "Have 'pre-release' indicate the the release is in progress."

2023-03-01 Thread schultz
This is an automated email from the ASF dual-hosted git repository.

schultz 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 44c503d3ea Revert "Have 'pre-release' indicate the the release is in 
progress."
44c503d3ea is described below

commit 44c503d3ea246b628f130190638954b2ead58822
Author: Christopher Schultz 
AuthorDate: Wed Mar 1 09:12:38 2023 -0500

Revert "Have 'pre-release' indicate the the release is in progress."

This reverts commit 3774f307d145298a2a9b7b2e43dcdddb5d9dd033.
---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 3e116f1eb9..d407be0407 100644
--- a/build.xml
+++ b/build.xml
@@ -2403,7 +2403,7 @@ asf.ldap.username=${release.asfusername}
 
+value="rtext=""" />
   
 
   

[tomcat] branch main updated: Add support for PATCH

2023-03-01 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 6323898cba Add support for PATCH
6323898cba is described below

commit 6323898cba4223fd462eb388273d06fa451b9e2d
Author: Mark Thomas 
AuthorDate: Wed Mar 1 15:55:50 2023 +

Add support for PATCH
---
 java/jakarta/servlet/http/HttpServlet.java| 58 ++-
 java/jakarta/servlet/http/LocalStrings.properties |  1 +
 webapps/docs/changelog.xml|  9 
 3 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/java/jakarta/servlet/http/HttpServlet.java 
b/java/jakarta/servlet/http/HttpServlet.java
index aec57d5e56..5f8f90dd8b 100644
--- a/java/jakarta/servlet/http/HttpServlet.java
+++ b/java/jakarta/servlet/http/HttpServlet.java
@@ -74,6 +74,7 @@ public abstract class HttpServlet extends GenericServlet {
 private static final String METHOD_HEAD = "HEAD";
 private static final String METHOD_GET = "GET";
 private static final String METHOD_OPTIONS = "OPTIONS";
+private static final String METHOD_PATCH = "PATCH";
 private static final String METHOD_POST = "POST";
 private static final String METHOD_PUT = "PUT";
 private static final String METHOD_TRACE = "TRACE";
@@ -133,7 +134,7 @@ public abstract class HttpServlet extends GenericServlet {
  * Overriding this method to support a GET request also automatically 
supports an HTTP HEAD request. A HEAD request
  * is a GET request that returns no body in the response, only the request 
header fields.
  * 
- * When overriding this method, read the request data, write the response 
headers, get the response's noBodyWriter
+ * When overriding this method, read the request data, write the response 
headers, get the response's Writer
  * or output stream object, and finally, write the response data. It's 
best to include content type and encoding.
  * When using a PrintWriter object to return the response, 
set the content type before accessing the
  * PrintWriter object.
@@ -225,12 +226,52 @@ public abstract class HttpServlet extends GenericServlet {
 }
 
 
+/**
+ * Called by the server (via the service method) to allow a 
servlet to handle a PATCH request. The HTTP
+ * PATCH method allows the client to partially modify an existing resource.
+ * 
+ * When overriding this method, read the request data and write the 
response headers, get the response's Writer
+ * or output stream object, and finally, write the response data. It's 
best to include content type and encoding.
+ * When using a PrintWriter object to return the response, 
set the content type before accessing the
+ * PrintWriter object.
+ * 
+ * The servlet container must write the headers before committing the 
response, because in HTTP the headers must be
+ * sent before the response body.
+ * 
+ * Where possible, set the Content-Length header (with the {@link 
jakarta.servlet.ServletResponse#setContentLength}
+ * method), to allow the servlet container to use a persistent connection 
to return its response to the client,
+ * improving performance. The content length is automatically set if the 
entire response fits inside the response
+ * buffer.
+ * 
+ * When using HTTP 1.1 chunked encoding (which means that the response has 
a Transfer-Encoding header), do not set
+ * the Content-Length header.
+ * 
+ * This method does not need to be either safe or idempotent. Operations 
requested through POST can have side
+ * effects for which the user can be held accountable, for example, 
updating stored data or buying items online.
+ * 
+ * If the HTTP POST request is incorrectly formatted, doPost 
returns an HTTP "Bad Request" message.
+ *
+ * @param req  an {@link HttpServletRequest} object that contains the 
request the client has made of the servlet
+ * @param resp an {@link HttpServletResponse} object that contains the 
response the servlet sends to the client
+ *
+ * @exception IOException  if an input or output error is detected 
when the servlet handles the request
+ * @exception ServletException if the request for the POST could not be 
handled
+ *
+ * @see jakarta.servlet.ServletOutputStream
+ * @see jakarta.servlet.ServletResponse#setContentType
+ */
+protected void doPatch(HttpServletRequest req, HttpServletResponse resp) 
throws ServletException, IOException {
+String msg = lStrings.getString("http.method_patch_not_supported");
+sendMethodNotAllowed(req, resp, msg);
+}
+
+
 /**
  * Called by the server (via the service method) to allow a 
servlet to handle a POST request. The HTTP
  * POST method allows the client to send data of unlimited length to the 
Web server a 

[tomcat] branch main updated (6323898cba -> 9ffa34d1d5)

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

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


from 6323898cba Add support for PATCH
 new d5504c37a1 Remove unused translation
 new a5383d7d86 Additional translations for new PATH method
 new 9ffa34d1d5 s

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


Summary of changes:
 java/jakarta/servlet/http/LocalStrings_es.properties | 1 +
 java/jakarta/servlet/http/LocalStrings_fr.properties | 1 +
 java/jakarta/servlet/http/LocalStrings_ja.properties | 1 +
 java/jakarta/servlet/http/LocalStrings_ko.properties | 1 +
 java/jakarta/servlet/http/LocalStrings_zh_CN.properties  | 1 +
 java/org/apache/catalina/tribes/util/LocalStrings.properties | 2 --
 6 files changed, 5 insertions(+), 2 deletions(-)


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



[tomcat] 03/03: s

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

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

commit 9ffa34d1d59639e359feb94c79e3428be5ccfc1b
Author: Mark Thomas 
AuthorDate: Wed Mar 1 16:51:19 2023 +

s
---
 java/jakarta/servlet/http/LocalStrings_zh_CN.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/java/jakarta/servlet/http/LocalStrings_zh_CN.properties 
b/java/jakarta/servlet/http/LocalStrings_zh_CN.properties
index 04f0508282..413ab0109d 100644
--- a/java/jakarta/servlet/http/LocalStrings_zh_CN.properties
+++ b/java/jakarta/servlet/http/LocalStrings_zh_CN.properties
@@ -26,6 +26,7 @@ err.state.commit=响应一旦被提交后就没有准许
 http.method_delete_not_supported=当前URL不支持HTTP的DELETE方法
 http.method_get_not_supported=此URL不支持Http方法GET
 http.method_not_implemented=这个servlet没有为这个URI实现方法[{0}]
+http.method_patch_not_supported=此URL不支持Http方法PATCH
 http.method_post_not_supported=此URL不支持Http方法POST
 http.method_put_not_supported=此URL不支持HTTP方法PUT
 http.non_http=没有HTTP请求或响应


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



[tomcat] 02/03: Additional translations for new PATH method

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

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

commit a5383d7d862f6349ec482543219f03ea5e6c37da
Author: Mark Thomas 
AuthorDate: Wed Mar 1 16:50:46 2023 +

Additional translations for new PATH method
---
 java/jakarta/servlet/http/LocalStrings_es.properties | 1 +
 java/jakarta/servlet/http/LocalStrings_fr.properties | 1 +
 java/jakarta/servlet/http/LocalStrings_ja.properties | 1 +
 java/jakarta/servlet/http/LocalStrings_ko.properties | 1 +
 4 files changed, 4 insertions(+)

diff --git a/java/jakarta/servlet/http/LocalStrings_es.properties 
b/java/jakarta/servlet/http/LocalStrings_es.properties
index 0b7972e5fd..5caede9210 100644
--- a/java/jakarta/servlet/http/LocalStrings_es.properties
+++ b/java/jakarta/servlet/http/LocalStrings_es.properties
@@ -21,5 +21,6 @@ err.io.short_read=Lectura Corta
 http.method_delete_not_supported=El Metodo HTTP DELETE no es soportado por 
esta URL
 http.method_get_not_supported=El Metodo HTTP GET no está soportado por esta URL
 http.method_not_implemented=El Metodo [{0}] no esta implementado por este 
servlet para esta URI
+http.method_patch_not_supported=El Metodo HTTP PATCH no está soportado por 
esta URL
 http.method_post_not_supported=El Metodo HTTP POST no está soportado por esta 
URL
 http.method_put_not_supported=El Metodo HTTP PUT no está soportado por esta URL
diff --git a/java/jakarta/servlet/http/LocalStrings_fr.properties 
b/java/jakarta/servlet/http/LocalStrings_fr.properties
index bdf7898269..7b99280ab7 100644
--- a/java/jakarta/servlet/http/LocalStrings_fr.properties
+++ b/java/jakarta/servlet/http/LocalStrings_fr.properties
@@ -26,6 +26,7 @@ err.state.commit=Interdit une fois que la réponse a été 
commitée
 http.method_delete_not_supported=La méthode HTTP DELETE n'est pas supportée 
par cette URL
 http.method_get_not_supported=La méthode HTTP GET n'est pas supportée par 
cette URL
 http.method_not_implemented=Le méthode [{0}] n''est pas implémentée par ce 
Servlet pour cette URI
+http.method_patch_not_supported=La méthode HTTP PATCH n'est pas supportée par 
cette URL
 http.method_post_not_supported=La méthode HTTP POST n'est pas supportée par 
cette URL
 http.method_put_not_supported=La méthode HTTP PUT n'est pas supportée par 
cette URL
 http.non_http=Requête ou réponse non HTTP
diff --git a/java/jakarta/servlet/http/LocalStrings_ja.properties 
b/java/jakarta/servlet/http/LocalStrings_ja.properties
index 03e93f5d44..43ecd87412 100644
--- a/java/jakarta/servlet/http/LocalStrings_ja.properties
+++ b/java/jakarta/servlet/http/LocalStrings_ja.properties
@@ -26,6 +26,7 @@ err.state.commit=レスポンスがコミットされた後は許可されませ
 http.method_delete_not_supported=HTTPのDELETEメソッドは、このURLではサポートされていません。
 http.method_get_not_supported=HTTPのGETメソッドは、このURLではサポートされていません。
 http.method_not_implemented=メソッド [{0}] はRFC 2068には定義されておらず、サーブレットAPIではサポートされません
+http.method_patch_not_supported=HTTPのPATCHメソッドは、このURLではサポートされていません。
 http.method_post_not_supported=HTTPのPOSTメソッドは、このURLではサポートされていません。
 http.method_put_not_supported=HTTPのPUTメソッドは、このURLではサポートされていません。
 http.non_http=リクエストが HTTP リクエストではない、あるいはレスポンスが HTTP レスポンスではありません。
diff --git a/java/jakarta/servlet/http/LocalStrings_ko.properties 
b/java/jakarta/servlet/http/LocalStrings_ko.properties
index 30cdc431bf..01f9db8e8c 100644
--- a/java/jakarta/servlet/http/LocalStrings_ko.properties
+++ b/java/jakarta/servlet/http/LocalStrings_ko.properties
@@ -26,6 +26,7 @@ err.state.commit=응답이 한번 커밋된 이후에는 허용되지 않습니
 http.method_delete_not_supported=HTTP 메소드 DELETE는 이 URL에 의해 지원되지 않습니다.
 http.method_get_not_supported=HTTP 메소드 GET은 이 URL에 의해 지원되지 않습니다.
 http.method_not_implemented=이 URI를 위한 서블릿은 메소드 [{0}]을(를) 구현하지 않았습니다.
+http.method_patch_not_supported=HTTP 메소드인 PATCH는 이 URL에 의해 지원되지 않습니다.
 http.method_post_not_supported=HTTP 메소드인 POST는 이 URL에 의해 지원되지 않습니다.
 http.method_put_not_supported=HTTP 메소드 PUT은 이 URL에 의해 지원되지 않습니다.
 http.non_http=HTTP 요청이 아니거나, HTTP 응답이 아닙니다.


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



[tomcat] 01/03: Remove unused translation

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

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

commit d5504c37a1df1edc7f43f1625fb51fe74182259a
Author: Mark Thomas 
AuthorDate: Wed Mar 1 16:49:24 2023 +

Remove unused translation
---
 java/org/apache/catalina/tribes/util/LocalStrings.properties | 2 --
 1 file changed, 2 deletions(-)

diff --git a/java/org/apache/catalina/tribes/util/LocalStrings.properties 
b/java/org/apache/catalina/tribes/util/LocalStrings.properties
index bbfb77abc3..4238fab4ac 100644
--- a/java/org/apache/catalina/tribes/util/LocalStrings.properties
+++ b/java/org/apache/catalina/tribes/util/LocalStrings.properties
@@ -21,7 +21,5 @@ arrays.srcoffset.outOfBounds=srcoffset is out of bounds.
 executorFactory.not.running=Executor not running, can't force a command into 
the queues
 executorFactory.queue.full=Queue capacity is full.
 
-jre14Compat.javaPre14=Class not found so assuming code is running on a 
pre-Java 14 JVM
-
 uuidGenerator.createRandom=Creation of SecureRandom instance for UUID 
generation using [{0}] took [{1}] milliseconds.
 uuidGenerator.unable.fit=Unable to fit [{0}] bytes into the array. 
length:[{1}] required length:[{2}]


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



[tomcat] branch main updated: Improvements to French translations. (remm)

2023-03-01 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 35f94623cd Improvements to French translations. (remm)
35f94623cd is described below

commit 35f94623cd3eebb86549fc5a98ae7f1dd3effa41
Author: Mark Thomas 
AuthorDate: Wed Mar 1 16:53:47 2023 +

Improvements to French translations. (remm)
---
 java/org/apache/coyote/http2/LocalStrings_fr.properties| 4 
 java/org/apache/tomcat/util/net/LocalStrings_fr.properties | 1 +
 webapps/docs/changelog.xml | 7 +++
 3 files changed, 12 insertions(+)

diff --git a/java/org/apache/coyote/http2/LocalStrings_fr.properties 
b/java/org/apache/coyote/http2/LocalStrings_fr.properties
index 6cd75243f5..e510bbb3f8 100644
--- a/java/org/apache/coyote/http2/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_fr.properties
@@ -26,6 +26,7 @@ connectionSettings.debug=Connection [{0}], Paramètre type 
[{1}] mis à [{2}]
 connectionSettings.enablePushInvalid=Connection [{0}], La valeur demandée pour 
activer le push [{1}] n''est pas une de celles permises (zéro ou un)
 connectionSettings.headerTableSizeLimit=La Connection [{0}] a essayé de 
configurer une taille de [{1}] pour la table des en-têtes (headers), mais la 
limite est 16k
 connectionSettings.maxFrameSizeInvalid=Connection [{0}], la taille maximum de 
trame demandée  [{1}] est en-dehors des limites permises [{2}] - [{3}]
+connectionSettings.noRfc7540PrioritiesInvalid=Connection [{0}], Le paramètre 
"no RFC 7540 priorities" [{1}] n''était pas zéro ou un
 connectionSettings.unknown=Connection [{0}], Un paramètre inconnu avec 
l''identifiant [{1}] et la valeur [{2}] a été ignoré
 connectionSettings.windowSizeTooBig=Connection [{0}], La taille de fenêtre 
demandée [{1}] est plus grande que la valeur maximale autorisée [{2}]
 
@@ -72,6 +73,8 @@ http2Parser.processFrameData.window=Connection [{0}], le 
client a envoyé plus d
 http2Parser.processFrameHeaders.decodingDataLeft=Des données restent après le 
décodage de HPACK, elles auraient dû être consommées
 http2Parser.processFrameHeaders.decodingFailed=Une erreur de décodage HPACK 
des en-têtes HTTP s'est produite
 http2Parser.processFrameHeaders.payload=Connection [{0}], Flux [{1}], 
Traitement des en-têtes avec une taille de données de [{2}]
+http2Parser.processFramePriorityUpdate.debug=Connection [{0}], Stream [{1}], 
Urgency [{2}], Incremental [{3}]
+http2Parser.processFramePriorityUpdate.streamZero=Connection [{0}], La trame 
de mise à jour de priorité a été recue pour le flux zéro
 http2Parser.processFramePushPromise=Connexion [{0}], Flux (Stream) [{1}], les 
trames de promesse d''envoi ("Push promise frames") ne doivent pas être 
envoyées par le client.
 http2Parser.processFrameSettings.ackWithNonZeroPayload=La trame de paramètres 
a été reçue avec un indicateur ACK activé et des données présentes
 http2Parser.processFrameWindowUpdate.debug=Connection [{0}], Flux [{1}], 
Incrémentation de [{2}] de la taille de fenêtre
@@ -125,6 +128,7 @@ streamStateMachine.invalidFrame=Connection [{0}], Flux 
[{1}], Etat [{2}], Type d
 upgradeHandler.allocate.debug=Connection [{0}], Flux [{1}], [{2}] octets 
alloués
 upgradeHandler.allocate.left=Connection [{0}], Flux [{1}], [{2}] octets 
désalloués, essai d''allocation aux enfants
 upgradeHandler.connectionError=Erreur de la connection
+upgradeHandler.enableRfc7450Priorities=Connection [{0}], les priorités RFC 
7450 ne doivent pas être activées après avoir été désactivées dans la trame 
initiale des paramètres de connection (voir la RFC 9218)
 upgradeHandler.fallToDebug=\n\
 \ Note: les occurrences suivantes d'erreurs de stream HTTP/2 seront 
enregistrées au niveau DEBUG.
 upgradeHandler.goaway.debug=Connection [{0}], Goaway, Dernier flux [{1}], Code 
d''erreur [{2}], Données de débogage [{3}]
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties 
b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
index 979eb62ae9..19c69d271b 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
@@ -114,6 +114,7 @@ endpoint.setAttribute=Met [{0}] à [{1}]
 endpoint.setAttributeError=Impossible de définir l''attribut [{0}] en [{1}]
 endpoint.socketOptionsError=Erreur en définissant les options du socket
 endpoint.timeout.err=Erreur en traitant le dépassement de temps d'attente du 
socket
+endpoint.tls.info=Connecteur [{0}], hôte virtuel TLS [{1}], type de certificat 
[{2}] configuré depuis [{3}] avec l''alias [{4}] et la trust store [{5}]
 endpoint.unknownSslHostName=Le nom d''hôte SSL [{0}] n''est pas reconnu pour 
cette terminaison
 endpoint.warn.executorShutdown=L''exécuteur associé au pool de threads [{0}] 
n''est pas complètement arrêté, certains threads d''application peuvent 
toujo

[tomcat] branch main updated: Improvements to Japanese translations. Contributed by Shirayuking.

2023-03-01 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 ed0620745d Improvements to Japanese translations. Contributed by 
Shirayuking.
ed0620745d is described below

commit ed0620745db7bdf0d5651e2bcf756e7073164bf2
Author: Mark Thomas 
AuthorDate: Wed Mar 1 16:56:30 2023 +

Improvements to Japanese translations. Contributed by Shirayuking.
---
 .../servlet/http/LocalStrings_ja.properties|  2 +-
 .../catalina/core/LocalStrings_ja.properties   |  4 +-
 .../catalina/loader/LocalStrings_ja.properties |  2 +-
 .../catalina/startup/LocalStrings_ja.properties|  2 +-
 .../catalina/util/LocalStrings_ja.properties   |  2 +-
 .../catalina/valves/LocalStrings_ja.properties |  4 +-
 .../webresources/LocalStrings_ja.properties|  2 +-
 .../apache/coyote/http2/LocalStrings_ja.properties |  4 ++
 .../jasper/resources/LocalStrings_ja.properties| 59 --
 .../tomcat/util/net/LocalStrings_ja.properties |  1 +
 .../tomcat/websocket/LocalStrings_ja.properties|  4 +-
 webapps/docs/changelog.xml |  4 ++
 12 files changed, 51 insertions(+), 39 deletions(-)

diff --git a/java/jakarta/servlet/http/LocalStrings_ja.properties 
b/java/jakarta/servlet/http/LocalStrings_ja.properties
index 43ecd87412..9f89b614f6 100644
--- a/java/jakarta/servlet/http/LocalStrings_ja.properties
+++ b/java/jakarta/servlet/http/LocalStrings_ja.properties
@@ -25,7 +25,7 @@ err.state.commit=レスポンスがコミットされた後は許可されませ
 
 http.method_delete_not_supported=HTTPのDELETEメソッドは、このURLではサポートされていません。
 http.method_get_not_supported=HTTPのGETメソッドは、このURLではサポートされていません。
-http.method_not_implemented=メソッド [{0}] はRFC 2068には定義されておらず、サーブレットAPIではサポートされません
+http.method_not_implemented=メソッド [{0}] は RFC 2068 には定義されておらず、サーブレット API 
ではサポートされません
 http.method_patch_not_supported=HTTPのPATCHメソッドは、このURLではサポートされていません。
 http.method_post_not_supported=HTTPのPOSTメソッドは、このURLではサポートされていません。
 http.method_put_not_supported=HTTPのPUTメソッドは、このURLではサポートされていません。
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties 
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index 1a608cc02e..79e6c3f2d6 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -68,7 +68,7 @@ applicationServletRegistration.setServletSecurity.ise=コンテキストが既
 
 applicationSessionCookieConfig.ise=コンテキスト [{1}] が初期化済みなので、プロパティ [{0}] 
をSessionCookieConfigに追加することはできません。
 
-aprListener.FIPSProviderNotDefault=AprLifecycleListenerがFIPSモード [{0}] 
で構成されている場合は、FIPSプロバイダをデフォルトプロバイダとして構成する必要があります
+aprListener.FIPSProviderNotDefault=AprLifecycleListener が FIPS モード [{0}] 
で構成されている場合は、FIPS プロバイダを既定のプロバイダとして構成する必要があります
 aprListener.aprDestroy=APRベースのApache Tomcatネイティブライブラリのシャットダウンに失敗しました。
 aprListener.aprInit=商用環境に最適な性能を発揮する APR ベースの Tomcat ネイティブライブラリが 
java.library.path [{0}] に存在しません。
 aprListener.aprInitDebug=APRベースのApache Tomcatネイティブライブラリは、java.library.path 
[{1}] 上の名前 [{0}] を使用して見つかりませんでした。 報告されたエラーは [{2}]
@@ -89,7 +89,7 @@ aprListener.tcnVersion=インストールされた Apache Tomcat ネイティブ
 aprListener.tooLateForFIPSMode=FIPSModeを設定できません:SSLは既に初期化されています。
 aprListener.tooLateForSSLEngine=setSSLEngineできません: SSLはすでに初期化されています
 aprListener.tooLateForSSLRandomSeed=setSSLRandomSeedできません:SSLは既に初期化されています。
-aprListener.usingFIPSProvider=FIPSプロバイダをデフォルトプロバイダとしてOpenSSLを使用します
+aprListener.usingFIPSProvider=FIPS プロバイダを既定のプロバイダとして OpenSSL を使用します
 aprListener.wrongFIPSMode=AprLifecycleListener の設定 FIPSMode に予期せぬ値 [{0}] 
が指定されました。
 
 asyncContextImpl.asyncDispatchError=非同期ディスパッチの処理中にエラーが発生しました。
diff --git a/java/org/apache/catalina/loader/LocalStrings_ja.properties 
b/java/org/apache/catalina/loader/LocalStrings_ja.properties
index e64edd1fda..6df3c492a0 100644
--- a/java/org/apache/catalina/loader/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/loader/LocalStrings_ja.properties
@@ -66,4 +66,4 @@ webappLoader.starting=このローダを起動します
 webappLoader.stopError=webappクラスローダ停止中のエラー
 webappLoader.stopping=このローダを停止します
 webappLoader.unknownClassLoader=クラス [{1}] のクラスローダー [{0}] は未知のクラスローダーです。
-webappLoader.unknownProfile=不明なJakarta profile 
[{0}]が指定されました。代わりにデフォルトのプロファイルが使用されます
+webappLoader.unknownProfile=不明な Jakarta プロファイル 
[{0}]が指定されたため、代わりに既定のプロファイルが使用されます
diff --git a/java/org/apache/catalina/startup/LocalStrings_ja.properties 
b/java/org/apache/catalina/startup/LocalStrings_ja.properties
index c4a0be5e97..be85ee7b98 100644
--- a/java/org/apache/catalina/startup/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_ja.properties
@@ -127,7 +127,7 @@ hostConfig.deployDir.threaded.error=ディレクトリのマルチスレッド
 hostConfig.deployWar=Webアプリケーションアーカイブ [{0}] を配備します
 hostConfig.deployWar.error=Webアプリケーションアーカイブ [{0}] を配備中のエラー
 hostConfig.deployWar.finished=Web アプリケーションアーカイブ [{0}] の配備は [{1}] ミリ秒で完了

[tomcat] branch main updated: Improvements to Chinese translations. Contributed by totoo.

2023-03-01 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 3af15c1ba0 Improvements to Chinese translations. Contributed by totoo.
3af15c1ba0 is described below

commit 3af15c1ba042abf605214dcbbde997bfd5cb9cc6
Author: Mark Thomas 
AuthorDate: Wed Mar 1 16:57:36 2023 +

Improvements to Chinese translations. Contributed by totoo.
---
 java/org/apache/catalina/util/LocalStrings_zh_CN.properties | 4 ++--
 java/org/apache/coyote/http2/LocalStrings_zh_CN.properties  | 1 +
 webapps/docs/changelog.xml  | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/util/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/util/LocalStrings_zh_CN.properties
index cbafce441d..c8094cdbf4 100644
--- a/java/org/apache/catalina/util/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/util/LocalStrings_zh_CN.properties
@@ -20,8 +20,8 @@ customObjectInputStream.nomatch=因为类允许被反序列化,类[{0}]未能
 
 introspection.classLoadFailed=加载 class [{0}] 失败
 
-lifecycleBase.alreadyDestroyed=在调用destroy()之后,在组件[{0}]上调用了destroy()方法。第二个呼叫将被忽略。
-lifecycleBase.alreadyStarted=在调用start()之后,在组件[{0}]上调用start()方法。第二个电话将被忽略。
+lifecycleBase.alreadyDestroyed=在调用destroy()之后,在组件[{0}]上调用了destroy()方法。第二个调用将被忽略。
+lifecycleBase.alreadyStarted=在调用start()之后,在组件[{0}]上调用start()方法。第二个调用将被忽略。
 lifecycleBase.alreadyStopped=在调用stop()之后,对组件[{0}]调用了stop()方法。第二个调用将被忽略。
 lifecycleBase.destroyFail=未能销毁组件[{0}]
 lifecycleBase.destroyStopFail=在失败组件[{0}]上调用Stop()以触发清理,但也失败了
diff --git a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties 
b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
index 21561f1bd0..7d4864b743 100644
--- a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
@@ -125,6 +125,7 @@ streamStateMachine.invalidFrame=连接{0}、流{1}、状态{2}、帧类型{3}
 upgradeHandler.allocate.debug=连接[{0}],流[{1}],已分配[{2}]字节
 upgradeHandler.allocate.left=连接[{0}],流[{1}],[{2}]字节未分配 - 尝试分配给子项
 upgradeHandler.connectionError=连接错误
+upgradeHandler.fallToDebug=注意:往后出现 HTTP/2 流的错误将以 DEBUG 日志级别输出。
 upgradeHandler.goaway.debug=连接[{0}],离开,最后的流[{1}],错误码[{2}],调试数据[{3}]
 upgradeHandler.init=连接[{0}],状态[{1}]
 upgradeHandler.invalidPreface=连接[{0}],连接前言无效
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b695717fb0..75782a1948 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -123,6 +123,9 @@
 Improvements to Japanese translations. Contributed by Shirayuking.
 (markt)
   
+  
+Improvements to Chinese translations. Contributed by totoo. (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 formatting imported values that have multiple lines starting with \t

2023-03-01 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 e8621a0e7b Fix formatting imported values that have multiple lines 
starting with \t
e8621a0e7b is described below

commit e8621a0e7be63ec2f6dfec9665e0587975541a61
Author: Mark Thomas 
AuthorDate: Wed Mar 1 16:58:15 2023 +

Fix formatting imported values that have multiple lines starting with \t
---
 java/org/apache/tomcat/buildutil/translate/Utils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/buildutil/translate/Utils.java 
b/java/org/apache/tomcat/buildutil/translate/Utils.java
index c617c8d975..d7e73a7c56 100644
--- a/java/org/apache/tomcat/buildutil/translate/Utils.java
+++ b/java/org/apache/tomcat/buildutil/translate/Utils.java
@@ -34,7 +34,7 @@ import java.util.regex.Pattern;
 
 public class Utils {
 
-private static final Pattern ESCAPE_LEADING_SPACE = 
Pattern.compile("^(\\s)", Pattern.MULTILINE);
+private static final Pattern ESCAPE_LEADING_SPACE = Pattern.compile("^( 
)", Pattern.MULTILINE);
 
 private static final Set KEYS_WITH_UNNECESSARY_ESCAPING = new 
HashSet<>();
 


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



Re: [VOTE] Release Apache Tomcat 10.1.7

2023-03-01 Thread Christopher Schultz

All,

On 2/27/23 15:56, Christopher Schultz wrote:

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

The notable changes compared to 10.1.6 are:

  - Revert the switch to using the ServiceLoader mechanism to load the
    custom URL protocol handlers that Tomcat uses. The original system
    property based approach has been restored.

  - Restore inline state after async operation in NIO2, to account the
    fact that unexpected exceptions are sometimes thrown by the
    implementation. Patch submitted by zhougang.

  - Provide a more appropriate response (501 rather than 400) when
    rejecting an HTTP request using the CONNECT method.

  - Add support for txt: and rnd: rewrite map types from mod_rewrite.
    Based on a pull request provided by Dimitrios Soumis.

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

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


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

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

The tag is:
https://github.com/apache/tomcat/tree/10.1.7
473ef42c637c97eb17b38c5580a6b854dfe27a02

The proposed 10.1.7 release is:
[ ] Broken - do not release
[X] Stable - go ahead and release as 10.1.7


Builds and unit tests pass on MacOS.

-chris

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



[Bug 66502] New: tomcat-jdbc ConnectionPool.returnConnection() accept closed connections

2023-03-01 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=66502

Bug ID: 66502
   Summary: tomcat-jdbc ConnectionPool.returnConnection() accept
closed connections
   Product: Tomcat 10
   Version: 10.1.6
  Hardware: PC
OS: Mac OS X 10.1
Status: NEW
  Severity: normal
  Priority: P2
 Component: Util
  Assignee: dev@tomcat.apache.org
  Reporter: z...@godaddy.com
  Target Milestone: --

When a connection is checked out from pool, it could be forcefully closed by
the server. The connection is then returned to the connection pool, available
for more borrow/returns; the same broken connection causes plurals of failures
for the application, until `validationInterval` is reached when there's a
chance to evict the connection.

Proposal: PooledConnection.validate(VALIDATE_RETURN) checks underlying
`connection.isClosed()` unconditionally. This should be an inexpensive check.

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



Re: [VOTE] Release Apache Tomcat 10.1.7

2023-03-01 Thread Konstantin Kolinko
пн, 27 февр. 2023 г. в 23:57, Christopher Schultz
:
>
> The proposed Apache Tomcat 10.1.7 release is now available for
> voting.
>
> The notable changes compared to 10.1.6 are:
>
>   - Revert the switch to using the ServiceLoader mechanism to load the
> custom URL protocol handlers that Tomcat uses. The original system
> property based approach has been restored.
>
>   - Restore inline state after async operation in NIO2, to account the
> fact that unexpected exceptions are sometimes thrown by the
> implementation. Patch submitted by zhougang.
>
>   - Provide a more appropriate response (501 rather than 400) when
> rejecting an HTTP request using the CONNECT method.
>
>   - Add support for txt: and rnd: rewrite map types from mod_rewrite.
> Based on a pull request provided by Dimitrios Soumis.
>
> For full details, see the change log:
> https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/changelog.html
>
> Applications that run on Tomcat 9 and earlier will not run on Tomcat 10
> without changes. Java EE applications designed for Tomcat 9 and earlier
> may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat
> will automatically convert them to Jakarta EE and copy them to the
> webapps directory.
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.7/
>
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1426
>
> The tag is:
> https://github.com/apache/tomcat/tree/10.1.7
> 473ef42c637c97eb17b38c5580a6b854dfe27a02
>
> The proposed 10.1.7 release is:
> [ ] Broken - do not release
> [x] Stable - go ahead and release as 10.1.7

Smoke tests OK with Java 11.0.18.
Unit tests OK with Java 11.0.18, all connectors (NIO, NIO2)
on Windows 10.

Best regards,
Konstantin Kolinko

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



[Bug 66505] New: Calling [asyncPostProcess()] is not valid for a request with Async state [ERROR]

2023-03-01 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=66505

Bug ID: 66505
   Summary: Calling [asyncPostProcess()] is not valid for a
request with Async state [ERROR]
   Product: Tomcat 9
   Version: 9.0.59
  Hardware: Other
Status: NEW
  Severity: critical
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: marco...@hotmail.com
  Target Milestone: -

Found the Calling async error again under Tomcat 9.0.59 version, which other
post mentioned it has been fixed by 0.44 version(Bug 64496).

Anyone has idea? Seems it made Tomcat no response to HTTP client.

[http-nio-1080-exec-67] ERROR o.a.catalina.connector.CoyoteAdapter - Exception
while processing an asynchronous request
java.lang.IllegalStateException: Calling [asyncTimeout()] is not valid for a
request with Async state [ERROR]
at
org.apache.coyote.AsyncStateMachine.asyncTimeout(AsyncStateMachine.java:364)
at
org.apache.coyote.AbstractProcessor.action(AbstractProcessor.java:567)
at org.apache.coyote.Request.action(Request.java:517)
at
org.apache.catalina.core.AsyncContextImpl.timeout(AsyncContextImpl.java:122)
at
org.apache.catalina.connector.CoyoteAdapter.asyncDispatch(CoyoteAdapter.java:147)
at
org.apache.coyote.AbstractProcessor.dispatch(AbstractProcessor.java:241)
at
org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:59)
at
org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:889)
at
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1735)
at
org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49)
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:833)


[http-nio-1080-exec-67] ERROR o.a.coyote.http11.Http11NioProtocol - Error
reading request, ignored
java.lang.IllegalStateException: Calling [asyncPostProcess()] is not valid for
a request with Async state [ERROR]
at
org.apache.coyote.AsyncStateMachine.asyncPostProcess(AsyncStateMachine.java:301)
at
org.apache.coyote.AbstractProcessor.asyncPostProcess(AbstractProcessor.java:195)
at
org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:81)
at
org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:889)
at
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1735)
at
org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49)
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:833)

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