svn commit: r47576 - /dev/tomcat/jakartaee-migration/v1.0.0/ /release/tomcat/jakartaee-migration/v1.0.0/

2021-05-07 Thread markt 
Author: markt
Date: Fri May  7 14:03:11 2021
New Revision: 47576

Log:
Release Apache Tomcat Migration Tool for Jakarta EE 1.0.0

Added:
release/tomcat/jakartaee-migration/v1.0.0/
  - copied from r47575, dev/tomcat/jakartaee-migration/v1.0.0/
Removed:
dev/tomcat/jakartaee-migration/v1.0.0/


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

Re: [VOTE][RESLUT] Apache Tomcat migration tool for Jakarta EE 1.0.0

2021-05-07 Thread Mark Thomas 

The following votes were cast:

Binding:
+1: remm, jfclere, markt, mgrigorov

Non-binding:
+1: rmannibucau

The vote therefore passes. Thanks to all who voted.

Mark


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

Re: [VOTE] Apache Tomcat migration tool for Jakarta EE 1.0.0

2021-05-07 Thread Martin Grigorov 
On Tue, May 4, 2021 at 3:06 PM Mark Thomas  wrote:

> The proposed Apache Tomcat migration tool for Jakarta EE 1.0.0 is now
> available for voting.
>
> The significant changes since 0.2.0 are:
>
> - Further fixes to exclude javax.xml packages that are not part of
>Java EE from the migration
>
> - The class transformer now validates that the target classes in the
>Jakarta namespace exist in the runtime environment
>
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/jakartaee-migration/v1.0.0/
>
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1308/
>
> The tag is:
> https://github.com/apache/tomcat-jakartaee-migration/tree/1.0.0
> 2a27b633f456710dc5d51680344ca7f047642a60
>
> The proposed 1.0.0 release is:
>
> [ ] -1: Broken. Do not release because...
> [ X ] +1: Acceptable. Go ahead and release.
>

Regards,
Martin


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

