[tomcat] 03/04: Improvements to Japanese translations. Contributed by tak7iji.
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 b7b6dd756c9e9bf92da84ec3a0f6245eb4666511
Author: Mark Thomas
AuthorDate: Thu Feb 2 14:45:25 2023 +
Improvements to Japanese translations. Contributed by tak7iji.
---
.../apache/catalina/connector/LocalStrings_ja.properties | 1 +
.../tomcat/util/http/parser/LocalStrings_ja.properties | 14 ++
webapps/docs/changelog.xml | 3 +++
3 files changed, 18 insertions(+)
diff --git a/java/org/apache/catalina/connector/LocalStrings_ja.properties
b/java/org/apache/catalina/connector/LocalStrings_ja.properties
index c890012742..4c600ab51c 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_ja.properties
@@ -34,6 +34,7 @@ coyoteConnector.protocolHandlerResumeFailed=プロトコルハンドラの再開
coyoteConnector.protocolHandlerStartFailed=プロトコルハンドラの起動に失敗しました
coyoteConnector.protocolHandlerStopFailed=プロトコルハンドラの停止に失敗しました。
+coyoteInputStream.blockingOnly=入力ストリームが非ブロッキング モードの場合 (つまり、ReadListener
が構成された後)、このメソッドを呼び出すことはできません
coyoteInputStream.nbNotready=ノンブロッキングモードでは、以前の読み取りが完了して isReady() が true
を返すまで、ServletInputStream から読み取りできません。
coyoteInputStream.null=入力バッファオブジェクトはリサイクルされ、このファサードに関連付けられなくなりました
diff --git a/java/org/apache/tomcat/util/http/parser/LocalStrings_ja.properties
b/java/org/apache/tomcat/util/http/parser/LocalStrings_ja.properties
index 5b61d86fe6..b9bf412a57 100644
--- a/java/org/apache/tomcat/util/http/parser/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/http/parser/LocalStrings_ja.properties
@@ -44,3 +44,17 @@ http.tooFewHextets=IPv6 アドレスは 8 個のヘクステットで構成し
http.tooManyColons=IPv6 アドレスでは文字 : を 2 つ以上連続することはできません。
http.tooManyDoubleColons=IPv6アドレスは単一の '::'シーケンスのみを含むことができます。
http.tooManyHextets=IPv6 アドレスは [{0}] ヘクステットで構成されていますが、正常な IPv6 アドレスなら 8
ヘクステット以上になりません。
+
+sf.bareitem.invalidCharacter=ベアアイテムの開始を解析中に無効な文字 [{0}] が見つかりました
+sf.base64.invalidCharacter=文字 [{0}] は base64 シーケンス内では無効です
+sf.boolean.invalidCharacter=文字 [{0}] は有効なブール値ではありません
+sf.invalidCharacter=文字 [{0}] はここでは無効です
+sf.key.invalidFirstCharacter=キーの開始を解析中に無効な文字 [{0}] が見つかりました
+sf.numeric.decimalInvalidFinal=10 進数値の最後の文字は数字でなければなりません
+sf.numeric.decimalPartTooLong=小数点以下が 3 桁以上
+sf.numeric.decimalTooLong=16 桁以上の 10 進数が見つかりました
+sf.numeric.integerTooLong=整数に 15 桁を超える数字が含まれています
+sf.numeric.integralPartTooLong=10 進数の整数部分に 12 桁を超える数字が含まれています
+sf.numeric.invalidCharacter=数値の解析中に数値ではない無効な文字 [{0}] が検出されました
+sf.string.invalidCharacter=文字 [{0}] は文字列内では無効です
+sf.string.invalidEscape=文字 [{0}] はエスケープできません
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7a4c260f3c..c8799b3261 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -201,6 +201,9 @@
Improvements to French translations. (remm)
+
+Improvements to Japanese translations. Contributed by tak7iji. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/04: Improvements to French translations
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 b475c9be3fa2a33f243cddc63db01024cd23502b
Author: Mark Thomas
AuthorDate: Thu Feb 2 14:43:49 2023 +
Improvements to French translations
---
.../apache/catalina/connector/LocalStrings_fr.properties | 1 +
.../tomcat/util/http/parser/LocalStrings_fr.properties | 14 ++
webapps/docs/changelog.xml | 3 +++
3 files changed, 18 insertions(+)
diff --git a/java/org/apache/catalina/connector/LocalStrings_fr.properties
b/java/org/apache/catalina/connector/LocalStrings_fr.properties
index c7f281c57f..55b4ff030c 100644
--- a/java/org/apache/catalina/connector/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_fr.properties
@@ -34,6 +34,7 @@ coyoteConnector.protocolHandlerResumeFailed=Le redémarrage du
gestionnaire de p
coyoteConnector.protocolHandlerStartFailed=Le démarrage du gestionnaire de
protocole a échoué
coyoteConnector.protocolHandlerStopFailed=L'arrêt du gestionnaire de protocole
a échoué
+coyoteInputStream.blockingOnly=Cette méthode ne peut pas être appelée quand le
flux d'entrée est non bloquant (c'est à dire lorsqu'un ReadListener a été
configuré)
coyoteInputStream.nbNotready=En mode non-bloquant, vous ne pouvez pas lire du
ServletInputStream tant que la lecture précédente n'est pas terminée et
isReady() renvoie "true"
coyoteInputStream.null=Le tampon d'entrée a été recyclé et n'est plus associé
à cette facade
diff --git a/java/org/apache/tomcat/util/http/parser/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/http/parser/LocalStrings_fr.properties
index 88eac1e59b..a954343891 100644
--- a/java/org/apache/tomcat/util/http/parser/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/http/parser/LocalStrings_fr.properties
@@ -44,3 +44,17 @@ http.tooFewHextets=Une adresse IPv6 doit être constitué de 8
groupes de 4 octe
http.tooManyColons=Une adresse IPv6 ne peut pas contenir plus de deux
caractères deux-points à la suite
http.tooManyDoubleColons=Une adresse IPv6 ne peut contenir qu'une seule
séquence "::"
http.tooManyHextets=L''adresse IPv6 contient [{0}] groupes de 4 octets mais
une adresse IPv6 valide ne doit pas en avoir plus de 8
+
+sf.bareitem.invalidCharacter=Le caractère [{0}] invalide a été rencontré en
début d''un objet
+sf.base64.invalidCharacter=Le caractère [{0}] est invalide dans une séquence
base64
+sf.boolean.invalidCharacter=Le caractère [{0}] n''est pas une valeur booléene
valide
+sf.invalidCharacter=Le caractère [{0}] n''est pas valide à cet endroit
+sf.key.invalidFirstCharacter=Le caractère [{0}] invalide a été rencontré au
début d''une clé
+sf.numeric.decimalInvalidFinal=Le caractère final d'une valeur décimale doit
être un chiffre
+sf.numeric.decimalPartTooLong=Plus de 3 chiffres après le point des décimales
+sf.numeric.decimalTooLong=Plus de 16 caractères trouvés dans une décimale
+sf.numeric.integerTooLong=Plus de 15 chiffres dans un entier
+sf.numeric.integralPartTooLong=Plus de 12 chiffres trouvés dans la partie
entière d'une décimale
+sf.numeric.invalidCharacter=Le caractère [{0}] invalide a été trouvé en
traitant une valeur numérique alors qu''un chiffre était attendu
+sf.string.invalidCharacter=Le caractère [{0}] n''est pas valide dans une
chaîne de caractères
+sf.string.invalidEscape=Le caractère [{0}] ne doit pas être échappé
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f9364fe907..7a4c260f3c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -198,6 +198,9 @@
Improvements to Chinese translations. (lihan)
+
+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] 04/04: Improvements to Korean translations.
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 3c710a8919a4b18602338090cf12d6a06935c736
Author: Mark Thomas
AuthorDate: Thu Feb 2 14:47:38 2023 +
Improvements to Korean translations.
---
.../catalina/authenticator/LocalStrings_ko.properties| 2 ++
.../apache/catalina/connector/LocalStrings_ko.properties | 1 +
java/org/apache/catalina/core/LocalStrings_ko.properties | 3 +++
java/org/apache/coyote/http11/LocalStrings_ko.properties | 1 +
java/org/apache/coyote/http2/LocalStrings_ko.properties | 4
.../apache/jasper/resources/LocalStrings_ko.properties | 1 +
.../org/apache/naming/factory/LocalStrings_ko.properties | 3 +++
.../apache/tomcat/util/compat/LocalStrings_ko.properties | 16
.../tomcat/util/http/parser/LocalStrings_ko.properties | 14 ++
.../apache/tomcat/websocket/LocalStrings_ko.properties | 4
webapps/docs/changelog.xml | 3 +++
11 files changed, 52 insertions(+)
diff --git a/java/org/apache/catalina/authenticator/LocalStrings_ko.properties
b/java/org/apache/catalina/authenticator/LocalStrings_ko.properties
index 257f10be58..9f13e977c2 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_ko.properties
@@ -36,11 +36,13 @@ basicAuthenticator.invalidCharset=허용된 값들은 오직 널, 빈 문자열,
digestAuthenticator.cacheRemove=새로운 엔트리들을 위한 공간을 만들기 위해, client nonce cache로부터
유효한 엔트리를 제거했습니다. 리플레이 공격이 가능해진 상태입니다. 가능성 있는 리플레이 공격들을 방지하려면, nonceValidity를 감소
시키거나, nonceCacheSize를 증가 시키십시오. 더 이상 이러한 종류의 경고 메시지들은 향후 5분 동안 나오지 않을 것입니다.
+formAuthenticator.changeSessionIdLogin=로그인 페이지로 forward하기 직전에 세션 ID가 [{0}]에서
[{1}](으)로 변경되었습니다.
formAuthenticator.forwardErrorFail=오류 페이지로 forward하는 중 예기치 않은 오류 발생
formAuthenticator.forwardLogin=메소드 [{1}]을(를) 사용한 [{0}]에 대한 요청을, 컨텍스트 [{3}]의
로그인 페이지 [{2}](으)로, GET 요청 메소드를 사용하여 forward 합니다.
formAuthenticator.forwardLoginFail=로그인 페이지로 forward하는 중 예기치 않은 오류 발생
formAuthenticator.noErrorPage=컨텍스트 [{0}]에서 폼 기반 인증을 위한 오류 페이지가 정의되지 않았습니다.
formAuthenticator.noLoginPage=컨텍스트 [{0}]에서, 폼 기반 인증을 위한 로그인 페이지가 정의되지 않았습니다.
+formAuthenticator.sessionIdMismatch=현 세션 ID는 [{0}]입니다만 FORM authenticator가
기대했던 세션 ID는 [{1}]이었습니다.
singleSignOn.debug.associate=SSO가, 애플리케이션 세션 [{1}]을(를) SSO 세션 [{0}]와(과) 연관시킵니다.
singleSignOn.debug.associateFail=SSO 세션 [{1}]이(가) 존재하지 않기 때문에, SSO가 애플리케이션 세션
[{0}]을(를) 연관시키지 못했습니다.
diff --git a/java/org/apache/catalina/connector/LocalStrings_ko.properties
b/java/org/apache/catalina/connector/LocalStrings_ko.properties
index 38b1938610..7b64ef21e8 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_ko.properties
@@ -34,6 +34,7 @@ coyoteConnector.protocolHandlerResumeFailed=프로토콜 핸들러를 재개하
coyoteConnector.protocolHandlerStartFailed=프로토콜 핸들러 시작 실패
coyoteConnector.protocolHandlerStopFailed=프로토콜 핸들러를 중지시키지 못했습니다.
+coyoteInputStream.blockingOnly=입력 스트림이 Non-blocking 모드일 때에 이 메소드는 호출될 수 없습니다
(즉 ReadListener가 설정된 후).
coyoteInputStream.nbNotready=Non-blocking 모드에서는, 이전의 데이터 읽기가 완료되고 isReady()가
true를 반환하기 전까지는, ServletInputStream으로부터 데이터를 읽을 수 없습니다.
coyoteInputStream.null=입력 버퍼 객체는 이미 제거되었고 이 facade에 더 이상 연결되어 있지 않습니다.
diff --git a/java/org/apache/catalina/core/LocalStrings_ko.properties
b/java/org/apache/catalina/core/LocalStrings_ko.properties
index 322d1852a2..6d735f15cb 100644
--- a/java/org/apache/catalina/core/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ko.properties
@@ -68,6 +68,7 @@ applicationServletRegistration.setServletSecurity.ise=컨텍스트가
이미 초
applicationSessionCookieConfig.ise=컨텍스트가 이미 초기화되었기에, 컨텍스트 [{1}]을(를) 위한
SessionCookieConfig에 프로퍼티 [{0}]이(가) 추가될 수 없습니다.
+aprListener.FIPSProviderNotDefault=AprLifecycleListener가 FIPS 모드 [{0}](으)로 설정될
때에는 반드시 FIPS 제공자가 기본 제공자로 설정되어야 합니다.
aprListener.aprDestroy=APR 기반 Apache Tomcat Native 라이브러리를 셧다운하지 못했습니다.
aprListener.aprInit=프로덕션 환경들에서 최적의 성능을 제공하는, APR 기반 Apache Tomcat Native
라이브러리가, 다음 java.library.path에서 발견되지 않습니다: [{0}]
aprListener.aprInitDebug=[{0}](이)라는 이름들을 사용하여, java.library.path [{1}]에서, APR
기반 Apache Tomcat Native 라이브러리를 찾을 수 없습니다. 보고된 오류들: [{2}]
@@ -81,12 +82,14 @@ aprListener.initializingFIPS=FIPS 모드 초기화...
aprListener.requireNotInFIPSMode=AprLifecycleListener는 라이브러리가 이미 FIPS 모드에 있어야만
하도록 설정되어 있는데, FIPS 모드에 있지 않았습니다.
aprListener.skipFIPSInitialization=이미 FIPS 모드에 있습니다. FIPS 초기화는 건너뜁니다.
aprListener.sslInit=SSLEngine을 초기화하지 못했습니다.
+aprListener.sslRequired=버전 2.x 이후로 SSL은 필수이므로, [{0}]은(는), 톰캣 Native 라이브러리 버전
[{1}] 사용 시 SSLEngine을 위해 유효한 값이 아닙니다.
aprListener.tcnInvalid=APR 기반의 Apache Tomcat Native 라이브러리가 호환되지 않는 버전
[{0}]이(가) 설치되어 있습니다. Tomcat은 버전 [{1}]을(를) 요구합니다.
aprListener.tcnValid=APR 버전 [{1}]을(를) 사용한, APR 기반 Apache Tomcat Native 라이브러리
[{0}]을(를) 로드했습니다.
aprListener.tcnVersion
Re: [tomcat] branch main updated: Restore ISE catching behavior
On 02/02/2023 09:26, r...@apache.org wrote: This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 10733c4228 Restore ISE catching behavior 10733c4228 is described below commit 10733c4228daece83195bb553ed97cf5996714f0 Author: remm AuthorDate: Thu Feb 2 10:25:53 2023 +0100 Restore ISE catching behavior This looks like a Java defect though: IOE is caught and returns false, while ISE is undocumented and simply falls out of the innocuous looking call. Workaround to restore the previous behavior and assume false. +1. I also looked at the JRE code and had reached the same conclusion. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Exclude keys from the backport that differ between 11.0.x and 10.1.x
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 61af113c52 Exclude keys from the backport that differ between 11.0.x
and 10.1.x
61af113c52 is described below
commit 61af113c52b86c468602a88111402daaadebdbf7
Author: Mark Thomas
AuthorDate: Thu Feb 2 16:34:46 2023 +
Exclude keys from the backport that differ between 11.0.x and 10.1.x
---
java/org/apache/tomcat/buildutil/translate/BackportEnglish.java | 4
1 file changed, 4 insertions(+)
diff --git a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
index ec88b909da..d5b64d9534 100644
--- a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
+++ b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
@@ -38,6 +38,10 @@ public class BackportEnglish extends BackportBase {
keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.webfrg.header");
keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.webxml.header");
+// Exclude keys known to be different between 11.0.x and 10.1.x
+
keysToExclude.add("java.org.apache.jasper.resources.zzz.jsp.error.param.invalidUse");
+keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.usage");
+
BackportEnglish backport = new BackportEnglish(args);
backport.execute();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated (0fb9397ff9 -> c5d0a755ef)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 0fb9397ff9 Restore ISE catching behavior new 7bb93e7525 Reformat to simplify back-porting updates new c5d0a755ef Improvements to Korean translations 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/jakarta/servlet/jsp/LocalStrings.properties | 2 +- .../authenticator/LocalStrings_ko.properties | 2 + .../apache/catalina/core/LocalStrings.properties | 2 +- .../catalina/core/LocalStrings_ko.properties | 3 + .../catalina/security/LocalStrings.properties | 4 +- .../apache/catalina/valves/LocalStrings.properties | 2 - .../coyote/http11/LocalStrings_ko.properties | 1 + .../apache/coyote/http2/LocalStrings_ko.properties | 4 ++ java/org/apache/el/LocalStrings.properties | 66 -- .../jasper/resources/LocalStrings_ko.properties| 1 + .../naming/factory/LocalStrings_ko.properties | 3 + .../tomcat/util/compat/LocalStrings_ko.properties | 2 + .../tomcat/websocket/LocalStrings.properties | 22 ++-- .../tomcat/websocket/LocalStrings_ko.properties| 4 ++ webapps/docs/changelog.xml | 3 + 15 files changed, 55 insertions(+), 66 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Improvements to Korean translations
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit c5d0a755ef558d80e30d8d862ae050ebfa0cd207
Author: Mark Thomas
AuthorDate: Thu Feb 2 16:56:44 2023 +
Improvements to Korean translations
---
java/org/apache/catalina/authenticator/LocalStrings_ko.properties | 2 ++
java/org/apache/catalina/core/LocalStrings_ko.properties | 3 +++
java/org/apache/coyote/http11/LocalStrings_ko.properties | 1 +
java/org/apache/coyote/http2/LocalStrings_ko.properties | 4
java/org/apache/jasper/resources/LocalStrings_ko.properties | 1 +
java/org/apache/naming/factory/LocalStrings_ko.properties | 3 +++
java/org/apache/tomcat/util/compat/LocalStrings_ko.properties | 2 ++
java/org/apache/tomcat/websocket/LocalStrings_ko.properties | 4
webapps/docs/changelog.xml| 3 +++
9 files changed, 23 insertions(+)
diff --git a/java/org/apache/catalina/authenticator/LocalStrings_ko.properties
b/java/org/apache/catalina/authenticator/LocalStrings_ko.properties
index 257f10be58..9f13e977c2 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_ko.properties
@@ -36,11 +36,13 @@ basicAuthenticator.invalidCharset=허용된 값들은 오직 널, 빈 문자열,
digestAuthenticator.cacheRemove=새로운 엔트리들을 위한 공간을 만들기 위해, client nonce cache로부터
유효한 엔트리를 제거했습니다. 리플레이 공격이 가능해진 상태입니다. 가능성 있는 리플레이 공격들을 방지하려면, nonceValidity를 감소
시키거나, nonceCacheSize를 증가 시키십시오. 더 이상 이러한 종류의 경고 메시지들은 향후 5분 동안 나오지 않을 것입니다.
+formAuthenticator.changeSessionIdLogin=로그인 페이지로 forward하기 직전에 세션 ID가 [{0}]에서
[{1}](으)로 변경되었습니다.
formAuthenticator.forwardErrorFail=오류 페이지로 forward하는 중 예기치 않은 오류 발생
formAuthenticator.forwardLogin=메소드 [{1}]을(를) 사용한 [{0}]에 대한 요청을, 컨텍스트 [{3}]의
로그인 페이지 [{2}](으)로, GET 요청 메소드를 사용하여 forward 합니다.
formAuthenticator.forwardLoginFail=로그인 페이지로 forward하는 중 예기치 않은 오류 발생
formAuthenticator.noErrorPage=컨텍스트 [{0}]에서 폼 기반 인증을 위한 오류 페이지가 정의되지 않았습니다.
formAuthenticator.noLoginPage=컨텍스트 [{0}]에서, 폼 기반 인증을 위한 로그인 페이지가 정의되지 않았습니다.
+formAuthenticator.sessionIdMismatch=현 세션 ID는 [{0}]입니다만 FORM authenticator가
기대했던 세션 ID는 [{1}]이었습니다.
singleSignOn.debug.associate=SSO가, 애플리케이션 세션 [{1}]을(를) SSO 세션 [{0}]와(과) 연관시킵니다.
singleSignOn.debug.associateFail=SSO 세션 [{1}]이(가) 존재하지 않기 때문에, SSO가 애플리케이션 세션
[{0}]을(를) 연관시키지 못했습니다.
diff --git a/java/org/apache/catalina/core/LocalStrings_ko.properties
b/java/org/apache/catalina/core/LocalStrings_ko.properties
index 945b68861c..d207a034c3 100644
--- a/java/org/apache/catalina/core/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ko.properties
@@ -68,6 +68,7 @@ applicationServletRegistration.setServletSecurity.ise=컨텍스트가
이미 초
applicationSessionCookieConfig.ise=컨텍스트가 이미 초기화되었기에, 컨텍스트 [{1}]을(를) 위한
SessionCookieConfig에 프로퍼티 [{0}]이(가) 추가될 수 없습니다.
+aprListener.FIPSProviderNotDefault=AprLifecycleListener가 FIPS 모드 [{0}](으)로 설정될
때에는 반드시 FIPS 제공자가 기본 제공자로 설정되어야 합니다.
aprListener.aprDestroy=APR 기반 Apache Tomcat Native 라이브러리를 셧다운하지 못했습니다.
aprListener.aprInit=프로덕션 환경들에서 최적의 성능을 제공하는, APR 기반 Apache Tomcat Native
라이브러리가, 다음 java.library.path에서 발견되지 않습니다: [{0}]
aprListener.aprInitDebug=[{0}](이)라는 이름들을 사용하여, java.library.path [{1}]에서, APR
기반 Apache Tomcat Native 라이브러리를 찾을 수 없습니다. 보고된 오류들: [{2}]
@@ -81,12 +82,14 @@ aprListener.initializingFIPS=FIPS 모드 초기화...
aprListener.requireNotInFIPSMode=AprLifecycleListener는 라이브러리가 이미 FIPS 모드에 있어야만
하도록 설정되어 있는데, FIPS 모드에 있지 않았습니다.
aprListener.skipFIPSInitialization=이미 FIPS 모드에 있습니다. FIPS 초기화는 건너뜁니다.
aprListener.sslInit=SSLEngine을 초기화하지 못했습니다.
+aprListener.sslRequired=버전 2.x 이후로 SSL은 필수이므로, [{0}]은(는), 톰캣 Native 라이브러리 버전
[{1}] 사용 시 SSLEngine을 위해 유효한 값이 아닙니다.
aprListener.tcnInvalid=APR 기반의 Apache Tomcat Native 라이브러리가 호환되지 않는 버전
[{0}]이(가) 설치되어 있습니다. Tomcat은 버전 [{1}]을(를) 요구합니다.
aprListener.tcnValid=APR 버전 [{1}]을(를) 사용한, APR 기반 Apache Tomcat Native 라이브러리
[{0}]을(를) 로드했습니다.
aprListener.tcnVersion=APR 기반의 Apache Tomcat Native 라이브러리의 예전 버전 [{0}](이)가
설치되어 있습니다. Tomcat은 최소 버전으로서 [{1}]을(를) 추천합니다.
aprListener.tooLateForFIPSMode=setFIPSMode를 수행할 수 없습니다: SSL이 이미 초기화되었습니다.
aprListener.tooLateForSSLEngine=setSSLEngine을 호출할 수 없습니다: SSL이 이미 초기화 되었습니다.
aprListener.tooLateForSSLRandomSeed=setSSLRandomSeed를 호출할 수 없습니다: SSL이 이미
초기화되어 있습니다.
+aprListener.usingFIPSProvider=FIPS 제공자를 기본 제공자로 하는 OpenSSL을 사용 중
aprListener.wrongFIPSMode=예기치 않은 AprLifecycleListener의 FIPSMode 옵션 값: [{0}]
asyncContextImpl.asyncDispatchError=비동기 디스패치 도중 오류 발생
diff --git a/java/org/apache/coyote/http11/LocalStrings_ko.properties
b/java/org/apache/coyote/http11/LocalStrings_ko.properties
index e0cbdd074c..aa601d72f8 100644
--- a/java/org/apache/coyote/http11/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_ko.properties
@@ -35,6 +35,7 @@ http11processor.request.nonNumericContentLength=해당 요청이 숫자가 아
h
[tomcat] 01/02: Reformat to simplify back-porting updates
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 7bb93e75259bea1e80dc8264b8a8e842af67f40d
Author: Mark Thomas
AuthorDate: Thu Feb 2 16:23:35 2023 +
Reformat to simplify back-porting updates
---
java/jakarta/servlet/jsp/LocalStrings.properties | 2 +-
.../apache/catalina/core/LocalStrings.properties | 2 +-
.../catalina/security/LocalStrings.properties | 4 +-
.../apache/catalina/valves/LocalStrings.properties | 2 -
java/org/apache/el/LocalStrings.properties | 66 --
.../tomcat/websocket/LocalStrings.properties | 22 ++--
6 files changed, 32 insertions(+), 66 deletions(-)
diff --git a/java/jakarta/servlet/jsp/LocalStrings.properties
b/java/jakarta/servlet/jsp/LocalStrings.properties
index 2b34d2c499..081f2fab14 100644
--- a/java/jakarta/servlet/jsp/LocalStrings.properties
+++ b/java/jakarta/servlet/jsp/LocalStrings.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-el.unknown.identifier=Unknown identifier
\ No newline at end of file
+el.unknown.identifier=Unknown identifier
diff --git a/java/org/apache/catalina/core/LocalStrings.properties
b/java/org/apache/catalina/core/LocalStrings.properties
index 242259f157..944e236726 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -68,13 +68,13 @@
applicationServletRegistration.setServletSecurity.ise=Security constraints can''
applicationSessionCookieConfig.ise=Property [{0}] cannot be added to
SessionCookieConfig for context [{1}] as the context has been initialised
+aprListener.FIPSProviderNotDefault=The FIPS provider must be configured as the
default provider when the AprLifecycleListener is configured with FIPS mode
[{0}]
aprListener.aprDestroy=Failed shutdown of the Apache Tomcat Native library
aprListener.aprInit=The Apache Tomcat Native library which allows using
OpenSSL was not found on the java.library.path: [{0}]
aprListener.aprInitDebug=The Apache Tomcat Native library could not be found
using names [{0}] on the java.library.path [{1}]. The errors reported were [{2}]
aprListener.aprInitError=The Apache Tomcat Native library failed to load. The
error reported was [{0}]
aprListener.currentFIPSMode=Current FIPS mode: [{0}]
aprListener.enterAlreadyInFIPSMode=AprLifecycleListener is configured to force
entering FIPS mode, but library is already in FIPS mode [{0}]
-aprListener.FIPSProviderNotDefault=The FIPS provider must be configured as the
default provider when the AprLifecycleListener is configured with FIPS mode
[{0}]
aprListener.initializeFIPSFailed=Failed to enter FIPS mode
aprListener.initializeFIPSSuccess=Successfully entered FIPS mode
aprListener.initializedOpenSSL=OpenSSL successfully initialized [{0}]
diff --git a/java/org/apache/catalina/security/LocalStrings.properties
b/java/org/apache/catalina/security/LocalStrings.properties
index 1c604fd388..f1e1aa689c 100644
--- a/java/org/apache/catalina/security/LocalStrings.properties
+++ b/java/org/apache/catalina/security/LocalStrings.properties
@@ -13,8 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-listener.notServer=This listener must only be nested within Server elements,
but is in [{0}].
-
SecurityListener.checkUmaskFail=Start attempted with umask setting of [{0}].
Running Tomcat without a umask at least as restrictive as [{1}] has been
blocked by the Lifecycle listener org.apache.catalina.security.SecurityListener
(usually configured in CATALINA_BASE/conf/server.xml)
SecurityListener.checkUmaskNone=No umask setting was found in system property
[{0}]. However, it appears Tomcat is running on a platform that supports umask.
The system property is typically set in CATALINA_HOME/bin/catalina.sh. The
Lifecycle listener org.apache.catalina.security.SecurityListener (usually
configured in CATALINA_BASE/conf/server.xml) expects a umask at least as
restrictive as [{1}]
SecurityListener.checkUmaskParseFail=Failed to parse value [{0}] as a valid
umask.
@@ -22,3 +20,5 @@ SecurityListener.checkUmaskSkip=Unable to determine umask. It
appears Tomcat is
SecurityListener.checkUserWarning=Start attempted while running as user [{0}].
Running Tomcat as this user has been blocked by the Lifecycle listener
org.apache.catalina.security.SecurityListener (usually configured in
CATALINA_BASE/conf/server.xml)
SecurityUtil.doAsPrivilege=An exception occurs when running the
PrivilegedExceptionAction block.
+
+listener.notServer=This listener must only be nested within Server elements,
but is in [{0}].
diff --git a/java/org/apache/catalina/valves/LocalStrings.properties
b/java/org/apache/catalina/valves/LocalStrings.properties
index 2f3a68e485..a1441664b9 10
[tomcat] 01/02: Additional i18n strings to support BZ 66196 fix
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 67045d5b3f8c8d01725b5cd7f8094ea18c1c8333
Author: Mark Thomas
AuthorDate: Thu Feb 2 17:02:41 2023 +
Additional i18n strings to support BZ 66196 fix
---
.../util/buf/{LocalStrings_es.properties => LocalStrings_cs.properties} | 2 +-
.../util/buf/{LocalStrings_es.properties => LocalStrings_de.properties} | 2 +-
java/org/apache/tomcat/util/buf/LocalStrings_es.properties | 2 ++
java/org/apache/tomcat/util/buf/LocalStrings_fr.properties | 2 ++
java/org/apache/tomcat/util/buf/LocalStrings_ja.properties | 2 ++
java/org/apache/tomcat/util/buf/LocalStrings_ko.properties | 2 ++
.../buf/{LocalStrings_es.properties => LocalStrings_pt_BR.properties} | 2 +-
java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties | 2 ++
8 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_es.properties
b/java/org/apache/tomcat/util/buf/LocalStrings_cs.properties
similarity index 84%
copy from java/org/apache/tomcat/util/buf/LocalStrings_es.properties
copy to java/org/apache/tomcat/util/buf/LocalStrings_cs.properties
index 30376482cd..1a0a1214f0 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_es.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_cs.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-b2cConverter.unknownEncoding=La codificación de carácter [{0}] no está
soportada
+messageBytes.illegalCharacter=Unicode znak [{0}] na kódové značce [{1}] nemůže
být zakódován, protože je mimo povolený rozsah 0 až 255.
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_es.properties
b/java/org/apache/tomcat/util/buf/LocalStrings_de.properties
similarity index 82%
copy from java/org/apache/tomcat/util/buf/LocalStrings_es.properties
copy to java/org/apache/tomcat/util/buf/LocalStrings_de.properties
index 30376482cd..2220bbfc34 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_es.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_de.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-b2cConverter.unknownEncoding=La codificación de carácter [{0}] no está
soportada
+messageBytes.illegalCharacter=Das Unicode Zeichen [{0}] an Code Punkt [{1}]
kann nicht kodiert werden, da es außerhalb des erlaubten Bereiches von 0 bis
255 ist.
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_es.properties
b/java/org/apache/tomcat/util/buf/LocalStrings_es.properties
index 30376482cd..8946d507c2 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_es.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_es.properties
@@ -14,3 +14,5 @@
# limitations under the License.
b2cConverter.unknownEncoding=La codificación de carácter [{0}] no está
soportada
+
+messageBytes.illegalCharacter=El carácter Unicode [{0}] en el punto del código
[{1}] no puede ser codificado al estar fuera del rango permitido de 0 a 255.
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
index ba593d9b99..38af8c80fa 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
@@ -27,6 +27,8 @@ encodedSolidusHandling.invalid=La valeur [{0}] n''est pas
reconnue
hexUtils.fromHex.nonHex=L'entrée doit être uniquement des chiffres héxadécimaux
hexUtils.fromHex.oddDigits=L'entrée doit contenir un nombre pair de chiffres
héxadécimaux
+messageBytes.illegalCharacter=Le caractère Unicode [{0}] ayant le code point
[{1}] ne peut être encodé, parce qu''il est en-dehors de l''éventail permis
0-255.
+
uDecoder.eof=Fin de fichier (EOF)
uDecoder.noSlash=Un caractère slash encodé n'est pas autorisé
uDecoder.urlDecode.conversionError=Echec de décodage [{0}] en utilisant le jeu
de caractères [{1}]
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties
b/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties
index 6f1870ae7c..1309663770 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties
@@ -27,6 +27,8 @@ encodedSolidusHandling.invalid=値 [{0}] は認識されません
hexUtils.fromHex.nonHex=入力は16進数でなければなりません
hexUtils.fromHex.oddDigits=入力は、偶数の16進数で構成する必要があります。
+messageBytes.illegalCharacter=コードポイント [{1}] のユニコード文字 [{0}] は有効範囲 0 から 255
の範囲外のため、エンコードできません。
+
uDecoder.eof=予期せぬ場所で終端に達しました。
uDecoder.noSlash="/" を符号化して含めることはできません。
uDecoder.urlDecode.conversionError=文字セット [{1}] を使用した [{0}] のデコードに失敗しました
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_ko.properties
b/java/org/apache/tomcat/util/buf/L
[tomcat] branch 9.0.x updated (6c05e1cfb5 -> 2db95575f4)
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 6c05e1cfb5 Drop xml prolog from DTD as it's not needed and causing the
file to be flagged as malformed by xml validators
new 67045d5b3f Additional i18n strings to support BZ 66196 fix
new 2db95575f4 Improvements to Korean translations.
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/catalina/authenticator/LocalStrings_ko.properties | 2 ++
java/org/apache/catalina/core/LocalStrings_ko.properties | 3 +++
java/org/apache/coyote/http11/LocalStrings_ko.properties | 1 +
java/org/apache/coyote/http2/LocalStrings_ko.properties | 4
java/org/apache/jasper/resources/LocalStrings_ko.properties | 1 +
java/org/apache/naming/factory/LocalStrings_ko.properties | 3 +++
.../ha/authenticator => tomcat/util/buf}/LocalStrings_cs.properties | 2 +-
.../ha/authenticator => tomcat/util/buf}/LocalStrings_de.properties | 2 +-
java/org/apache/tomcat/util/buf/LocalStrings_es.properties| 2 ++
java/org/apache/tomcat/util/buf/LocalStrings_fr.properties| 2 ++
java/org/apache/tomcat/util/buf/LocalStrings_ja.properties| 2 ++
java/org/apache/tomcat/util/buf/LocalStrings_ko.properties| 2 ++
.../jaspic => tomcat/util/buf}/LocalStrings_pt_BR.properties | 2 +-
java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties | 2 ++
java/org/apache/tomcat/util/compat/LocalStrings_ko.properties | 2 ++
java/org/apache/tomcat/websocket/LocalStrings_ko.properties | 4
webapps/docs/changelog.xml| 3 +++
17 files changed, 36 insertions(+), 3 deletions(-)
copy java/org/apache/{catalina/ha/authenticator =>
tomcat/util/buf}/LocalStrings_cs.properties (84%)
copy java/org/apache/{catalina/ha/authenticator =>
tomcat/util/buf}/LocalStrings_de.properties (82%)
copy java/org/apache/{catalina/authenticator/jaspic =>
tomcat/util/buf}/LocalStrings_pt_BR.properties (84%)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Improvements to Korean translations.
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 2db95575f4177132ad8bdac9ab0dbe65ff0a5254
Author: Mark Thomas
AuthorDate: Thu Feb 2 17:03:38 2023 +
Improvements to Korean translations.
---
java/org/apache/catalina/authenticator/LocalStrings_ko.properties | 2 ++
java/org/apache/catalina/core/LocalStrings_ko.properties | 3 +++
java/org/apache/coyote/http11/LocalStrings_ko.properties | 1 +
java/org/apache/coyote/http2/LocalStrings_ko.properties | 4
java/org/apache/jasper/resources/LocalStrings_ko.properties | 1 +
java/org/apache/naming/factory/LocalStrings_ko.properties | 3 +++
java/org/apache/tomcat/util/compat/LocalStrings_ko.properties | 2 ++
java/org/apache/tomcat/websocket/LocalStrings_ko.properties | 4
webapps/docs/changelog.xml| 3 +++
9 files changed, 23 insertions(+)
diff --git a/java/org/apache/catalina/authenticator/LocalStrings_ko.properties
b/java/org/apache/catalina/authenticator/LocalStrings_ko.properties
index 257f10be58..9f13e977c2 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_ko.properties
@@ -36,11 +36,13 @@ basicAuthenticator.invalidCharset=허용된 값들은 오직 널, 빈 문자열,
digestAuthenticator.cacheRemove=새로운 엔트리들을 위한 공간을 만들기 위해, client nonce cache로부터
유효한 엔트리를 제거했습니다. 리플레이 공격이 가능해진 상태입니다. 가능성 있는 리플레이 공격들을 방지하려면, nonceValidity를 감소
시키거나, nonceCacheSize를 증가 시키십시오. 더 이상 이러한 종류의 경고 메시지들은 향후 5분 동안 나오지 않을 것입니다.
+formAuthenticator.changeSessionIdLogin=로그인 페이지로 forward하기 직전에 세션 ID가 [{0}]에서
[{1}](으)로 변경되었습니다.
formAuthenticator.forwardErrorFail=오류 페이지로 forward하는 중 예기치 않은 오류 발생
formAuthenticator.forwardLogin=메소드 [{1}]을(를) 사용한 [{0}]에 대한 요청을, 컨텍스트 [{3}]의
로그인 페이지 [{2}](으)로, GET 요청 메소드를 사용하여 forward 합니다.
formAuthenticator.forwardLoginFail=로그인 페이지로 forward하는 중 예기치 않은 오류 발생
formAuthenticator.noErrorPage=컨텍스트 [{0}]에서 폼 기반 인증을 위한 오류 페이지가 정의되지 않았습니다.
formAuthenticator.noLoginPage=컨텍스트 [{0}]에서, 폼 기반 인증을 위한 로그인 페이지가 정의되지 않았습니다.
+formAuthenticator.sessionIdMismatch=현 세션 ID는 [{0}]입니다만 FORM authenticator가
기대했던 세션 ID는 [{1}]이었습니다.
singleSignOn.debug.associate=SSO가, 애플리케이션 세션 [{1}]을(를) SSO 세션 [{0}]와(과) 연관시킵니다.
singleSignOn.debug.associateFail=SSO 세션 [{1}]이(가) 존재하지 않기 때문에, SSO가 애플리케이션 세션
[{0}]을(를) 연관시키지 못했습니다.
diff --git a/java/org/apache/catalina/core/LocalStrings_ko.properties
b/java/org/apache/catalina/core/LocalStrings_ko.properties
index 099504d8ad..dc8de884c8 100644
--- a/java/org/apache/catalina/core/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ko.properties
@@ -68,6 +68,7 @@ applicationServletRegistration.setServletSecurity.ise=컨텍스트가
이미 초
applicationSessionCookieConfig.ise=컨텍스트가 이미 초기화되었기에, 컨텍스트 [{1}]을(를) 위한
SessionCookieConfig에 프로퍼티 [{0}]이(가) 추가될 수 없습니다.
+aprListener.FIPSProviderNotDefault=AprLifecycleListener가 FIPS 모드 [{0}](으)로 설정될
때에는 반드시 FIPS 제공자가 기본 제공자로 설정되어야 합니다.
aprListener.aprDestroy=APR 기반 Apache Tomcat Native 라이브러리를 셧다운하지 못했습니다.
aprListener.aprInit=프로덕션 환경들에서 최적의 성능을 제공하는, APR 기반 Apache Tomcat Native
라이브러리가, 다음 java.library.path에서 발견되지 않습니다: [{0}]
aprListener.aprInitDebug=[{0}](이)라는 이름들을 사용하여, java.library.path [{1}]에서, APR
기반 Apache Tomcat Native 라이브러리를 찾을 수 없습니다. 보고된 오류들: [{2}]
@@ -83,12 +84,14 @@ aprListener.initializingFIPS=FIPS 모드 초기화...
aprListener.requireNotInFIPSMode=AprLifecycleListener는 라이브러리가 이미 FIPS 모드에 있어야만
하도록 설정되어 있는데, FIPS 모드에 있지 않았습니다.
aprListener.skipFIPSInitialization=이미 FIPS 모드에 있습니다. FIPS 초기화는 건너뜁니다.
aprListener.sslInit=SSLEngine을 초기화하지 못했습니다.
+aprListener.sslRequired=버전 2.x 이후로 SSL은 필수이므로, [{0}]은(는), 톰캣 Native 라이브러리 버전
[{1}] 사용 시 SSLEngine을 위해 유효한 값이 아닙니다.
aprListener.tcnInvalid=APR 기반의 Apache Tomcat Native 라이브러리가 호환되지 않는 버전
[{0}]이(가) 설치되어 있습니다. Tomcat은 버전 [{1}]을(를) 요구합니다.
aprListener.tcnValid=APR 버전 [{1}]을(를) 사용한, APR 기반 Apache Tomcat Native 라이브러리
[{0}]을(를) 로드했습니다.
aprListener.tcnVersion=APR 기반의 Apache Tomcat Native 라이브러리의 예전 버전 [{0}](이)가
설치되어 있습니다. Tomcat은 최소 버전으로서 [{1}]을(를) 추천합니다.
aprListener.tooLateForFIPSMode=setFIPSMode를 수행할 수 없습니다: SSL이 이미 초기화되었습니다.
aprListener.tooLateForSSLEngine=setSSLEngine을 호출할 수 없습니다: SSL이 이미 초기화 되었습니다.
aprListener.tooLateForSSLRandomSeed=setSSLRandomSeed를 호출할 수 없습니다: SSL이 이미
초기화되어 있습니다.
+aprListener.usingFIPSProvider=FIPS 제공자를 기본 제공자로 하는 OpenSSL을 사용 중
aprListener.wrongFIPSMode=예기치 않은 AprLifecycleListener의 FIPSMode 옵션 값: [{0}]
asyncContextImpl.asyncDispatchError=비동기 디스패치 도중 오류 발생
diff --git a/java/org/apache/coyote/http11/LocalStrings_ko.properties
b/java/org/apache/coyote/http11/LocalStrings_ko.properties
index e0cbdd074c..aa601d72f8 100644
--- a/java/org/apache/coyote/http11/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_ko.properties
@@ -35,6 +35,7 @@ http11processor.request.nonNumericContentLength=해당 요청이 숫자가 아
h
[tomcat] branch 8.5.x updated: Additional i18n strings to support BZ 66196 fix
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 66122f29de Additional i18n strings to support BZ 66196 fix
66122f29de is described below
commit 66122f29dec4abe0caf0f96764cb5b6ca14b5465
Author: Mark Thomas
AuthorDate: Thu Feb 2 17:05:33 2023 +
Additional i18n strings to support BZ 66196 fix
---
java/org/apache/coyote/http11/LocalStrings_fr.properties | 1 +
java/org/apache/coyote/http11/LocalStrings_ja.properties | 1 +
java/org/apache/coyote/http11/LocalStrings_ko.properties | 1 +
java/org/apache/coyote/http11/LocalStrings_zh_CN.properties | 1 +
java/org/apache/tomcat/util/buf/LocalStrings_de.properties| 2 +-
java/org/apache/tomcat/util/buf/LocalStrings_es.properties| 2 ++
java/org/apache/tomcat/util/buf/LocalStrings_fr.properties| 2 ++
java/org/apache/tomcat/util/buf/LocalStrings_ja.properties| 2 ++
java/org/apache/tomcat/util/buf/LocalStrings_ko.properties| 2 ++
java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties | 2 ++
10 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/http11/LocalStrings_fr.properties
b/java/org/apache/coyote/http11/LocalStrings_fr.properties
index bbf6464b8f..16453c4c91 100644
--- a/java/org/apache/coyote/http11/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_fr.properties
@@ -35,6 +35,7 @@ http11processor.request.nonNumericContentLength=La requête
contenait un en-têt
http11processor.request.prepare=Echec de préparation de la requête
http11processor.request.process=Erreur de traitement de la requête
http11processor.response.finish=Erreur en finissant la réponse
+http11processor.response.invalidHeader=L''en-tête de réponse HTTP [{0}] avec
la valeur [{1}] a été enlevé de la réponse car il est invalide
http11processor.sendfile.error=Erreur d'envoi des données avec sendfile, cela
peut être causé par des attributs de démarrage ou de fin incorrects dans la
requête
http11processor.socket.info=Exception pendant la requête d'information sur le
socket.
diff --git a/java/org/apache/coyote/http11/LocalStrings_ja.properties
b/java/org/apache/coyote/http11/LocalStrings_ja.properties
index 28b31127a2..c77d8069aa 100644
--- a/java/org/apache/coyote/http11/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_ja.properties
@@ -35,6 +35,7 @@ http11processor.request.nonNumericContentLength=リクエストの
content-lengt
http11processor.request.prepare=リクエスト準備中のエラー
http11processor.request.process=リクエスト処理中のエラー
http11processor.response.finish=レスポンス終了処理のエラー
+http11processor.response.invalidHeader=値 [{1}] を持つHTTPレスポンスヘッダ [{0}]
は、無効であるためレスポンスから削除されました
http11processor.sendfile.error=sendfileを使ってデータを送信中にエラーが発生しました。これは開始点または終了点の無効なリクエスト属性によって引き起こされる可能性があります。
http11processor.socket.info=ソケット情報を取得する際の例外
diff --git a/java/org/apache/coyote/http11/LocalStrings_ko.properties
b/java/org/apache/coyote/http11/LocalStrings_ko.properties
index e0cbdd074c..aa601d72f8 100644
--- a/java/org/apache/coyote/http11/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_ko.properties
@@ -35,6 +35,7 @@ http11processor.request.nonNumericContentLength=해당 요청이 숫자가 아
http11processor.request.prepare=요청을 준비하는 중 오류 발생
http11processor.request.process=요청 처리 중 오류 발생
http11processor.response.finish=응답을 완료하는 중 오류 발생
+http11processor.response.invalidHeader=값이 [{1}]인 HTTP 응답 헤더 [{0}](이)가 유효하지 않은
값이므로 응답에서 제거되었습니다.
http11processor.sendfile.error=sendfile을 사용하여 데이터를 보내는 중 오류 발생. 시작 지점과 종료 지점을
위한 요청 속성들이 유효하지 않아 발생했을 수 있습니다.
http11processor.socket.info=소켓에 대한 정보를 얻는 중 예외 발생
diff --git a/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties
b/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties
index 76acc967fe..176a16f35f 100644
--- a/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties
@@ -35,6 +35,7 @@ http11processor.request.nonNumericContentLength=请求包含一个具有非数
http11processor.request.prepare=准备请求时出错
http11processor.request.process=错误的处理请求
http11processor.response.finish=错误完成相应
+http11processor.response.invalidHeader=HTTP响应头信息[{0}] 值[{1}]，由于无效已从响应中移除
http11processor.sendfile.error=使用sendfile发送数据时出错。可能是由于起点/终点的请求属性无效引起的
http11processor.socket.info=获取socket信息异常
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_de.properties
b/java/org/apache/tomcat/util/buf/LocalStrings_de.properties
index ac7743bee3..2220bbfc34 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_de.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_de.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-uDecoder.convertHexDigit.notHex=[{0}] ist keine hexadezimale Ziffer
+messageBytes.illegal
[tomcat] branch 8.5.x updated: Improvements to Korean translations.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 374fc7c648 Improvements to Korean translations.
374fc7c648 is described below
commit 374fc7c648e2b2891478400b55778f2931dbfec6
Author: Mark Thomas
AuthorDate: Thu Feb 2 17:06:51 2023 +
Improvements to Korean translations.
---
java/org/apache/catalina/authenticator/LocalStrings_ko.properties | 2 ++
java/org/apache/catalina/core/LocalStrings_ko.properties | 3 +++
java/org/apache/coyote/http2/LocalStrings_ko.properties | 4
java/org/apache/jasper/resources/LocalStrings_ko.properties | 1 +
java/org/apache/naming/factory/LocalStrings_ko.properties | 3 +++
java/org/apache/tomcat/util/compat/LocalStrings_ko.properties | 2 ++
java/org/apache/tomcat/websocket/LocalStrings_ko.properties | 4
webapps/docs/changelog.xml| 7 +++
8 files changed, 26 insertions(+)
diff --git a/java/org/apache/catalina/authenticator/LocalStrings_ko.properties
b/java/org/apache/catalina/authenticator/LocalStrings_ko.properties
index 257f10be58..9f13e977c2 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_ko.properties
@@ -36,11 +36,13 @@ basicAuthenticator.invalidCharset=허용된 값들은 오직 널, 빈 문자열,
digestAuthenticator.cacheRemove=새로운 엔트리들을 위한 공간을 만들기 위해, client nonce cache로부터
유효한 엔트리를 제거했습니다. 리플레이 공격이 가능해진 상태입니다. 가능성 있는 리플레이 공격들을 방지하려면, nonceValidity를 감소
시키거나, nonceCacheSize를 증가 시키십시오. 더 이상 이러한 종류의 경고 메시지들은 향후 5분 동안 나오지 않을 것입니다.
+formAuthenticator.changeSessionIdLogin=로그인 페이지로 forward하기 직전에 세션 ID가 [{0}]에서
[{1}](으)로 변경되었습니다.
formAuthenticator.forwardErrorFail=오류 페이지로 forward하는 중 예기치 않은 오류 발생
formAuthenticator.forwardLogin=메소드 [{1}]을(를) 사용한 [{0}]에 대한 요청을, 컨텍스트 [{3}]의
로그인 페이지 [{2}](으)로, GET 요청 메소드를 사용하여 forward 합니다.
formAuthenticator.forwardLoginFail=로그인 페이지로 forward하는 중 예기치 않은 오류 발생
formAuthenticator.noErrorPage=컨텍스트 [{0}]에서 폼 기반 인증을 위한 오류 페이지가 정의되지 않았습니다.
formAuthenticator.noLoginPage=컨텍스트 [{0}]에서, 폼 기반 인증을 위한 로그인 페이지가 정의되지 않았습니다.
+formAuthenticator.sessionIdMismatch=현 세션 ID는 [{0}]입니다만 FORM authenticator가
기대했던 세션 ID는 [{1}]이었습니다.
singleSignOn.debug.associate=SSO가, 애플리케이션 세션 [{1}]을(를) SSO 세션 [{0}]와(과) 연관시킵니다.
singleSignOn.debug.associateFail=SSO 세션 [{1}]이(가) 존재하지 않기 때문에, SSO가 애플리케이션 세션
[{0}]을(를) 연관시키지 못했습니다.
diff --git a/java/org/apache/catalina/core/LocalStrings_ko.properties
b/java/org/apache/catalina/core/LocalStrings_ko.properties
index fe0cf2413a..829ef374ba 100644
--- a/java/org/apache/catalina/core/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ko.properties
@@ -68,6 +68,7 @@ applicationServletRegistration.setServletSecurity.ise=컨텍스트가
이미 초
applicationSessionCookieConfig.ise=컨텍스트가 이미 초기화되었기에, 컨텍스트 [{1}]을(를) 위한
SessionCookieConfig에 프로퍼티 [{0}]이(가) 추가될 수 없습니다.
+aprListener.FIPSProviderNotDefault=AprLifecycleListener가 FIPS 모드 [{0}](으)로 설정될
때에는 반드시 FIPS 제공자가 기본 제공자로 설정되어야 합니다.
aprListener.aprDestroy=APR 기반 Apache Tomcat Native 라이브러리를 셧다운하지 못했습니다.
aprListener.aprInit=프로덕션 환경들에서 최적의 성능을 제공하는, APR 기반 Apache Tomcat Native
라이브러리가, 다음 java.library.path에서 발견되지 않습니다: [{0}]
aprListener.aprInitDebug=[{0}](이)라는 이름들을 사용하여, java.library.path [{1}]에서, APR
기반 Apache Tomcat Native 라이브러리를 찾을 수 없습니다. 보고된 오류들: [{2}]
@@ -83,12 +84,14 @@ aprListener.initializingFIPS=FIPS 모드 초기화...
aprListener.requireNotInFIPSMode=AprLifecycleListener는 라이브러리가 이미 FIPS 모드에 있어야만
하도록 설정되어 있는데, FIPS 모드에 있지 않았습니다.
aprListener.skipFIPSInitialization=이미 FIPS 모드에 있습니다. FIPS 초기화는 건너뜁니다.
aprListener.sslInit=SSLEngine을 초기화하지 못했습니다.
+aprListener.sslRequired=버전 2.x 이후로 SSL은 필수이므로, [{0}]은(는), 톰캣 Native 라이브러리 버전
[{1}] 사용 시 SSLEngine을 위해 유효한 값이 아닙니다.
aprListener.tcnInvalid=APR 기반의 Apache Tomcat Native 라이브러리가 호환되지 않는 버전
[{0}]이(가) 설치되어 있습니다. Tomcat은 버전 [{1}]을(를) 요구합니다.
aprListener.tcnValid=APR 버전 [{1}]을(를) 사용한, APR 기반 Apache Tomcat Native 라이브러리
[{0}]을(를) 로드했습니다.
aprListener.tcnVersion=APR 기반의 Apache Tomcat Native 라이브러리의 예전 버전 [{0}](이)가
설치되어 있습니다. Tomcat은 최소 버전으로서 [{1}]을(를) 추천합니다.
aprListener.tooLateForFIPSMode=setFIPSMode를 수행할 수 없습니다: SSL이 이미 초기화되었습니다.
aprListener.tooLateForSSLEngine=setSSLEngine을 호출할 수 없습니다: SSL이 이미 초기화 되었습니다.
aprListener.tooLateForSSLRandomSeed=setSSLRandomSeed를 호출할 수 없습니다: SSL이 이미
초기화되어 있습니다.
+aprListener.usingFIPSProvider=FIPS 제공자를 기본 제공자로 하는 OpenSSL을 사용 중
aprListener.wrongFIPSMode=예기치 않은 AprLifecycleListener의 FIPSMode 옵션 값: [{0}]
asyncContextImpl.asyncDispatchError=비동기 디스패치 도중 오류 발생
diff --git a/java/org/apache/coyote/http2/LocalStrings_ko.properties
b/java/org/apache/coyote/http2/LocalStrings_ko.properties
index 7855462961..20878d70d0 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ko.propert
[GitHub] [tomcat] markt-asf commented on a diff in pull request #581: Speedup by removing non pattern replaceAll with constant arg
markt-asf commented on code in PR #581:
URL: https://github.com/apache/tomcat/pull/581#discussion_r1094835289
##
java/org/apache/tomcat/buildutil/translate/Utils.java:
##
@@ -123,7 +123,7 @@ static String formatValueCommon(String in) {
result = ESCAPE_LEADING_SPACE.matcher(result).replaceAll("$1");
-result = result.replaceAll("\t", "\\t");
+result = result.replace("\t", "t");
Review Comment:
This is not correct. The literal (unescaped) replacement text should be `\t`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] branch main updated: Bump recommended APR version to 1.7.2
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-native.git The following commit(s) were added to refs/heads/main by this push: new af2252a10 Bump recommended APR version to 1.7.2 af2252a10 is described below commit af2252a10a3cabbb7e642b73306a9c7739b3b22c Author: Mark Thomas AuthorDate: Thu Feb 2 17:30:32 2023 + Bump recommended APR version to 1.7.2 --- native/srclib/VERSIONS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/native/srclib/VERSIONS b/native/srclib/VERSIONS index 41323f745..b722c9159 100644 --- a/native/srclib/VERSIONS +++ b/native/srclib/VERSIONS @@ -4,7 +4,7 @@ The current minimum versions are: The following version of the libraries are recommended: -- APR 1.7.1 or later, http://apr.apache.org +- APR 1.7.2 or later, http://apr.apache.org - OpenSSL 3.0.7 or later, http://www.openssl.org Older versions should also work but are not as thoroughly tested by the Tomcat - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] branch 1.2.x updated: Bump recommended APR version to 1.7.2
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 1.2.x in repository https://gitbox.apache.org/repos/asf/tomcat-native.git The following commit(s) were added to refs/heads/1.2.x by this push: new 8683d31c6 Bump recommended APR version to 1.7.2 8683d31c6 is described below commit 8683d31c651aa0afd8e15f2217be623245d426f3 Author: Mark Thomas AuthorDate: Thu Feb 2 17:30:49 2023 + Bump recommended APR version to 1.7.2 --- native/srclib/VERSIONS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/native/srclib/VERSIONS b/native/srclib/VERSIONS index f4acf26de..c44cddae2 100644 --- a/native/srclib/VERSIONS +++ b/native/srclib/VERSIONS @@ -4,7 +4,7 @@ The current minimum versions are: The following version of the libraries are recommended: -- APR 1.7.1 or later, http://apr.apache.org +- APR 1.7.2 or later, http://apr.apache.org - OpenSSL 1.1.1q or later, http://www.openssl.org Older versions should also work but are not as thoroughly tested by the Tomcat - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] tbw777 commented on a diff in pull request #581: Speedup by removing non pattern replaceAll with constant arg
tbw777 commented on code in PR #581:
URL: https://github.com/apache/tomcat/pull/581#discussion_r1094863229
##
java/org/apache/tomcat/buildutil/translate/Utils.java:
##
@@ -123,7 +123,7 @@ static String formatValueCommon(String in) {
result = ESCAPE_LEADING_SPACE.matcher(result).replaceAll("$1");
-result = result.replaceAll("\t", "\\t");
+result = result.replace("\t", "t");
Review Comment:
The second argument in replaceAll means escape t, not \t.
You can check proofs tests. equals returning true if replace maked to t, not
\t
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on a diff in pull request #581: Speedup by removing non pattern replaceAll with constant arg
markt-asf commented on code in PR #581:
URL: https://github.com/apache/tomcat/pull/581#discussion_r1094884701
##
java/org/apache/tomcat/buildutil/translate/Utils.java:
##
@@ -123,7 +123,7 @@ static String formatValueCommon(String in) {
result = ESCAPE_LEADING_SPACE.matcher(result).replaceAll("$1");
-result = result.replaceAll("\t", "\\t");
+result = result.replace("\t", "t");
Review Comment:
It is a bug in the original code. It should be replacing all tabs with the
literal string `\t`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on a diff in pull request #581: Speedup by removing non pattern replaceAll with constant arg
markt-asf commented on code in PR #581:
URL: https://github.com/apache/tomcat/pull/581#discussion_r1094893763
##
java/org/apache/tomcat/buildutil/translate/Utils.java:
##
@@ -123,7 +123,7 @@ static String formatValueCommon(String in) {
result = ESCAPE_LEADING_SPACE.matcher(result).replaceAll("$1");
-result = result.replaceAll("\t", "\\t");
+result = result.replace("\t", "t");
Review Comment:
For the record, none of the current i18n strings use tabs. I did find some
messages using them in early 7.0.x versions, but those messages were never
referenced in the Java code.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] tbw777 commented on pull request #581: Speedup by removing non pattern replaceAll with constant arg
tbw777 commented on PR #581: URL: https://github.com/apache/tomcat/pull/581#issuecomment-1414189316 @markt-asf Branch was updated and https://gist.github.com/tbw777/8a6ef60af21487c5faec67037099fd0b also Check please. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] gksxodnd007 commented on pull request #579: Add activateDropConnection config to choose drop connection by http status code
gksxodnd007 commented on PR #579: URL: https://github.com/apache/tomcat/pull/579#issuecomment-1414693058 @markt-asf I see the reactor netty code to check how they close the connection when the current request was not fully read. they also close the connection even though that is keep-alive, when the decode processing of the request failed. how about adding defensive code to prevent the request smuggling risks? if I add the code, would you reconsider about dropping the connection by HTTP status code? ref: - https://github.com/reactor/reactor-netty/blob/c71ebe4372f35496eb04471355ea84739bc6381a/reactor-netty-http/src/main/java/reactor/netty/http/server/HttpTrafficHandler.java#L193-L197 - https://github.com/reactor/reactor-netty/blob/c71ebe4372f35496eb04471355ea84739bc6381a/reactor-netty-http/src/main/java/reactor/netty/http/server/HttpTrafficHandler.java#L280-L283 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Restore ISE catching behavior
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 10733c4228 Restore ISE catching behavior
10733c4228 is described below
commit 10733c4228daece83195bb553ed97cf5996714f0
Author: remm
AuthorDate: Thu Feb 2 10:25:53 2023 +0100
Restore ISE catching behavior
This looks like a Java defect though: IOE is caught and returns false,
while ISE is undocumented and simply falls out of the innocuous looking
call. Workaround to restore the previous behavior and assume false.
---
java/org/apache/tomcat/util/scan/JarFileUrlJar.java | 11 ++-
webapps/docs/changelog.xml | 5 +
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/scan/JarFileUrlJar.java
b/java/org/apache/tomcat/util/scan/JarFileUrlJar.java
index 6b248021a3..b482f45033 100644
--- a/java/org/apache/tomcat/util/scan/JarFileUrlJar.java
+++ b/java/org/apache/tomcat/util/scan/JarFileUrlJar.java
@@ -65,7 +65,16 @@ public class JarFileUrlJar implements Jar {
jarFile = new JarFile(f, true, ZipFile.OPEN_READ,
Runtime.version());
jarFileURL = url;
}
-multiRelease = jarFile.isMultiRelease();
+boolean multiReleaseValue = false;
+try {
+multiReleaseValue = jarFile.isMultiRelease();
+} catch (IllegalStateException e) {
+// ISE can be thrown if the JAR URL is bad, for example:
+// https://github.com/spring-projects/spring-boot/issues/33633
+// The Javadoc does not document that ISE and given what it does
for a vanilla IOE,
+// this looks like a Java bug, it should return false instead.
+}
+multiRelease = multiReleaseValue;
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index bb3e009784..acac9b56be 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -155,6 +155,11 @@
and any data remaining to be written is written in the background by
the
container. (markt)
+
+Avoid possible ISE when scanning from bad JAR URLs, to restore the
+previous behavior following the removal of Java 9+ reflection code
which
+caught the ISE. (remm)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Restore ISE catching behavior
This is an automated email from the ASF dual-hosted git repository.
remm 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 0fb9397ff9 Restore ISE catching behavior
0fb9397ff9 is described below
commit 0fb9397ff90ee9ca8090f3da3da4c58ae353a442
Author: remm
AuthorDate: Thu Feb 2 10:25:53 2023 +0100
Restore ISE catching behavior
This looks like a Java defect though: IOE is caught and returns false,
while ISE is undocumented and simply falls out of the innocuous looking
call. Workaround to restore the previous behavior and assume false.
---
java/org/apache/tomcat/util/scan/JarFileUrlJar.java | 11 ++-
webapps/docs/changelog.xml | 5 +
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/scan/JarFileUrlJar.java
b/java/org/apache/tomcat/util/scan/JarFileUrlJar.java
index 6b248021a3..b482f45033 100644
--- a/java/org/apache/tomcat/util/scan/JarFileUrlJar.java
+++ b/java/org/apache/tomcat/util/scan/JarFileUrlJar.java
@@ -65,7 +65,16 @@ public class JarFileUrlJar implements Jar {
jarFile = new JarFile(f, true, ZipFile.OPEN_READ,
Runtime.version());
jarFileURL = url;
}
-multiRelease = jarFile.isMultiRelease();
+boolean multiReleaseValue = false;
+try {
+multiReleaseValue = jarFile.isMultiRelease();
+} catch (IllegalStateException e) {
+// ISE can be thrown if the JAR URL is bad, for example:
+// https://github.com/spring-projects/spring-boot/issues/33633
+// The Javadoc does not document that ISE and given what it does
for a vanilla IOE,
+// this looks like a Java bug, it should return false instead.
+}
+multiRelease = multiReleaseValue;
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7e3c90d07c..2ec2ca0c4f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -119,6 +119,11 @@
Switch to using the ServiceLoader mechanism to load the custom URL
protocol handlers that Tomcat uses. (markt)
+
+Avoid possible ISE when scanning from bad JAR URLs, to restore the
+previous behavior following the removal of Java 9+ reflection code
which
+caught the ISE. (remm)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot success in on tomcat-11.0.x
Build status: Build succeeded! Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/112/builds/169 Blamelist: Mark Thomas , remm Build Text: build successful Status Detected: restored build Build Source Stamp: [branch main] 10733c4228daece83195bb553ed97cf5996714f0 Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 1 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] gksxodnd007 opened a new pull request, #579: Add activateDropConnection config to choose drop connection by http status code
gksxodnd007 opened a new pull request, #579: URL: https://github.com/apache/tomcat/pull/579 when response http status code is `400, 408, 411, 413, 414, 500, 501, 503`, the connecton is closed by tomcat even though that is keep-alive. undertow and jetty and netty don't close keep-alive connection unlike tomcat. i believe that it can be optional feature. + our service run on kubernetes and we use istio as service mesh. so tomcat only connects to sidecar. we don't need to frequently close the connection for easily load balancing or other reason. the first image is before remove statusDropsConnection method, and the second image is after that. (upstream connection count means creating new connection count) https://user-images.githubusercontent.com/27043428/216298213-473d96bb-ac64-4129-a7ae-3304b835a0fa.png";> https://user-images.githubusercontent.com/27043428/216298292-9e00b5d4-70c0-4fe9-8bf7-791b17ce3018.png";> -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] rmaucher commented on pull request #579: Add activateDropConnection config to choose drop connection by http status code
rmaucher commented on PR #579: URL: https://github.com/apache/tomcat/pull/579#issuecomment-1413524460 Ok why not, but "activateDropConnection" does not sound very good. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #579: Add activateDropConnection config to choose drop connection by http status code
markt-asf commented on PR #579: URL: https://github.com/apache/tomcat/pull/579#issuecomment-1413624082 -1. veto. I have security concerns. The connection is dropped in error conditions to avoid request smuggling risks. Of the status codes lists, the only one we might be able to handle safely is 503 and that would require changes to ensure that the current request was fully swallowed before processing the next request. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] gksxodnd007 commented on pull request #579: Add activateDropConnection config to choose drop connection by http status code
gksxodnd007 commented on PR #579: URL: https://github.com/apache/tomcat/pull/579#issuecomment-1413675074 @markt-asf thank you for your good opinion. but I think, it is no need to force drop connections. also, the default action is not changing by setting false the value. and some situations will be safe like just connecting to the only sidecar because the risk is preserved by the sidecar or other proxy server. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] tbw777 opened a new pull request, #580: Speedup by removing non pattern replaceAll with constant arg
tbw777 opened a new pull request, #580:
URL: https://github.com/apache/tomcat/pull/580
replaceAll("ABC", "") is non Pattern method and therefore must be replaced
to simple fast replace()
A proofs of changes:
https://gist.github.com/tbw777/8a6ef60af21487c5faec67037099fd0b
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] tbw777 closed pull request #580: Speedup by removing non pattern replaceAll with constant arg
tbw777 closed pull request #580: Speedup by removing non pattern replaceAll with constant arg URL: https://github.com/apache/tomcat/pull/580 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] tbw777 opened a new pull request, #581: Speedup by removing non pattern replaceAll with constant arg
tbw777 opened a new pull request, #581:
URL: https://github.com/apache/tomcat/pull/581
replaceAll("ABC", "") is non Pattern method and therefore must be replaced
to simple fast replace()
A proofs of changes:
https://gist.github.com/tbw777/8a6ef60af21487c5faec67037099fd0b
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] dongseokk commented on pull request #579: Add activateDropConnection config to choose drop connection by http status code
dongseokk commented on PR #579: URL: https://github.com/apache/tomcat/pull/579#issuecomment-1413769699 > -1. veto. I have security concerns. The connection is dropped in error conditions to avoid request smuggling risks. Of the status codes lists, the only one we might be able to handle safely is 503 and that would require changes to ensure that the current request was fully swallowed before processing the next request. The security concerns make sense, but I think users may want to opt out. The concerns would be mitigated fairly if the default behavior is dropping. Users will explicitly disable it only when they know what they are doing. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Drop xml prolog from DTD as it's not needed and causing the file to be flagged as malformed by xml validators
This is an automated email from the ASF dual-hosted git repository. csutherl 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 6c05e1cfb5 Drop xml prolog from DTD as it's not needed and causing the file to be flagged as malformed by xml validators 6c05e1cfb5 is described below commit 6c05e1cfb5fca9ac99438a284ebd9788743f07b0 Author: Coty Sutherland AuthorDate: Thu Feb 2 09:01:44 2023 -0500 Drop xml prolog from DTD as it's not needed and causing the file to be flagged as malformed by xml validators --- java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd | 1 - 1 file changed, 1 deletion(-) diff --git a/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd b/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd index 28c4d129cb..4c1f523635 100644 --- a/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd +++ b/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd @@ -1,4 +1,3 @@ -
[GitHub] [tomcat] markt-asf commented on pull request #579: Add activateDropConnection config to choose drop connection by http status code
markt-asf commented on PR #579: URL: https://github.com/apache/tomcat/pull/579#issuecomment-1413798605 - 400 Always unsafe to continue since if you have a badly formatted request you can't tell where that request ends and the next one starts. - 408 Always unsafe to continue since the current request was not fully read - 411 Likely unsafe since the only reason for asking for a length is if you can't work it out. However, Tomcat never uses this status code so the point is moot. - 413 Unsafe since it is likely that the request will not be read fully - 414 Unsafe since it is likely that the request will not be read fully - 500 Unsafe since the request processing is in an unknown state - 503 Safe if, and only if, the request is fully read - 501 Safe if, and only if, the request is fully read If the change was limited to 501 and 503 and if it is confirmed that Tomcat reads the request fully in those cases (or there are changes to ensure that this is the case) then I'd be willing to reconsider my veto. I'd suggest, at this point, the OP's time would be better spent determining which status codes are triggering the observed connection closures and addressing the associated root cause(s). -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] hojongs commented on pull request #579: Add activateDropConnection config to choose drop connection by http status code
hojongs commented on PR #579: URL: https://github.com/apache/tomcat/pull/579#issuecomment-1413855117 @markt-asf I get what you mean. But some people (including me) usually use the status codes with additional cases. For example, the status code 400 doesn't occur only in the badly formatted request. When requests are formatted well but the request value is incorrect, I use the status code 400 to respond to the request. (because I think the status code 400 is the most suitable in this case) and another use case: Sometimes our service can respond to clients with status code 500 during connections because of some reasons. In these cases, I don't want decreased performance by dropping connections due to responses of the status code 500 even though I need to endure the security concerns you mentioned. So I want this option to choose control over the default behavior. I think it'll be fine if users can have the opportunity to choose the behavior while the default behavior is dropping connection for the security concern you mentioned. It'll be safer for servers to drop connections as the default behavior. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot success in on tomcat-9.0.x
Build status: Build succeeded! Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/37/builds/441 Blamelist: Coty Sutherland , Mark Thomas Build Text: build successful Status Detected: restored build Build Source Stamp: [branch 9.0.x] 6c05e1cfb5fca9ac99438a284ebd9788743f07b0 Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 1 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated (10733c4228 -> 3c710a8919)
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 10733c4228 Restore ISE catching behavior
new 1cf60d6e99 Improvements to Chinese translations
new b475c9be3f Improvements to French translations
new b7b6dd756c Improvements to Japanese translations. Contributed by
tak7iji.
new 3c710a8919 Improvements to Korean translations.
The 4 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:
.../catalina/authenticator/LocalStrings_ko.properties | 2 ++
.../apache/catalina/connector/LocalStrings_fr.properties | 1 +
.../apache/catalina/connector/LocalStrings_ja.properties | 1 +
.../apache/catalina/connector/LocalStrings_ko.properties | 1 +
java/org/apache/catalina/core/LocalStrings_ko.properties | 3 +++
java/org/apache/coyote/http11/LocalStrings_ko.properties | 1 +
java/org/apache/coyote/http2/LocalStrings_ko.properties| 4
.../org/apache/jasper/resources/LocalStrings_ko.properties | 1 +
java/org/apache/naming/factory/LocalStrings_ko.properties | 3 +++
.../apache/tomcat/util/compat}/LocalStrings_ko.properties | 2 +-
.../tomcat/util/http/parser/LocalStrings_fr.properties | 14 ++
.../tomcat/util/http/parser/LocalStrings_ja.properties | 14 ++
.../tomcat/util/http/parser/LocalStrings_ko.properties | 14 ++
.../tomcat/util/http/parser/LocalStrings_zh_CN.properties | 6 ++
.../org/apache/tomcat/websocket/LocalStrings_ko.properties | 4
webapps/docs/changelog.xml | 12
16 files changed, 82 insertions(+), 1 deletion(-)
copy java/{jakarta/servlet/jsp =>
org/apache/tomcat/util/compat}/LocalStrings_ko.properties (84%)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/04: Improvements to Chinese translations
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 1cf60d6e9909f2514641bc65adcb5194f9b02ea7
Author: Mark Thomas
AuthorDate: Thu Feb 2 14:42:36 2023 +
Improvements to Chinese translations
---
.../apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties| 6 ++
webapps/docs/changelog.xml | 3 +++
2 files changed, 9 insertions(+)
diff --git
a/java/org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties
b/java/org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties
index 8b44e84838..4532e0155c 100644
--- a/java/org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties
@@ -44,3 +44,9 @@ http.tooFewHextets=一个IPv6地址必须包含8个16进制数，但是这个IP
http.tooManyColons=IPv6地址不能包含超过2个连续冒号字符。
http.tooManyDoubleColons=一个IPv6地址只能包含一个 '::' 序列。
http.tooManyHextets=IPv6地址包含[{0}]个十六进制数，但有效的IPv6地址不能超过8个。
+
+sf.base64.invalidCharacter=[{0}]字符在base64序列中无效
+sf.boolean.invalidCharacter=[{0}]字符不是有效布尔值
+sf.invalidCharacter=[{0}]字符在这里无效
+sf.numeric.decimalInvalidFinal=十进制最后一个字符必须是数字
+sf.numeric.decimalPartTooLong=小数点后超过3位
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index acac9b56be..f9364fe907 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -195,6 +195,9 @@
Remove support for starting Tomcat under a SecurityManager. (markt)
+
+Improvements to Chinese translations. (lihan)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