[tomcat] 02/02: Remove unnecessary code (EL can't be null here)

2021-05-07 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

commit 3b761016cff2e15b5d363c15f24c18c4ddf931a1
Author: Mark Thomas 
AuthorDate: Thu May 6 22:33:29 2021 +0100

Remove unnecessary code (EL can't be null here)
---
 java/org/apache/jasper/compiler/Generator.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/jasper/compiler/Generator.java 
b/java/org/apache/jasper/compiler/Generator.java
index 0c0c6dc..b941532 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -3091,9 +3091,9 @@ class Generator {
 sb.append("}))");
 attrValue = sb.toString();
 } else {
+// Must be EL
 // run attrValue through the expression interpreter
-String mapName = (attr.getEL() != null) ? attr.getEL()
-.getMapName() : null;
+String mapName = attr.getEL().getMapName();
 attrValue = elInterpreter.interpreterCall(ctxt,
 this.isTagFile, attrValue, c[0], mapName);
 }

-
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 (94944fe -> 3b76101)

2021-05-07 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


from 94944fe  Improvements to Chinese translations. Provided by bytesgo.
 new ac71964  Remove unnecessary code
 new 3b76101  Remove unnecessary code (EL can't be null here)

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:
 java/org/apache/jasper/compiler/Generator.java | 21 +
 1 file changed, 9 insertions(+), 12 deletions(-)

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

[tomcat] 01/02: Remove unnecessary code

2021-05-07 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

commit ac71964d4b53f6833f14c6411cbf9406901c21ca
Author: Mark Thomas 
AuthorDate: Thu May 6 17:37:19 2021 +0100

Remove unnecessary code

If an attribute value is null, it must be a named attribute.
---
 java/org/apache/jasper/compiler/Generator.java | 17 +++--
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/jasper/compiler/Generator.java 
b/java/org/apache/jasper/compiler/Generator.java
index aefe232..0c0c6dc 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -2963,17 +2963,14 @@ class Generator {
 
 String attrValue = attr.getValue();
 if (attrValue == null) {
-if (attr.isNamedAttribute()) {
-if (n.checkIfAttributeIsJspFragment(attr.getName())) {
-// XXX - no need to generate temporary variable here
-attrValue = generateNamedAttributeJspFragment(attr
-.getNamedAttributeNode(), tagHandlerVar);
-} else {
-attrValue = generateNamedAttributeValue(attr
-.getNamedAttributeNode());
-}
+// Must be a named attribute
+if (n.checkIfAttributeIsJspFragment(attr.getName())) {
+// XXX - no need to generate temporary variable here
+attrValue = generateNamedAttributeJspFragment(attr
+.getNamedAttributeNode(), tagHandlerVar);
 } else {
-return null;
+attrValue = generateNamedAttributeValue(attr
+.getNamedAttributeNode());
 }
 }
 

-
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 (9ba1ca6 -> 124c513)

2021-05-07 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


from 9ba1ca6  Improvements to Chinese translations. Provided by bytesgo.
 new a6eaeaa  Remove unnecessary code
 new 124c513  Remove unnecessary code (EL can't be null here)

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:
 java/org/apache/jasper/compiler/Generator.java | 21 +
 1 file changed, 9 insertions(+), 12 deletions(-)

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

[tomcat] 01/02: Remove unnecessary code

2021-05-07 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

commit a6eaeaa4d6742b6af4f988c5ed0edc1978efe217
Author: Mark Thomas 
AuthorDate: Thu May 6 17:37:19 2021 +0100

Remove unnecessary code

If an attribute value is null, it must be a named attribute.
---
 java/org/apache/jasper/compiler/Generator.java | 17 +++--
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/jasper/compiler/Generator.java 
b/java/org/apache/jasper/compiler/Generator.java
index 860aeb9..82238c9 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -2995,17 +2995,14 @@ class Generator {
 
 String attrValue = attr.getValue();
 if (attrValue == null) {
-if (attr.isNamedAttribute()) {
-if (n.checkIfAttributeIsJspFragment(attr.getName())) {
-// XXX - no need to generate temporary variable here
-attrValue = generateNamedAttributeJspFragment(attr
-.getNamedAttributeNode(), tagHandlerVar);
-} else {
-attrValue = generateNamedAttributeValue(attr
-.getNamedAttributeNode());
-}
+// Must be a named attribute
+if (n.checkIfAttributeIsJspFragment(attr.getName())) {
+// XXX - no need to generate temporary variable here
+attrValue = generateNamedAttributeJspFragment(attr
+.getNamedAttributeNode(), tagHandlerVar);
 } else {
-return null;
+attrValue = generateNamedAttributeValue(attr
+.getNamedAttributeNode());
 }
 }
 

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

[tomcat] 02/02: Remove unnecessary code (EL can't be null here)

2021-05-07 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

commit 124c51389eec9c6a496e15b23b2626af9dbee15b
Author: Mark Thomas 
AuthorDate: Thu May 6 22:33:29 2021 +0100

Remove unnecessary code (EL can't be null here)
---
 java/org/apache/jasper/compiler/Generator.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/jasper/compiler/Generator.java 
b/java/org/apache/jasper/compiler/Generator.java
index 82238c9..762bb68 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -3123,9 +3123,9 @@ class Generator {
 sb.append("}))");
 attrValue = sb.toString();
 } else {
+// Must be EL
 // run attrValue through the expression interpreter
-String mapName = (attr.getEL() != null) ? attr.getEL()
-.getMapName() : null;
+String mapName = attr.getEL().getMapName();
 attrValue = elInterpreter.interpreterCall(ctxt,
 this.isTagFile, attrValue, c[0], mapName);
 }

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

[tomcat] 02/02: Remove unnecessary code (EL can't be null here)

2021-05-07 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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

commit 2657bc2ecb51417474bc17a9dabb4ec67d156412
Author: Mark Thomas 
AuthorDate: Thu May 6 22:33:29 2021 +0100

Remove unnecessary code (EL can't be null here)
---
 java/org/apache/jasper/compiler/Generator.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/jasper/compiler/Generator.java 
b/java/org/apache/jasper/compiler/Generator.java
index 5100bae..66c64e4 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -3110,9 +3110,9 @@ class Generator {
 sb.append("}))");
 attrValue = sb.toString();
 } else {
+// Must be EL
 // run attrValue through the expression interpreter
-String mapName = (attr.getEL() != null) ? attr.getEL()
-.getMapName() : null;
+String mapName = attr.getEL().getMapName();
 attrValue = elInterpreter.interpreterCall(ctxt,
 this.isTagFile, attrValue, c[0], mapName);
 }

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

[tomcat] 01/02: Remove unnecessary code

2021-05-07 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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

commit a79ffed8bded9a68ee17a7c4fba98cb8d8b754b2
Author: Mark Thomas 
AuthorDate: Thu May 6 17:37:19 2021 +0100

Remove unnecessary code

If an attribute value is null, it must be a named attribute.
---
 java/org/apache/jasper/compiler/Generator.java | 17 +++--
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/jasper/compiler/Generator.java 
b/java/org/apache/jasper/compiler/Generator.java
index 474ac5c..5100bae 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -2982,17 +2982,14 @@ class Generator {
 
 String attrValue = attr.getValue();
 if (attrValue == null) {
-if (attr.isNamedAttribute()) {
-if (n.checkIfAttributeIsJspFragment(attr.getName())) {
-// XXX - no need to generate temporary variable here
-attrValue = generateNamedAttributeJspFragment(attr
-.getNamedAttributeNode(), tagHandlerVar);
-} else {
-attrValue = generateNamedAttributeValue(attr
-.getNamedAttributeNode());
-}
+// Must be a named attribute
+if (n.checkIfAttributeIsJspFragment(attr.getName())) {
+// XXX - no need to generate temporary variable here
+attrValue = generateNamedAttributeJspFragment(attr
+.getNamedAttributeNode(), tagHandlerVar);
 } else {
-return null;
+attrValue = generateNamedAttributeValue(attr
+.getNamedAttributeNode());
 }
 }
 

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

[tomcat] branch master updated (c87de4a -> 2657bc2)

2021-05-07 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


from c87de4a  Improvements to Korean translations. (woonsan)
 new a79ffed  Remove unnecessary code
 new 2657bc2  Remove unnecessary code (EL can't be null here)

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:
 java/org/apache/jasper/compiler/Generator.java | 21 +
 1 file changed, 9 insertions(+), 12 deletions(-)

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

[tomcat] 01/03: Improvements to French translations. (remm)

2021-05-07 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

commit d1b68c230e024a0840c319edf1b9f348f53e516f
Author: Mark Thomas 
AuthorDate: Fri May 7 10:29:23 2021 +0100

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

diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties 
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index 2a1e6ac..2de7308 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -87,7 +87,7 @@ aprListener.tcnInvalid=Une version incompatible [{0}] de la 
librairie Apache Tom
 aprListener.tcnValid=Chargement de la librairie Apache Tomcat Native [{0}] en 
utilisant APR version [{1}]
 aprListener.tcnVersion=Un version ancienne [{0}] de la bibliothèque Apache 
Tomcat Native basée sur APR est installée, alors que Tomcat recommande au 
minimum la version [{1}]
 aprListener.tooLateForFIPSMode=Ne peut pas passer en mode FIPS, SSL a déjà été 
initialisé
-aprListener.tooLateForSSLEngine=Impossible d'appeler setSSEEngine, SSL a déjà 
été initialisé
+aprListener.tooLateForSSLEngine=Impossible d'appeler setSSLEngine, SSL a déjà 
été initialisé
 aprListener.tooLateForSSLRandomSeed=setSSLRandomSeed impossible : SSL a déjà 
été initialisé
 aprListener.wrongFIPSMode=Valuer inattendue de l''option FIPSMode de 
AprLifecycleListener : [{0}]
 
diff --git a/java/org/apache/coyote/http2/LocalStrings_fr.properties 
b/java/org/apache/coyote/http2/LocalStrings_fr.properties
index 9da8acf..7365773 100644
--- a/java/org/apache/coyote/http2/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_fr.properties
@@ -138,6 +138,7 @@ upgradeHandler.releaseBacklog=Connection [{0}], Flux [{1}] 
enlevée de la file d
 upgradeHandler.rst.debug=Connexion [{0}], Flux [{1}], Erreur [{2}], Message 
[{3}], RST (fermeture du flux)
 upgradeHandler.sendPrefaceFail=Connexion [{0}], échec d''envoi de la préface 
au client
 upgradeHandler.socketCloseFailed=Echec de la fermeture du socket
+upgradeHandler.startRequestBodyFrame.result=Connection [{0}], Stream [{1}] 
startRequestBodyFrame a renvoyé [{2}]
 upgradeHandler.stream.closed=Le flux [{0}] a déjà été fermé auparavant
 upgradeHandler.stream.even=Un nouvel ID de flux distant (remote stream) [{0}] 
a été requis, mais tous les flux distants doivent utiliser ID impairs
 upgradeHandler.stream.notWritable=Connection [{0}], Flux [{1}], Impossible 
d''écrire sur ce flux
diff --git a/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties 
b/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties
index cd9449e..32eafa9 100644
--- a/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties
@@ -17,6 +17,7 @@ engine.ciphersFailure=Echec en essayant d'obtenir la liste 
des chiffres
 engine.emptyCipherSuite=La suite de chiffrement (cipher suite) est vide
 engine.engineClosed=Le moteur a déjà été fermé
 engine.failedCipherSuite=Impossible d''activer la suite de chiffres [{0}]
+engine.failedToReadAvailableBytes=Il y a des octets en clair disponibles à 
lire mais aucun octet n'a été lu
 engine.inboundClose=L'entrée a été fermée avant d'avoir reçu le close_notify 
du pair
 engine.invalidBufferArray=offset : [{0}], length : [{1}] (attendu : offset <= 
offset + length <= srcs.length [{2}])
 engine.invalidDestinationBuffersState=L'état des buffers de destination a 
changé de manière concurrente lors de l'unwrap des octets
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 08ff055..92b2ba7 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -209,6 +209,9 @@
 more precise configuration if needed. The system property source will
 still always be enabled. (remm)
   
+  
+Improvements to French translations. (remm)
+  
 
   
 

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

[tomcat] 02/03: Improvements to Korean translations. (woonsan)

2021-05-07 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

commit 68b7c7947c71b00eccb2ee090f744a6937447e14
Author: Mark Thomas 
AuthorDate: Fri May 7 10:29:53 2021 +0100

Improvements to Korean translations. (woonsan)
---
 java/org/apache/coyote/http2/LocalStrings_ko.properties| 1 +
 java/org/apache/jasper/resources/LocalStrings_ko.properties| 1 +
 java/org/apache/tomcat/util/net/openssl/LocalStrings_ko.properties | 1 +
 webapps/docs/changelog.xml | 3 +++
 4 files changed, 6 insertions(+)

diff --git a/java/org/apache/coyote/http2/LocalStrings_ko.properties 
b/java/org/apache/coyote/http2/LocalStrings_ko.properties
index 47d6ad2..faade43 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ko.properties
@@ -138,6 +138,7 @@ upgradeHandler.releaseBacklog=연결 [{0}], 스트림 [{1}]이(가) 백로그로
 upgradeHandler.rst.debug=연결 [{0}], 스트림 [{1}], 오류 [{2}], 메시지 [{3}],  RST (스트림을 
닫습니다)
 upgradeHandler.sendPrefaceFail=연결 [{0}]: 클라이언트에 preface를 전송하지 못했습니다.
 upgradeHandler.socketCloseFailed=소켓을 닫는 중 오류 발생
+upgradeHandler.startRequestBodyFrame.result=연결 [{0}], 스트림 [{1}]: 
startRequestBodyFrame()이 [{2}]을(를) 반환함.
 upgradeHandler.stream.closed=스트림 [{0}]이(가) 얼마 동안 이미 닫혀 있었습니다.
 upgradeHandler.stream.even=[{0}]의 새로운 원격 스트림 ID가 요청되었으나, 모든 원격 스트림은 반드시 홀수의 
ID를 사용해야 합니다.
 upgradeHandler.stream.notWritable=연결 [{0}], 스트림 [{1}], 이 스트림은 쓰기 가능하지 않습니다.
diff --git a/java/org/apache/jasper/resources/LocalStrings_ko.properties 
b/java/org/apache/jasper/resources/LocalStrings_ko.properties
index 387e933..18b0928 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ko.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ko.properties
@@ -284,6 +284,7 @@ jsp.warning.strictQuoteEscaping=경고: initParam인 
strictQuoteEscaping에 유
 jsp.warning.suppressSmap=경고: initParam인 suppressSmap에 유효하지 않은 값. 기본값인 "false"를 
사용할 것입니다.
 jsp.warning.tagPreDestroy=[{0}]의 태그 인스턴스에 대하여, preDestroy를 처리 중 오류 발생
 jsp.warning.tagRelease=[{0}]의 태그 인스턴스에 대해 release를 처리하는 중 오류 발생
+jsp.warning.trimspaces=경고: initParam인 trimSpaces에 유효하지 않은 값. 기본값 "false"를 사용할 
것입니다.
 jsp.warning.unknown.sourceVM=알 수 없는 Source VM [{0}]은(는) 무시됩니다.
 jsp.warning.unknown.targetVM=알 수 없는 target VM [{0}]은(는) 무시됩니다.
 jsp.warning.unsupported.sourceVM=요청된 소스 VM [{0}]은(는) 지원되지 않습니다. [{1}]을(를) 
사용합니다.
diff --git a/java/org/apache/tomcat/util/net/openssl/LocalStrings_ko.properties 
b/java/org/apache/tomcat/util/net/openssl/LocalStrings_ko.properties
index c19ed79..044990f 100644
--- a/java/org/apache/tomcat/util/net/openssl/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/util/net/openssl/LocalStrings_ko.properties
@@ -17,6 +17,7 @@ engine.ciphersFailure=Cipher들의 목록을 얻지 못했습니다.
 engine.emptyCipherSuite=CipherSuite 이름이 존재하지 않습니다.
 engine.engineClosed=엔진이 닫혀 있습니다.
 engine.failedCipherSuite=Cipher suite [{0}]을(를) 사용가능 상태로 설정하지 못했습니다.
+engine.failedToReadAvailableBytes=읽어야 할 plain 텍스트 바이트들이 남아 있음에도, 아무 것도 읽지 
못했습니다.
 engine.inboundClose=Peer의 close_notify를 받기 전에, Inbound가 닫혔습니다.
 engine.invalidBufferArray=offset: [{0}], 길이: [{1}] (요구사항: offset <= offset + 
length <= srcs.length [{2}])
 engine.invalidDestinationBuffersState=바이트 데이터를 unwrap하는 중, 대상 버퍼의 상태가 동시에 
변경되었습니다.
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 92b2ba7..2237208 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -212,6 +212,9 @@
   
 Improvements to French translations. (remm)
   
+  
+Improvements to Korean translations. (woonsan)
+  
 
   
 

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

[tomcat] 03/03: Improvements to Chinese translations. Provided by bytesgo.

2021-05-07 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

commit 94944fefdebc55e0c8f2e19e27ac9a4ceb753b26
Author: Mark Thomas 
AuthorDate: Fri May 7 10:30:23 2021 +0100

Improvements to Chinese translations. Provided by bytesgo.
---
 java/org/apache/catalina/filters/LocalStrings_zh_CN.properties | 1 +
 java/org/apache/catalina/util/LocalStrings_zh_CN.properties| 1 +
 java/org/apache/coyote/http2/LocalStrings_zh_CN.properties | 2 ++
 java/org/apache/jasper/resources/LocalStrings_zh_CN.properties | 1 +
 webapps/docs/changelog.xml | 3 +++
 5 files changed, 8 insertions(+)

diff --git a/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
index 81536ee..9982795 100644
--- a/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
@@ -58,6 +58,7 @@ remoteCidrFilter.noRemoteIp=客户端没有 IP 地址，请求被拒绝。
 remoteIpFilter.invalidHostHeader=HTTP头 [{1}]中，为Host找到一个无效值 [{0}]
 remoteIpFilter.invalidHostWithPort=HTTP头 [{1}]中的Host值 [{0}]包含一个被忽略的端口号
 remoteIpFilter.invalidNumber=参数[{0}]的数字非法：[{1}]
+remoteIpFilter.invalidRemoteAddress=无法确定远程主机，因为上报的远程地址[{0}]是无效的
 
 requestFilter.deny=基于属性:[{1}]，[{0}]的请求被拒绝。
 
diff --git a/java/org/apache/catalina/util/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/util/LocalStrings_zh_CN.properties
index 9812536..5a40c92 100644
--- a/java/org/apache/catalina/util/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/util/LocalStrings_zh_CN.properties
@@ -42,6 +42,7 @@ netmask.cidrNegative=CIDR [{0}]为负数。
 netmask.cidrNotNumeric=CIDR[{0}]不是数字
 netmask.cidrTooBig=CIDR[{0}]大于地址长度[{1}]
 netmask.invalidAddress=地址 [{0}] 无效
+netmask.invalidPort=正则[{0}]中的端口部分是无效的
 
 parameterMap.locked=不允许修改锁定的参数映射
 
diff --git a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties 
b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
index abfb476..03179ee 100644
--- a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
@@ -71,6 +71,8 @@ http2Parser.processFrameWindowUpdate.debug=连接[{0}]，流[{1}]，窗口大小
 http2Parser.processFrameWindowUpdate.invalidIncrement=接收到的窗口更新帧具有无效的增量大小[{0}]
 http2Parser.swallow.debug=连接：[{0}]，流：[{1}]，吞下[{2}]字节
 
+http2Protocol.jmxRegistration.fail=HTTP/2协议注册JMX失败
+
 pingManager.roundTripTime=连接[{0}]往返时间测量为[{1}]ns
 
 stream.clientCancel=客户端在响应完成前重置了数据流
diff --git a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties 
b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
index 401faa9..923d970 100644
--- a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
@@ -187,6 +187,7 @@ jsp.error.simpletag.badbodycontent=对于一下简单的标记符，用于类[{0
 jsp.error.single.line.number=JSP文件：[{1}] 的第 [{0}] 行发生了一个错误
 jsp.error.stream.close.failed=流.关闭失败
 jsp.error.stream.closed=流.关闭
+jsp.error.string_interpreter_class.instantiation=加载或者实例化StringInterpreter类 
[{0}]失败
 jsp.error.tag.conflict.attr=Tag指令：具有多个具有不同值的属性{0}的重复出现是非法的（旧的：[{1}，新的：[{2}]）
 
jsp.error.tag.conflict.deferredsyntaxallowedasliteral=Tag指令：具有多个具有不同值的“deferredSyntaxAllowedAsLiteral”（旧值：[{0}），新值：[{1}）的重复出现是非法的。
 
jsp.error.tag.conflict.iselignored=TAG指令：多次出现不同值的“isELIgnored”(旧：[{0}]，New：[{1}])
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2237208..b05c214 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -210,6 +210,9 @@
 still always be enabled. (remm)
   
   
+Improvements to Chinese translations. Provided by bytesgo. (mark)
+  
+  
 Improvements to French translations. (remm)
   
   

-
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 (38aff8f -> 94944fe)

2021-05-07 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


from 38aff8f  Complete fix for BZ 65262. Encoders and decoders now use 
InstanceManager
 new d1b68c2  Improvements to French translations. (remm)
 new 68b7c79  Improvements to Korean translations. (woonsan)
 new 94944fe  Improvements to Chinese translations. Provided by bytesgo.

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/org/apache/catalina/core/LocalStrings_fr.properties | 2 +-
 java/org/apache/catalina/filters/LocalStrings_zh_CN.properties   | 1 +
 java/org/apache/catalina/util/LocalStrings_zh_CN.properties  | 1 +
 java/org/apache/coyote/http2/LocalStrings_fr.properties  | 1 +
 java/org/apache/coyote/http2/LocalStrings_ko.properties  | 1 +
 java/org/apache/coyote/http2/LocalStrings_zh_CN.properties   | 2 ++
 java/org/apache/jasper/resources/LocalStrings_ko.properties  | 1 +
 java/org/apache/jasper/resources/LocalStrings_zh_CN.properties   | 1 +
 .../apache/tomcat/util/net/openssl/LocalStrings_fr.properties| 1 +
 .../apache/tomcat/util/net/openssl/LocalStrings_ko.properties| 1 +
 webapps/docs/changelog.xml   | 9 +
 11 files changed, 20 insertions(+), 1 deletion(-)

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

[tomcat] 01/03: Improvements to French translations. (remm)

2021-05-07 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

commit c8344fdc47fda53284ccbdc7b1d26c51227d9953
Author: Mark Thomas 
AuthorDate: Fri May 7 10:24:36 2021 +0100

Improvements to French translations. (remm)
---
 java/org/apache/catalina/core/LocalStrings_fr.properties   | 2 +-
 java/org/apache/coyote/http2/LocalStrings_fr.properties| 1 +
 java/org/apache/tomcat/util/net/LocalStrings_fr.properties | 2 ++
 java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties | 1 +
 webapps/docs/changelog.xml | 3 +++
 5 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties 
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index d96f918..8d341fe 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -87,7 +87,7 @@ aprListener.tcnInvalid=Une version incompatible [{0}] de la 
librairie Apache Tom
 aprListener.tcnValid=Chargement de la librairie Apache Tomcat Native [{0}] en 
utilisant APR version [{1}]
 aprListener.tcnVersion=Un version ancienne [{0}] de la bibliothèque Apache 
Tomcat Native basée sur APR est installée, alors que Tomcat recommande au 
minimum la version [{1}]
 aprListener.tooLateForFIPSMode=Ne peut pas passer en mode FIPS, SSL a déjà été 
initialisé
-aprListener.tooLateForSSLEngine=Impossible d'appeler setSSEEngine, SSL a déjà 
été initialisé
+aprListener.tooLateForSSLEngine=Impossible d'appeler setSSLEngine, SSL a déjà 
été initialisé
 aprListener.tooLateForSSLRandomSeed=setSSLRandomSeed impossible : SSL a déjà 
été initialisé
 aprListener.wrongFIPSMode=Valuer inattendue de l''option FIPSMode de 
AprLifecycleListener : [{0}]
 
diff --git a/java/org/apache/coyote/http2/LocalStrings_fr.properties 
b/java/org/apache/coyote/http2/LocalStrings_fr.properties
index fb89685..e2860af 100644
--- a/java/org/apache/coyote/http2/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_fr.properties
@@ -139,6 +139,7 @@ upgradeHandler.reset.receive=Connection [{0}], Stream 
[{1}], Reset a été reçu
 upgradeHandler.rst.debug=Connexion [{0}], Flux [{1}], Erreur [{2}], Message 
[{3}], RST (fermeture du flux)
 upgradeHandler.sendPrefaceFail=Connexion [{0}], échec d''envoi de la préface 
au client
 upgradeHandler.socketCloseFailed=Echec de la fermeture du socket
+upgradeHandler.startRequestBodyFrame.result=Connection [{0}], Stream [{1}] 
startRequestBodyFrame a renvoyé [{2}]
 upgradeHandler.stream.closed=Le flux [{0}] a déjà été fermé auparavant
 upgradeHandler.stream.even=Un nouvel ID de flux distant (remote stream) [{0}] 
a été requis, mais tous les flux distants doivent utiliser ID impairs
 upgradeHandler.stream.notWritable=Connection [{0}], Flux [{1}], Impossible 
d''écrire sur ce flux
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties 
b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
index 392a405..d6c8640 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
@@ -97,6 +97,8 @@ endpoint.nio.keyProcessingError=Erreur lors du traitement de 
la clé de sélecti
 endpoint.nio.latchMustBeZero=Le compte du latch doit être à zéro ou null
 endpoint.nio.nullLatch=Le latch ne peut être null
 endpoint.nio.nullSocketChannel=Le canal du socket est invalide car null lors 
du traitement de l'évênement du poller
+endpoint.nio.perms.readFail=Echec d''ajout des permissions en lecture pour le 
socket de domaine Unix [{0}]
+endpoint.nio.perms.writeFail=Echec d''ajout des permissions en écriture pour 
le socket de domaine Unix [{0}]
 endpoint.nio.pollerEventError=Erreur lors du traitement de l'évènement du 
poller
 endpoint.nio.registerFail=Echec d'enregistrement du socket avec le sélecteur 
du poller
 endpoint.nio.selectorCloseFail=Impossible de fermer le sélecteur lors de la 
fermeture du poller
diff --git a/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties 
b/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties
index cd9449e..32eafa9 100644
--- a/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties
@@ -17,6 +17,7 @@ engine.ciphersFailure=Echec en essayant d'obtenir la liste 
des chiffres
 engine.emptyCipherSuite=La suite de chiffrement (cipher suite) est vide
 engine.engineClosed=Le moteur a déjà été fermé
 engine.failedCipherSuite=Impossible d''activer la suite de chiffres [{0}]
+engine.failedToReadAvailableBytes=Il y a des octets en clair disponibles à 
lire mais aucun octet n'a été lu
 engine.inboundClose=L'entrée a été fermée avant d'avoir reçu le close_notify 
du pair
 engine.invalidBufferArray=offset : [{0}], length : [{1}] (attendu : offset

[tomcat] 03/03: Improvements to Chinese translations. Provided by bytesgo.

2021-05-07 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

commit 9ba1ca6606a52cadeff64e322bf96519319e981d
Author: Mark Thomas 
AuthorDate: Fri May 7 10:25:51 2021 +0100

Improvements to Chinese translations. Provided by bytesgo.
---
 java/org/apache/catalina/filters/LocalStrings_zh_CN.properties | 1 +
 java/org/apache/catalina/util/LocalStrings_zh_CN.properties| 1 +
 java/org/apache/coyote/http2/LocalStrings_zh_CN.properties | 2 ++
 java/org/apache/jasper/resources/LocalStrings_zh_CN.properties | 1 +
 webapps/docs/changelog.xml | 3 +++
 5 files changed, 8 insertions(+)

diff --git a/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
index 81536ee..9982795 100644
--- a/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
@@ -58,6 +58,7 @@ remoteCidrFilter.noRemoteIp=客户端没有 IP 地址，请求被拒绝。
 remoteIpFilter.invalidHostHeader=HTTP头 [{1}]中，为Host找到一个无效值 [{0}]
 remoteIpFilter.invalidHostWithPort=HTTP头 [{1}]中的Host值 [{0}]包含一个被忽略的端口号
 remoteIpFilter.invalidNumber=参数[{0}]的数字非法：[{1}]
+remoteIpFilter.invalidRemoteAddress=无法确定远程主机，因为上报的远程地址[{0}]是无效的
 
 requestFilter.deny=基于属性:[{1}]，[{0}]的请求被拒绝。
 
diff --git a/java/org/apache/catalina/util/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/util/LocalStrings_zh_CN.properties
index 9812536..5a40c92 100644
--- a/java/org/apache/catalina/util/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/util/LocalStrings_zh_CN.properties
@@ -42,6 +42,7 @@ netmask.cidrNegative=CIDR [{0}]为负数。
 netmask.cidrNotNumeric=CIDR[{0}]不是数字
 netmask.cidrTooBig=CIDR[{0}]大于地址长度[{1}]
 netmask.invalidAddress=地址 [{0}] 无效
+netmask.invalidPort=正则[{0}]中的端口部分是无效的
 
 parameterMap.locked=不允许修改锁定的参数映射
 
diff --git a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties 
b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
index 2ac0846..734685d 100644
--- a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
@@ -73,6 +73,8 @@ http2Parser.processFrameWindowUpdate.debug=连接[{0}]，流[{1}]，窗口大小
 http2Parser.processFrameWindowUpdate.invalidIncrement=接收到的窗口更新帧具有无效的增量大小[{0}]
 http2Parser.swallow.debug=连接：[{0}]，流：[{1}]，吞下[{2}]字节
 
+http2Protocol.jmxRegistration.fail=HTTP/2协议注册JMX失败
+
 pingManager.roundTripTime=连接[{0}]往返时间测量为[{1}]ns
 
 stream.clientCancel=客户端在响应完成前重置了数据流
diff --git a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties 
b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
index 220d64a..ad865ac 100644
--- a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
@@ -197,6 +197,7 @@ jsp.error.simpletag.badbodycontent=对于一下简单的标记符，用于类[{0
 jsp.error.single.line.number=JSP文件：[{1}] 的第 [{0}] 行发生了一个错误
 jsp.error.stream.close.failed=流.关闭失败
 jsp.error.stream.closed=流.关闭
+jsp.error.string_interpreter_class.instantiation=加载或者实例化StringInterpreter类 
[{0}]失败
 jsp.error.tag.conflict.attr=Tag指令：具有多个具有不同值的属性{0}的重复出现是非法的（旧的：[{1}，新的：[{2}]）
 
jsp.error.tag.conflict.deferredsyntaxallowedasliteral=Tag指令：具有多个具有不同值的“deferredSyntaxAllowedAsLiteral”（旧值：[{0}），新值：[{1}）的重复出现是非法的。
 
jsp.error.tag.conflict.iselignored=TAG指令：多次出现不同值的“isELIgnored”(旧：[{0}]，New：[{1}])
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index bd36982..6fc0f27 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -226,6 +226,9 @@
 still always be enabled. (remm)
   
   
+Improvements to Chinese translations. Provided by bytesgo. (mark)
+  
+  
 Improvements to French translations. (remm)
   
   

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

[tomcat] 02/03: Improvements to Korean translations. (woonsan)

2021-05-07 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

commit eef0aec8173ed7ef75c585b9e92e7c3d16a29b77
Author: Mark Thomas 
AuthorDate: Fri May 7 10:25:16 2021 +0100

Improvements to Korean translations. (woonsan)
---
 java/org/apache/coyote/http2/LocalStrings_ko.properties| 1 +
 java/org/apache/jasper/resources/LocalStrings_ko.properties| 1 +
 java/org/apache/tomcat/util/net/LocalStrings_ko.properties | 2 ++
 java/org/apache/tomcat/util/net/openssl/LocalStrings_ko.properties | 1 +
 webapps/docs/changelog.xml | 3 +++
 5 files changed, 8 insertions(+)

diff --git a/java/org/apache/coyote/http2/LocalStrings_ko.properties 
b/java/org/apache/coyote/http2/LocalStrings_ko.properties
index 2106e63..9012ef8 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ko.properties
@@ -139,6 +139,7 @@ upgradeHandler.reset.receive=연결 [{0}], 스트림 [{1}], [{2}](으)로 
인해
 upgradeHandler.rst.debug=연결 [{0}], 스트림 [{1}], 오류 [{2}], 메시지 [{3}],  RST (스트림을 
닫습니다)
 upgradeHandler.sendPrefaceFail=연결 [{0}]: 클라이언트에 preface를 전송하지 못했습니다.
 upgradeHandler.socketCloseFailed=소켓을 닫는 중 오류 발생
+upgradeHandler.startRequestBodyFrame.result=연결 [{0}], 스트림 [{1}]: 
startRequestBodyFrame()이 [{2}]을(를) 반환함.
 upgradeHandler.stream.closed=스트림 [{0}]이(가) 얼마 동안 이미 닫혀 있었습니다.
 upgradeHandler.stream.even=[{0}]의 새로운 원격 스트림 ID가 요청되었으나, 모든 원격 스트림은 반드시 홀수의 
ID를 사용해야 합니다.
 upgradeHandler.stream.notWritable=연결 [{0}], 스트림 [{1}], 이 스트림은 쓰기 가능하지 않습니다.
diff --git a/java/org/apache/jasper/resources/LocalStrings_ko.properties 
b/java/org/apache/jasper/resources/LocalStrings_ko.properties
index 744b8d5..f4d7aec 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ko.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ko.properties
@@ -298,6 +298,7 @@ jsp.warning.strictQuoteEscaping=경고: initParam인 
strictQuoteEscaping에 유
 jsp.warning.suppressSmap=경고: initParam인 suppressSmap에 유효하지 않은 값. 기본값인 "false"를 
사용할 것입니다.
 jsp.warning.tagPreDestroy=[{0}]의 태그 인스턴스에 대하여, preDestroy를 처리 중 오류 발생
 jsp.warning.tagRelease=[{0}]의 태그 인스턴스에 대해 release를 처리하는 중 오류 발생
+jsp.warning.trimspaces=경고: initParam인 trimSpaces에 유효하지 않은 값. 기본값 "false"를 사용할 
것입니다.
 jsp.warning.unknown.sourceVM=알 수 없는 Source VM [{0}]은(는) 무시됩니다.
 jsp.warning.unknown.targetVM=알 수 없는 target VM [{0}]은(는) 무시됩니다.
 jsp.warning.unsupported.sourceVM=요청된 소스 VM [{0}]은(는) 지원되지 않습니다. [{1}]을(를) 
사용합니다.
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_ko.properties 
b/java/org/apache/tomcat/util/net/LocalStrings_ko.properties
index 9e5afad..2ccad10 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_ko.properties
@@ -97,6 +97,8 @@ endpoint.nio.keyProcessingError=Selection 키를 처리 중 오류 발생
 endpoint.nio.latchMustBeZero=Latch는 반드시 널이거나 count가 0이어야 합니다.
 endpoint.nio.nullLatch=Latch가 널이어서는 안됩니다.
 endpoint.nio.nullSocketChannel=PollerEvent를 처리하는 중 유효하지 않은 널 소켓 채널이 발견되었습니다.
+endpoint.nio.perms.readFail=Unix 도메인 소켓 [{0}]에 읽기를 허용하는 데에 실패했습니다.
+endpoint.nio.perms.writeFail=Unix 도메인 소켓 [{0}]에 쓰기를 허용하는 데에 실패했습니다.
 endpoint.nio.pollerEventError=Poller 이벤트를 처리하는 중 오류 발생
 endpoint.nio.registerFail=Poller로부터의 selector와 함께, 소켓을 등록하지 못했습니다.
 endpoint.nio.selectorCloseFail=Poller를 닫을 때, selector를 닫지 못했습니다.
diff --git a/java/org/apache/tomcat/util/net/openssl/LocalStrings_ko.properties 
b/java/org/apache/tomcat/util/net/openssl/LocalStrings_ko.properties
index c19ed79..044990f 100644
--- a/java/org/apache/tomcat/util/net/openssl/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/util/net/openssl/LocalStrings_ko.properties
@@ -17,6 +17,7 @@ engine.ciphersFailure=Cipher들의 목록을 얻지 못했습니다.
 engine.emptyCipherSuite=CipherSuite 이름이 존재하지 않습니다.
 engine.engineClosed=엔진이 닫혀 있습니다.
 engine.failedCipherSuite=Cipher suite [{0}]을(를) 사용가능 상태로 설정하지 못했습니다.
+engine.failedToReadAvailableBytes=읽어야 할 plain 텍스트 바이트들이 남아 있음에도, 아무 것도 읽지 
못했습니다.
 engine.inboundClose=Peer의 close_notify를 받기 전에, Inbound가 닫혔습니다.
 engine.invalidBufferArray=offset: [{0}], 길이: [{1}] (요구사항: offset <= offset + 
length <= srcs.length [{2}])
 engine.invalidDestinationBuffersState=바이트 데이터를 unwrap하는 중, 대상 버퍼의 상태가 동시에 
변경되었습니다.
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c3ce65f..bd36982 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -228,6 +228,9 @@
   
 Improvements to French translations. (remm)
   
+  
+Improvements to Korean translations. (woonsan)
+  
 
   
 

-
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 (ea99dd0 -> 9ba1ca6)

2021-05-07 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


from ea99dd0  Complete fix for BZ 65262. Encoders and decoders now use 
InstanceManager
 new c8344fd  Improvements to French translations. (remm)
 new eef0aec  Improvements to Korean translations. (woonsan)
 new 9ba1ca6  Improvements to Chinese translations. Provided by bytesgo.

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/org/apache/catalina/core/LocalStrings_fr.properties | 2 +-
 java/org/apache/catalina/filters/LocalStrings_zh_CN.properties   | 1 +
 java/org/apache/catalina/util/LocalStrings_zh_CN.properties  | 1 +
 java/org/apache/coyote/http2/LocalStrings_fr.properties  | 1 +
 java/org/apache/coyote/http2/LocalStrings_ko.properties  | 1 +
 java/org/apache/coyote/http2/LocalStrings_zh_CN.properties   | 2 ++
 java/org/apache/jasper/resources/LocalStrings_ko.properties  | 1 +
 java/org/apache/jasper/resources/LocalStrings_zh_CN.properties   | 1 +
 java/org/apache/tomcat/util/net/LocalStrings_fr.properties   | 2 ++
 java/org/apache/tomcat/util/net/LocalStrings_ko.properties   | 2 ++
 .../apache/tomcat/util/net/openssl/LocalStrings_fr.properties| 1 +
 .../apache/tomcat/util/net/openssl/LocalStrings_ko.properties| 1 +
 webapps/docs/changelog.xml   | 9 +
 13 files changed, 24 insertions(+), 1 deletion(-)

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

[tomcat] 02/03: Improvements to French translations. (remm)

2021-05-07 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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

commit 0938b2df7d52036e3c6ca37d3c60bc448675e34d
Author: Mark Thomas 
AuthorDate: Fri May 7 10:13:18 2021 +0100

Improvements to French translations. (remm)
---
 java/org/apache/catalina/core/LocalStrings_fr.properties   | 2 +-
 java/org/apache/coyote/http2/LocalStrings_fr.properties| 1 +
 java/org/apache/tomcat/util/net/LocalStrings_fr.properties | 3 +++
 java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties | 1 +
 webapps/docs/changelog.xml | 3 +++
 5 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties 
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index 1612b0c..0e6a013 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -86,7 +86,7 @@ aprListener.tcnInvalid=Une version incompatible [{0}] de la 
librairie Apache Tom
 aprListener.tcnValid=Chargement de la librairie Apache Tomcat Native [{0}] en 
utilisant APR version [{1}]
 aprListener.tcnVersion=Un version ancienne [{0}] de la bibliothèque Apache 
Tomcat Native basée sur APR est installée, alors que Tomcat recommande au 
minimum la version [{1}]
 aprListener.tooLateForFIPSMode=Ne peut pas passer en mode FIPS, SSL a déjà été 
initialisé
-aprListener.tooLateForSSLEngine=Impossible d'appeler setSSEEngine, SSL a déjà 
été initialisé
+aprListener.tooLateForSSLEngine=Impossible d'appeler setSSLEngine, SSL a déjà 
été initialisé
 aprListener.tooLateForSSLRandomSeed=setSSLRandomSeed impossible : SSL a déjà 
été initialisé
 aprListener.wrongFIPSMode=Valuer inattendue de l''option FIPSMode de 
AprLifecycleListener : [{0}]
 
diff --git a/java/org/apache/coyote/http2/LocalStrings_fr.properties 
b/java/org/apache/coyote/http2/LocalStrings_fr.properties
index fb89685..e2860af 100644
--- a/java/org/apache/coyote/http2/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_fr.properties
@@ -139,6 +139,7 @@ upgradeHandler.reset.receive=Connection [{0}], Stream 
[{1}], Reset a été reçu
 upgradeHandler.rst.debug=Connexion [{0}], Flux [{1}], Erreur [{2}], Message 
[{3}], RST (fermeture du flux)
 upgradeHandler.sendPrefaceFail=Connexion [{0}], échec d''envoi de la préface 
au client
 upgradeHandler.socketCloseFailed=Echec de la fermeture du socket
+upgradeHandler.startRequestBodyFrame.result=Connection [{0}], Stream [{1}] 
startRequestBodyFrame a renvoyé [{2}]
 upgradeHandler.stream.closed=Le flux [{0}] a déjà été fermé auparavant
 upgradeHandler.stream.even=Un nouvel ID de flux distant (remote stream) [{0}] 
a été requis, mais tous les flux distants doivent utiliser ID impairs
 upgradeHandler.stream.notWritable=Connection [{0}], Flux [{1}], Impossible 
d''écrire sur ce flux
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties 
b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
index 392a405..626ccae 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
@@ -88,6 +88,7 @@ endpoint.init.bind=L''association du socket a échoué : [{0}] 
[{1}]
 endpoint.init.bind.inherited=Pas de canal hérité alors que le connecteur était 
configuré pour en utiliser un
 endpoint.init.listen=L''écoute sur le socket a échoué : [{0}] [{1}]
 endpoint.init.notavail=APR n'est pas disponible
+endpoint.init.unixnotavail=Le support des sockets de domaine Unix n'est pas 
disponible
 endpoint.invalidJmxNameSslHost=Impossible de générer un nom d''objet JMX 
valide pour le SSLHostConfig associé à l''hôte [{0}]
 endpoint.invalidJmxNameSslHostCert=Impossible de générer un nom d''objet JMX 
valide pour le SSLHostConfigCertificate associé à l''hôte [{0}] et au type de 
certificat [{1}]
 endpoint.jmxRegistrationFailed=Echec de l''enregistrement JMX de l''objet avec 
le nom [{0}]
@@ -97,6 +98,8 @@ endpoint.nio.keyProcessingError=Erreur lors du traitement de 
la clé de sélecti
 endpoint.nio.latchMustBeZero=Le compte du latch doit être à zéro ou null
 endpoint.nio.nullLatch=Le latch ne peut être null
 endpoint.nio.nullSocketChannel=Le canal du socket est invalide car null lors 
du traitement de l'évênement du poller
+endpoint.nio.perms.readFail=Echec d''ajout des permissions en lecture pour le 
socket de domaine Unix [{0}]
+endpoint.nio.perms.writeFail=Echec d''ajout des permissions en écriture pour 
le socket de domaine Unix [{0}]
 endpoint.nio.pollerEventError=Erreur lors du traitement de l'évènement du 
poller
 endpoint.nio.registerFail=Echec d'enregistrement du socket avec le sélecteur 
du poller
 endpoint.nio.selectorCloseFail=Impossible de fermer le sélecteur lors de la 
fermeture du poller
diff --git a/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties

[tomcat] 03/03: Improvements to Korean translations. (woonsan)

2021-05-07 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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

commit c87de4a80b602bcc112bd5165de7cf369b0ff217
Author: Mark Thomas 
AuthorDate: Fri May 7 10:17:36 2021 +0100

Improvements to Korean translations. (woonsan)
---
 java/org/apache/coyote/http2/LocalStrings_ko.properties| 1 +
 java/org/apache/jasper/resources/LocalStrings_ko.properties| 1 +
 java/org/apache/tomcat/util/net/LocalStrings_ko.properties | 3 +++
 java/org/apache/tomcat/util/net/openssl/LocalStrings_ko.properties | 1 +
 webapps/docs/changelog.xml | 3 +++
 5 files changed, 9 insertions(+)

diff --git a/java/org/apache/coyote/http2/LocalStrings_ko.properties 
b/java/org/apache/coyote/http2/LocalStrings_ko.properties
index 2106e63..9012ef8 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ko.properties
@@ -139,6 +139,7 @@ upgradeHandler.reset.receive=연결 [{0}], 스트림 [{1}], [{2}](으)로 
인해
 upgradeHandler.rst.debug=연결 [{0}], 스트림 [{1}], 오류 [{2}], 메시지 [{3}],  RST (스트림을 
닫습니다)
 upgradeHandler.sendPrefaceFail=연결 [{0}]: 클라이언트에 preface를 전송하지 못했습니다.
 upgradeHandler.socketCloseFailed=소켓을 닫는 중 오류 발생
+upgradeHandler.startRequestBodyFrame.result=연결 [{0}], 스트림 [{1}]: 
startRequestBodyFrame()이 [{2}]을(를) 반환함.
 upgradeHandler.stream.closed=스트림 [{0}]이(가) 얼마 동안 이미 닫혀 있었습니다.
 upgradeHandler.stream.even=[{0}]의 새로운 원격 스트림 ID가 요청되었으나, 모든 원격 스트림은 반드시 홀수의 
ID를 사용해야 합니다.
 upgradeHandler.stream.notWritable=연결 [{0}], 스트림 [{1}], 이 스트림은 쓰기 가능하지 않습니다.
diff --git a/java/org/apache/jasper/resources/LocalStrings_ko.properties 
b/java/org/apache/jasper/resources/LocalStrings_ko.properties
index fb3373b..2f1ddf8 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ko.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ko.properties
@@ -301,6 +301,7 @@ jsp.warning.strictWhitespace=주의: initParam인 
strictWhitespace에 유효하
 jsp.warning.suppressSmap=경고: initParam인 suppressSmap에 유효하지 않은 값. 기본값인 "false"를 
사용할 것입니다.
 jsp.warning.tagPreDestroy=[{0}]의 태그 인스턴스에 대하여, preDestroy를 처리 중 오류 발생
 jsp.warning.tagRelease=[{0}]의 태그 인스턴스에 대해 release를 처리하는 중 오류 발생
+jsp.warning.trimspaces=경고: initParam인 trimSpaces에 유효하지 않은 값. 기본값 "false"를 사용할 
것입니다.
 jsp.warning.unknown.sourceVM=알 수 없는 Source VM [{0}]은(는) 무시됩니다.
 jsp.warning.unknown.targetVM=알 수 없는 target VM [{0}]은(는) 무시됩니다.
 jsp.warning.unsupported.sourceVM=요청된 소스 VM [{0}]은(는) 지원되지 않습니다. [{1}]을(를) 
사용합니다.
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_ko.properties 
b/java/org/apache/tomcat/util/net/LocalStrings_ko.properties
index 9e5afad..f08c4e2 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_ko.properties
@@ -88,6 +88,7 @@ endpoint.init.bind=소켓 바인딩 실패: [{0}] [{1}]
 endpoint.init.bind.inherited=Connector가 상속된 채널을 사용하도록 설정되었는데, 상속된 채널이 없습니다.
 endpoint.init.listen=소켓 listen 실패: [{0}] [{1}]
 endpoint.init.notavail=APR이 가용하지 않음
+endpoint.init.unixnotavail=Unix 도메인 소켓이 지원되지 않습니다.
 endpoint.invalidJmxNameSslHost=호스트 [{0}]와(과) 연관된 SSLHostConfig를 위한, 유효한 JMX 객체 
이름을 생성할 수 없습니다.
 endpoint.invalidJmxNameSslHostCert=호스트가 [{0}]이고 인증서 타입이 [{1}]인 
SSLHostConfigCertificate을 위한, 유효한 JMX 객체 이름을 생성할 수 없습니다.
 endpoint.jmxRegistrationFailed=JMX 객체를 [{0}](이)라는 이름으로 등록시키지 못했습니다.
@@ -97,6 +98,8 @@ endpoint.nio.keyProcessingError=Selection 키를 처리 중 오류 발생
 endpoint.nio.latchMustBeZero=Latch는 반드시 널이거나 count가 0이어야 합니다.
 endpoint.nio.nullLatch=Latch가 널이어서는 안됩니다.
 endpoint.nio.nullSocketChannel=PollerEvent를 처리하는 중 유효하지 않은 널 소켓 채널이 발견되었습니다.
+endpoint.nio.perms.readFail=Unix 도메인 소켓 [{0}]에 읽기를 허용하는 데에 실패했습니다.
+endpoint.nio.perms.writeFail=Unix 도메인 소켓 [{0}]에 쓰기를 허용하는 데에 실패했습니다.
 endpoint.nio.pollerEventError=Poller 이벤트를 처리하는 중 오류 발생
 endpoint.nio.registerFail=Poller로부터의 selector와 함께, 소켓을 등록하지 못했습니다.
 endpoint.nio.selectorCloseFail=Poller를 닫을 때, selector를 닫지 못했습니다.
diff --git a/java/org/apache/tomcat/util/net/openssl/LocalStrings_ko.properties 
b/java/org/apache/tomcat/util/net/openssl/LocalStrings_ko.properties
index c19ed79..044990f 100644
--- a/java/org/apache/tomcat/util/net/openssl/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/util/net/openssl/LocalStrings_ko.properties
@@ -17,6 +17,7 @@ engine.ciphersFailure=Cipher들의 목록을 얻지 못했습니다.
 engine.emptyCipherSuite=CipherSuite 이름이 존재하지 않습니다.
 engine.engineClosed=엔진이 닫혀 있습니다.
 engine.failedCipherSuite=Cipher suite [{0}]을(를) 사용가능 상태로 설정하지 못했습니다.
+engine.failedToReadAvailableBytes=읽어야 할 plain 텍스트 바이트들이 남아 있음에도, 아무 것도 읽지 
못했습니다.
 engine.inboundClose=Peer의 close_notify를 받기 전에, Inbound가 닫혔습니다.
 engine.invalidBufferArray=offset: [{0}], 길이: [{1}] (요구사항: offset <= offset + 
length <= srcs.length [{2}])
 engine.invalidDestinationBuffersState=바이트 데이터를 unwrap하는 중, 대상 버퍼의 상태가 동시에 
변경되었습니다.
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ec775fa..0e7e797 100644
---

[tomcat] 01/03: Improvements to Chinese translations. Provided by bytesgo

2021-05-07 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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

commit de89c23c65a66a381c3cd1a236effb0645ca2471
Author: Mark Thomas 
AuthorDate: Fri May 7 10:02:45 2021 +0100

Improvements to Chinese translations. Provided by bytesgo
---
 java/org/apache/catalina/filters/LocalStrings_zh_CN.properties | 1 +
 java/org/apache/catalina/startup/LocalStrings_zh_CN.properties | 1 +
 java/org/apache/catalina/util/LocalStrings_zh_CN.properties| 1 +
 java/org/apache/coyote/http2/LocalStrings_zh_CN.properties | 2 ++
 java/org/apache/jasper/resources/LocalStrings_zh_CN.properties | 1 +
 java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties  | 1 +
 webapps/docs/changelog.xml | 3 +++
 7 files changed, 10 insertions(+)

diff --git a/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
index 81536ee..9982795 100644
--- a/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
@@ -58,6 +58,7 @@ remoteCidrFilter.noRemoteIp=客户端没有 IP 地址，请求被拒绝。
 remoteIpFilter.invalidHostHeader=HTTP头 [{1}]中，为Host找到一个无效值 [{0}]
 remoteIpFilter.invalidHostWithPort=HTTP头 [{1}]中的Host值 [{0}]包含一个被忽略的端口号
 remoteIpFilter.invalidNumber=参数[{0}]的数字非法：[{1}]
+remoteIpFilter.invalidRemoteAddress=无法确定远程主机，因为上报的远程地址[{0}]是无效的
 
 requestFilter.deny=基于属性:[{1}]，[{0}]的请求被拒绝。
 
diff --git a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
index 25ed325..c5ef40b 100644
--- a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
@@ -133,6 +133,7 @@ hostConfig.ignorePath=忽略appBase中的路径[{0}]以进行自动部署
 hostConfig.illegalWarName=war名称[{0}]无效。存档将被忽略
 hostConfig.jmx.register=注册上下文[{0}]失败。
 hostConfig.jmx.unregister=移除注册上下文[{0}]失败
+hostConfig.migrateError=迁移失败
 hostConfig.reload=重新加载上下文[{0}]
 hostConfig.resourceNotAbsolute=无法从上下文[{0}]中删除资源，因为[{1}]不是绝对路径
 hostConfig.start=HostConfig: 开始处理
diff --git a/java/org/apache/catalina/util/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/util/LocalStrings_zh_CN.properties
index 9812536..5a40c92 100644
--- a/java/org/apache/catalina/util/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/util/LocalStrings_zh_CN.properties
@@ -42,6 +42,7 @@ netmask.cidrNegative=CIDR [{0}]为负数。
 netmask.cidrNotNumeric=CIDR[{0}]不是数字
 netmask.cidrTooBig=CIDR[{0}]大于地址长度[{1}]
 netmask.invalidAddress=地址 [{0}] 无效
+netmask.invalidPort=正则[{0}]中的端口部分是无效的
 
 parameterMap.locked=不允许修改锁定的参数映射
 
diff --git a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties 
b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
index 2ac0846..734685d 100644
--- a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
@@ -73,6 +73,8 @@ http2Parser.processFrameWindowUpdate.debug=连接[{0}]，流[{1}]，窗口大小
 http2Parser.processFrameWindowUpdate.invalidIncrement=接收到的窗口更新帧具有无效的增量大小[{0}]
 http2Parser.swallow.debug=连接：[{0}]，流：[{1}]，吞下[{2}]字节
 
+http2Protocol.jmxRegistration.fail=HTTP/2协议注册JMX失败
+
 pingManager.roundTripTime=连接[{0}]往返时间测量为[{1}]ns
 
 stream.clientCancel=客户端在响应完成前重置了数据流
diff --git a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties 
b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
index b26f1d6..1d95c7d 100644
--- a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
@@ -197,6 +197,7 @@ jsp.error.simpletag.badbodycontent=对于一下简单的标记符，用于类[{0
 jsp.error.single.line.number=JSP文件：[{1}] 的第 [{0}] 行发生了一个错误
 jsp.error.stream.close.failed=流.关闭失败
 jsp.error.stream.closed=流.关闭
+jsp.error.string_interpreter_class.instantiation=加载或者实例化StringInterpreter类 
[{0}]失败
 jsp.error.tag.conflict.attr=Tag指令：具有多个具有不同值的属性{0}的重复出现是非法的（旧的：[{1}，新的：[{2}]）
 
jsp.error.tag.conflict.deferredsyntaxallowedasliteral=Tag指令：具有多个具有不同值的“deferredSyntaxAllowedAsLiteral”（旧值：[{0}），新值：[{1}）的重复出现是非法的。
 
jsp.error.tag.conflict.iselignored=TAG指令：多次出现不同值的“isELIgnored”(旧：[{0}]，New：[{1}])
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties 
b/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
index 1121c2a..6d50b76 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
@@ -88,6 +88,7 @@ endpoint.init.bind=套接字绑定失败: [{0}] [{1}]
 endpoint.init.bind.inherited=连接器配置为使用继承通道时没有继承通道
 endpoint.init.listen=套接字侦听失败：[{0}][{1}]
 endpoint.init.notavail=APR.不可用
+endpoint.init.unixnotavail=不支持域套接字
 endpoint.invalidJmxNameSslHost=无法为与主机[{0}]关联的SSLHostConfig生成有效的JMX对象名
 
endpoint.invalidJmxNameSslHostCert=对于SSLHostConfigCertificate关联的主机[{0}]和证书类型[{1}]，无法生成有效的XML对象名称

[tomcat] branch master updated (6ae6242 -> c87de4a)

2021-05-07 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


from 6ae6242  Drop docs on runtime conversion
 new de89c23  Improvements to Chinese translations. Provided by bytesgo
 new 0938b2d  Improvements to French translations. (remm)
 new c87de4a  Improvements to Korean translations. (woonsan)

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/org/apache/catalina/core/LocalStrings_fr.properties | 2 +-
 java/org/apache/catalina/filters/LocalStrings_zh_CN.properties   | 1 +
 java/org/apache/catalina/startup/LocalStrings_zh_CN.properties   | 1 +
 java/org/apache/catalina/util/LocalStrings_zh_CN.properties  | 1 +
 java/org/apache/coyote/http2/LocalStrings_fr.properties  | 1 +
 java/org/apache/coyote/http2/LocalStrings_ko.properties  | 1 +
 java/org/apache/coyote/http2/LocalStrings_zh_CN.properties   | 2 ++
 java/org/apache/jasper/resources/LocalStrings_ko.properties  | 1 +
 java/org/apache/jasper/resources/LocalStrings_zh_CN.properties   | 1 +
 java/org/apache/tomcat/util/net/LocalStrings_fr.properties   | 3 +++
 java/org/apache/tomcat/util/net/LocalStrings_ko.properties   | 3 +++
 java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties| 1 +
 .../apache/tomcat/util/net/openssl/LocalStrings_fr.properties| 1 +
 .../apache/tomcat/util/net/openssl/LocalStrings_ko.properties| 1 +
 webapps/docs/changelog.xml   | 9 +
 15 files changed, 28 insertions(+), 1 deletion(-)

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

Re: mod_headers as a Filter

2021-05-07 Thread Rémy Maucherat 
On Wed, Apr 28, 2021 at 10:45 AM Rémy Maucherat  wrote:

> On Wed, Apr 28, 2021 at 9:07 AM Mark Thomas  wrote:
>
>> I'm wondering if there is merit in a Valve-like mechanism for Coyote.
>> Name TBD but would look something like:
>> - callbacks
>>- after request headers are parsed / before the request is prepared
>>- after the request is prepared
>>- before response headers are prepared
>>- after response headers are prepared / before they are written
>> - allow multiple "Valves" to be configured
>> - provide a "default" that doesn't require explicit config
>> - explicit config can add custom "valves", the default "valve" or any
>>combination
>>
>
> I thought about it quite a bit in the past, an interceptor [resurrecting
> the old name] could be a solution to a lot of problems here. So why not.
>

Thinking about it some more, I would propose investigating either:
- Adding a new interface in addition to ActionHook to coyote.Request, maybe
called EventHook (gets a code and the request object).
- Allowing more than one ActionHook [the codes include plenty of the
interesting events already especially commit, flush]. User configured hooks
would be added and called *before* the main coyote hook (obviously).
Although this sounds easier to implement, this is tricker and error prone
as the call patterns are funky (also the hook field is duplicated between
request and response likely for no good reason); basically I would say all
hook action calls would now go through a helper method on the Request.
- Something else ;)

Rémy


>
> Rémy
>
>
>>
>> I'm leaning towards the latter approach as it has much greater
>> flexibility and I can see different users having subtly different
>> requirements and this avoids an explosion of configuration attributes on
>> a single class.
>>
>> Mark
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>
>>

Re: [VOTE] Apache Tomcat migration tool for Jakarta EE 1.0.0

2021-05-07 Thread Mark Thomas 

On 04/05/2021 13:06, Mark Thomas wrote:


The proposed 1.0.0 release is:

[ ] -1: Broken. Do not release because...
[X] +1: Acceptable. Go ahead and release.


Mark

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