[tomcat] branch 10.0.x updated: Make it more obvious which test is which

[markt]

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

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new 859b77ae70 Make it more obvious which test is which
859b77ae70 is described below

commit 859b77ae70b7617035d864b4e29785229be2c908
Author: Mark Thomas 
AuthorDate: Mon Sep 5 10:52:51 2022 +0100

Make it more obvious which test is which
---
 test/org/apache/juli/TestAsyncFileHandlerOverflow.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/org/apache/juli/TestAsyncFileHandlerOverflow.java 
b/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
index bf67dc6ddc..48874b457b 100644
--- a/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
+++ b/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
@@ -53,7 +53,7 @@ public class TestAsyncFileHandlerOverflow {
 logger.setUseParentHandlers(false);
 }
 
-@Parameters
+@Parameters(name = "{index}: overflowDropType[{0}]")
 public static Collection parameters() {
 return Arrays.asList(new Object[][] {
 { Integer.valueOf(AsyncFileHandler.OVERFLOW_DROP_LAST), 
"START\n1\n3\n" },


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

[tomcat] branch main updated: Make it more obvious which test is which

[markt]

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

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


The following commit(s) were added to refs/heads/main by this push:
 new 4ead5a5689 Make it more obvious which test is which
4ead5a5689 is described below

commit 4ead5a5689d5c5d405cf0852b5baadb517cefbe7
Author: Mark Thomas 
AuthorDate: Mon Sep 5 10:52:51 2022 +0100

Make it more obvious which test is which
---
 test/org/apache/juli/TestAsyncFileHandlerOverflow.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/org/apache/juli/TestAsyncFileHandlerOverflow.java 
b/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
index bf67dc6ddc..48874b457b 100644
--- a/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
+++ b/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
@@ -53,7 +53,7 @@ public class TestAsyncFileHandlerOverflow {
 logger.setUseParentHandlers(false);
 }
 
-@Parameters
+@Parameters(name = "{index}: overflowDropType[{0}]")
 public static Collection parameters() {
 return Arrays.asList(new Object[][] {
 { Integer.valueOf(AsyncFileHandler.OVERFLOW_DROP_LAST), 
"START\n1\n3\n" },


-
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: Back-port updates to translations

[markt]

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 693a92848e Back-port updates to translations
693a92848e is described below

commit 693a92848e96a423bb0a3ad7c3ddc7a9976024d6
Author: Mark Thomas 
AuthorDate: Mon Sep 5 11:14:45 2022 +0100

Back-port updates to translations
---
 .../authenticator/LocalStrings_ja.properties   |  2 ++
 .../authenticator/LocalStrings_zh_CN.properties|  9 +---
 .../jaspic/LocalStrings_zh_CN.properties   |  2 +-
 .../catalina/core/LocalStrings_fr.properties   |  2 ++
 .../catalina/core/LocalStrings_ja.properties   |  2 ++
 .../catalina/core/LocalStrings_ko.properties   |  1 +
 .../catalina/core/LocalStrings_zh_CN.properties| 12 +++
 .../catalina/filters/LocalStrings_ja.properties|  2 +-
 .../catalina/filters/LocalStrings_zh_CN.properties |  4 ++--
 .../ha/session/LocalStrings_zh_CN.properties   |  6 +++---
 .../catalina/loader/LocalStrings_ja.properties |  2 +-
 .../catalina/realm/LocalStrings_zh_CN.properties   |  6 +++---
 .../catalina/ssi/LocalStrings_zh_CN.properties |  2 +-
 .../catalina/startup/LocalStrings_zh_CN.properties |  2 +-
 .../storeconfig/LocalStrings_zh_CN.properties  |  2 +-
 .../group/interceptors/LocalStrings_ja.properties  |  2 +-
 .../membership/LocalStrings_zh_CN.properties   |  4 ++--
 .../tribes/tipis/LocalStrings_ja.properties|  2 +-
 .../tribes/transport/LocalStrings_ja.properties|  2 +-
 .../catalina/valves/LocalStrings_ja.properties |  2 +-
 .../webresources/LocalStrings_zh_CN.properties |  2 +-
 java/org/apache/coyote/LocalStrings_ja.properties  |  2 +-
 .../coyote/http11/LocalStrings_zh_CN.properties|  6 +++---
 .../apache/coyote/http2/LocalStrings_ja.properties |  3 +++
 .../coyote/http2/LocalStrings_zh_CN.properties | 12 +--
 .../jasper/resources/LocalStrings_ja.properties|  4 ++--
 .../jasper/resources/LocalStrings_zh_CN.properties |  2 +-
 .../naming/factory/LocalStrings_ko.properties  |  3 +++
 .../naming/factory/LocalStrings_zh_CN.properties   |  6 ++
 .../util/compat/LocalStrings_zh_CN.properties  |  2 ++
 .../util/digester/LocalStrings_zh_CN.properties|  4 ++--
 .../util/http/parser/LocalStrings_zh_CN.properties |  2 +-
 .../tomcat/util/net/LocalStrings_fr.properties |  2 +-
 .../tomcat/util/net/LocalStrings_ja.properties |  2 +-
 .../tomcat/util/net/LocalStrings_ko.properties |  2 +-
 .../tomcat/util/net/LocalStrings_zh_CN.properties  |  8 ---
 .../util/net/openssl/LocalStrings_zh_CN.properties |  4 ++--
 .../tomcat/websocket/LocalStrings_cs.properties|  2 +-
 .../tomcat/websocket/LocalStrings_de.properties|  2 +-
 .../tomcat/websocket/LocalStrings_es.properties|  2 +-
 .../tomcat/websocket/LocalStrings_fr.properties|  2 +-
 .../tomcat/websocket/LocalStrings_ja.properties|  2 +-
 .../tomcat/websocket/LocalStrings_ru.properties|  2 +-
 .../tomcat/websocket/LocalStrings_zh_CN.properties |  6 +++---
 webapps/docs/changelog.xml | 25 ++
 45 files changed, 116 insertions(+), 61 deletions(-)

diff --git a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties 
b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
index de814db2b0..b2e510981e 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
@@ -36,11 +36,13 @@ basicAuthenticator.invalidCharset=指定できる値は、null、空の文字列
 
 
digestAuthenticator.cacheRemove=有効なエントリがクライアントのnonceキャッシュから削除され、新しいエントリのためのスペースが確保されました。
 リプレイ攻撃が可能になりました。 リプレイ攻撃の可能性を防ぐには、nonceValidityを減らすか、nonceCacheSizeを増やしてください。 
このタイプの警告は5分間表示されなくなります。
 
+formAuthenticator.changeSessionIdLogin=FORM 認証でログイン ページに転送する前に、セッション ID が 
[{0}] から [{1}] に変更されました
 formAuthenticator.forwardErrorFail=エラーページへ転送中の予期せぬエラー
 formAuthenticator.forwardLogin=リクエストメソッドGETを使用してコンテキスト [{3}] のページ [{2}] にメソッド 
[{1}] で行われた [{0}] の要求をフォワードします
 formAuthenticator.forwardLoginFail=ログインページへの転送での予期しないエラー
 formAuthenticator.noErrorPage=コンテキスト [{0}] のFORM認証にエラーページが定義されていません
 formAuthenticator.noLoginPage=コンテキスト [{0}] のFORM認証にログインページが定義されていません
+formAuthenticator.sessionIdMismatch=現在のセッションIDは [{0}] ですが、FORM認証 は [{1}] 
を期待していました
 
 singleSignOn.debug.associate=SSOはアプリケーションセッション[{1}]をSSOセッション[{0}]に関連付けます
 
singleSignOn.debug.associateFail=SSOセッション[{1}]が存在しないため、SSOはアプリケーションセッション[{0}]を関連付けられませんでした。
diff --git 
a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
index f74c009e8b..17a8983c1e 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
@@ -14,7 +14,7 @@
 # limitat

[tomcat] branch 9.0.x updated: Make it more obvious which test is which

[markt]

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 720858b0f3 Make it more obvious which test is which
720858b0f3 is described below

commit 720858b0f312822faba873a39e4ae54169c9d421
Author: Mark Thomas 
AuthorDate: Mon Sep 5 10:52:51 2022 +0100

Make it more obvious which test is which
---
 test/org/apache/juli/TestAsyncFileHandlerOverflow.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/org/apache/juli/TestAsyncFileHandlerOverflow.java 
b/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
index bf67dc6ddc..48874b457b 100644
--- a/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
+++ b/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
@@ -53,7 +53,7 @@ public class TestAsyncFileHandlerOverflow {
 logger.setUseParentHandlers(false);
 }
 
-@Parameters
+@Parameters(name = "{index}: overflowDropType[{0}]")
 public static Collection parameters() {
 return Arrays.asList(new Object[][] {
 { Integer.valueOf(AsyncFileHandler.OVERFLOW_DROP_LAST), 
"START\n1\n3\n" },


-
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: Back-port translation updates

[markt]

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new a978b1a7bc Back-port translation updates
a978b1a7bc is described below

commit a978b1a7bc6d12d2a0c7648f21a396a816a46fa0
Author: Mark Thomas 
AuthorDate: Mon Sep 5 11:22:54 2022 +0100

Back-port translation updates
---
 .../authenticator/LocalStrings_ja.properties   |  2 ++
 .../authenticator/LocalStrings_zh_CN.properties|  9 ++---
 .../jaspic/LocalStrings_zh_CN.properties   |  2 +-
 .../catalina/core/LocalStrings_fr.properties   |  2 ++
 .../catalina/core/LocalStrings_ja.properties   |  2 ++
 .../catalina/core/LocalStrings_ko.properties   |  1 +
 .../catalina/core/LocalStrings_zh_CN.properties| 12 
 .../catalina/filters/LocalStrings_ja.properties|  2 +-
 .../catalina/filters/LocalStrings_zh_CN.properties |  4 ++--
 .../ha/session/LocalStrings_zh_CN.properties   |  6 +++---
 .../catalina/loader/LocalStrings_ja.properties |  2 +-
 .../catalina/realm/LocalStrings_zh_CN.properties   |  6 +++---
 .../catalina/startup/LocalStrings_zh_CN.properties |  2 +-
 .../storeconfig/LocalStrings_zh_CN.properties  |  2 +-
 .../group/interceptors/LocalStrings_ja.properties  |  2 +-
 .../membership/LocalStrings_zh_CN.properties   |  4 ++--
 .../tribes/tipis/LocalStrings_ja.properties|  2 +-
 .../tribes/transport/LocalStrings_ja.properties|  2 +-
 .../catalina/valves/LocalStrings_ja.properties |  2 +-
 .../webresources/LocalStrings_zh_CN.properties |  2 +-
 java/org/apache/coyote/LocalStrings_ja.properties  |  2 +-
 .../coyote/http11/LocalStrings_zh_CN.properties|  6 +++---
 .../apache/coyote/http2/LocalStrings_ja.properties |  3 +++
 .../coyote/http2/LocalStrings_zh_CN.properties | 12 ++--
 .../jasper/resources/LocalStrings_ja.properties|  2 +-
 .../jasper/resources/LocalStrings_zh_CN.properties |  2 +-
 .../naming/factory/LocalStrings_ko.properties  |  3 +++
 .../naming/factory/LocalStrings_zh_CN.properties   |  6 ++
 .../util/compat/LocalStrings_zh_CN.properties  |  2 ++
 .../util/http/parser/LocalStrings_zh_CN.properties |  2 +-
 .../tomcat/util/net/LocalStrings_fr.properties |  2 +-
 .../tomcat/util/net/LocalStrings_ja.properties |  2 +-
 .../tomcat/util/net/LocalStrings_ko.properties |  2 +-
 .../tomcat/util/net/LocalStrings_zh_CN.properties  |  8 +---
 .../util/net/openssl/LocalStrings_zh_CN.properties |  4 ++--
 .../tomcat/websocket/LocalStrings_de.properties|  2 +-
 .../tomcat/websocket/LocalStrings_es.properties|  2 +-
 .../tomcat/websocket/LocalStrings_fr.properties|  2 +-
 .../tomcat/websocket/LocalStrings_ja.properties|  2 +-
 .../tomcat/websocket/LocalStrings_ru.properties|  2 +-
 .../tomcat/websocket/LocalStrings_zh_CN.properties |  6 +++---
 webapps/docs/changelog.xml | 22 ++
 42 files changed, 108 insertions(+), 56 deletions(-)

diff --git a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties 
b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
index de814db2b0..b2e510981e 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
@@ -36,11 +36,13 @@ basicAuthenticator.invalidCharset=指定できる値は、null、空の文字列
 
 
digestAuthenticator.cacheRemove=有効なエントリがクライアントのnonceキャッシュから削除され、新しいエントリのためのスペースが確保されました。
 リプレイ攻撃が可能になりました。 リプレイ攻撃の可能性を防ぐには、nonceValidityを減らすか、nonceCacheSizeを増やしてください。 
このタイプの警告は5分間表示されなくなります。
 
+formAuthenticator.changeSessionIdLogin=FORM 認証でログイン ページに転送する前に、セッション ID が 
[{0}] から [{1}] に変更されました
 formAuthenticator.forwardErrorFail=エラーページへ転送中の予期せぬエラー
 formAuthenticator.forwardLogin=リクエストメソッドGETを使用してコンテキスト [{3}] のページ [{2}] にメソッド 
[{1}] で行われた [{0}] の要求をフォワードします
 formAuthenticator.forwardLoginFail=ログインページへの転送での予期しないエラー
 formAuthenticator.noErrorPage=コンテキスト [{0}] のFORM認証にエラーページが定義されていません
 formAuthenticator.noLoginPage=コンテキスト [{0}] のFORM認証にログインページが定義されていません
+formAuthenticator.sessionIdMismatch=現在のセッションIDは [{0}] ですが、FORM認証 は [{1}] 
を期待していました
 
 singleSignOn.debug.associate=SSOはアプリケーションセッション[{1}]をSSOセッション[{0}]に関連付けます
 
singleSignOn.debug.associateFail=SSOセッション[{1}]が存在しないため、SSOはアプリケーションセッション[{0}]を関連付けられませんでした。
diff --git 
a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
index f74c009e8b..17a8983c1e 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 authenticator.certificates=此请求中没有客户端证书链
-authenticator.changeSessionId=在身份验证时, 会话 ID 从 [{0} 更改为 [{1}]
+authenticator.changeSessionId=在身份验证时, 会话 ID 从 [{0}] 更改为 [{

[tomcat] branch 8.5.x updated: Make it more obvious which test is which

[markt]

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 7b4d41842a Make it more obvious which test is which
7b4d41842a is described below

commit 7b4d41842aa013e85a247559e1b78b71f235652f
Author: Mark Thomas 
AuthorDate: Mon Sep 5 10:52:51 2022 +0100

Make it more obvious which test is which
---
 test/org/apache/juli/TestAsyncFileHandlerOverflow.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/org/apache/juli/TestAsyncFileHandlerOverflow.java 
b/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
index 8bb8903af4..73bc7c65dd 100644
--- a/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
+++ b/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
@@ -55,7 +55,7 @@ public class TestAsyncFileHandlerOverflow {
 logger.setUseParentHandlers(false);
 }
 
-@Parameters
+@Parameters(name = "{index}: overflowDropType[{0}]")
 public static Collection parameters() {
 return Arrays.asList(new Object[][] {
 { Integer.valueOf(AsyncFileHandler.OVERFLOW_DROP_LAST), 
"START\n1\n3\n" },


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

[tomcat] branch main updated: Make test more robust (CI failure observed for 8.5.x)

[markt]

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

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


The following commit(s) were added to refs/heads/main by this push:
 new 0e099db5df Make test more robust (CI failure observed for 8.5.x)
0e099db5df is described below

commit 0e099db5df2f08e1e214c4203bc379a03cf3f88a
Author: Mark Thomas 
AuthorDate: Mon Sep 5 13:52:37 2022 +0100

Make test more robust (CI failure observed for 8.5.x)
---
 test/org/apache/juli/TestAsyncFileHandlerOverflow.java | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/test/org/apache/juli/TestAsyncFileHandlerOverflow.java 
b/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
index 48874b457b..a7d2435a3f 100644
--- a/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
+++ b/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
@@ -105,8 +105,16 @@ public class TestAsyncFileHandlerOverflow {
 
 @Override
 public void rejectedExecution(Runnable r, ThreadPoolExecutor 
executor) {
-latch.countDown();
+// Generally, the latch needs to be released after the
+// RejectedExecutionHandler has completed but for the flush 
case
+// the latch needs to be released first (else the test loops)
+if (overflowDropType == AsyncFileHandler.OVERFLOW_DROP_FLUSH) {
+latch.countDown();
+}
 rejectionHandler.rejectedExecution(r, executor);
+if (overflowDropType != AsyncFileHandler.OVERFLOW_DROP_FLUSH) {
+latch.countDown();
+}
 }
 });
 this.handler = new AsyncFileHandler(logsDir.toString(), PREFIX, 
SUFFIX, Integer.valueOf(1), loggerService);


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

[tomcat] branch 10.0.x updated: Make test more robust (CI failure observed for 8.5.x)

[markt]

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

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new 3c0e408684 Make test more robust (CI failure observed for 8.5.x)
3c0e408684 is described below

commit 3c0e40868461e87b9b153241a1df2d41010c4aa4
Author: Mark Thomas 
AuthorDate: Mon Sep 5 13:52:37 2022 +0100

Make test more robust (CI failure observed for 8.5.x)
---
 test/org/apache/juli/TestAsyncFileHandlerOverflow.java | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/test/org/apache/juli/TestAsyncFileHandlerOverflow.java 
b/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
index 48874b457b..a7d2435a3f 100644
--- a/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
+++ b/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
@@ -105,8 +105,16 @@ public class TestAsyncFileHandlerOverflow {
 
 @Override
 public void rejectedExecution(Runnable r, ThreadPoolExecutor 
executor) {
-latch.countDown();
+// Generally, the latch needs to be released after the
+// RejectedExecutionHandler has completed but for the flush 
case
+// the latch needs to be released first (else the test loops)
+if (overflowDropType == AsyncFileHandler.OVERFLOW_DROP_FLUSH) {
+latch.countDown();
+}
 rejectionHandler.rejectedExecution(r, executor);
+if (overflowDropType != AsyncFileHandler.OVERFLOW_DROP_FLUSH) {
+latch.countDown();
+}
 }
 });
 this.handler = new AsyncFileHandler(logsDir.toString(), PREFIX, 
SUFFIX, Integer.valueOf(1), loggerService);


-
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: Make test more robust (CI failure observed for 8.5.x)

[markt]

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 4d6f883fa4 Make test more robust (CI failure observed for 8.5.x)
4d6f883fa4 is described below

commit 4d6f883fa47f32397686551c99e936a75536904a
Author: Mark Thomas 
AuthorDate: Mon Sep 5 13:52:37 2022 +0100

Make test more robust (CI failure observed for 8.5.x)
---
 test/org/apache/juli/TestAsyncFileHandlerOverflow.java | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/test/org/apache/juli/TestAsyncFileHandlerOverflow.java 
b/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
index 73bc7c65dd..f646a90c13 100644
--- a/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
+++ b/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
@@ -107,8 +107,16 @@ public class TestAsyncFileHandlerOverflow {
 
 @Override
 public void rejectedExecution(Runnable r, ThreadPoolExecutor 
executor) {
-latch.countDown();
+// Generally, the latch needs to be released after the
+// RejectedExecutionHandler has completed but for the flush 
case
+// the latch needs to be released first (else the test loops)
+if (overflowDropType == AsyncFileHandler.OVERFLOW_DROP_FLUSH) {
+latch.countDown();
+}
 rejectionHandler.rejectedExecution(r, executor);
+if (overflowDropType != AsyncFileHandler.OVERFLOW_DROP_FLUSH) {
+latch.countDown();
+}
 }
 });
 this.handler = new AsyncFileHandler(logsDir.toString(), PREFIX, 
SUFFIX, 1, loggerService);


-
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: Make test more robust (CI failure observed for 8.5.x)

[markt]

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 94aa3fca0c Make test more robust (CI failure observed for 8.5.x)
94aa3fca0c is described below

commit 94aa3fca0cb21010dc3a24bfc7df98401c2ade0a
Author: Mark Thomas 
AuthorDate: Mon Sep 5 13:52:37 2022 +0100

Make test more robust (CI failure observed for 8.5.x)
---
 test/org/apache/juli/TestAsyncFileHandlerOverflow.java | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/test/org/apache/juli/TestAsyncFileHandlerOverflow.java 
b/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
index 48874b457b..a7d2435a3f 100644
--- a/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
+++ b/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
@@ -105,8 +105,16 @@ public class TestAsyncFileHandlerOverflow {
 
 @Override
 public void rejectedExecution(Runnable r, ThreadPoolExecutor 
executor) {
-latch.countDown();
+// Generally, the latch needs to be released after the
+// RejectedExecutionHandler has completed but for the flush 
case
+// the latch needs to be released first (else the test loops)
+if (overflowDropType == AsyncFileHandler.OVERFLOW_DROP_FLUSH) {
+latch.countDown();
+}
 rejectionHandler.rejectedExecution(r, executor);
+if (overflowDropType != AsyncFileHandler.OVERFLOW_DROP_FLUSH) {
+latch.countDown();
+}
 }
 });
 this.handler = new AsyncFileHandler(logsDir.toString(), PREFIX, 
SUFFIX, Integer.valueOf(1), loggerService);


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

[Mark Thomas]

On 02/09/2022 22:19, Mark Thomas wrote:

The proposed Apache Tomcat migration tool for Jakarta EE 1.0.2 is now
available for voting.

The significant changes since 1.0.1 are:

- Issue #26 - bad CRC checksums

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/jakartaee-migration/v1.0.2/

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

The tag is:
https://github.com/apache/tomcat-jakartaee-migration/tree/1.0.2
37a9d5a438206b429997d4c1a9bb19f21b133145

The proposed 1.0.2 release is:

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


Unit tests pass.

Tested with examples web application from 9.0.x on 10.1.x.

Mark

-
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 #550: Http11Processor's keep alive state and input buffer's swallow state must be synchronized

[GitBox]

rmaucher commented on PR #550:
URL: https://github.com/apache/tomcat/pull/550#issuecomment-1237008899

   A request with an expectation is not supposed to be performed the same way 
as an identical request without it. So you have to be careful and I don't think 
your patch is correct.
   Looking at the code in Http11Processor.ack, it looks to me that it should 
work so I don't really understand yet.


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

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

[Rémy Maucherat]

On Fri, Sep 2, 2022 at 11:20 PM Mark Thomas  wrote:
>
> The proposed Apache Tomcat migration tool for Jakarta EE 1.0.2 is now
> available for voting.
>
> The significant changes since 1.0.1 are:
>
> - Issue #26 - bad CRC checksums
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/jakartaee-migration/v1.0.2/
>
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1386/
>
> The tag is:
> https://github.com/apache/tomcat-jakartaee-migration/tree/1.0.2
> 37a9d5a438206b429997d4c1a9bb19f21b133145
>
> The proposed 1.0.2 release is:
>
> [ ] -1: Broken. Do not release because...
> [X] +1: Acceptable. Go ahead and release.

Rémy

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

A "tar.bz2" file in Apache Tomcat migration tool (1.0.2)

[Konstantin Kolinko]

Hi!

Not a showstopper, but some oddity.

Looking at Maven artifacts for release candidate of
Apache Tomcat migration tool for Jakarta EE 1.0.2
in maven staging repository,

I am curious why does there exist the following file:
"jakartaee-migration-1.0.2-src.tar.bz2"

The files:

https://repository.apache.org/content/repositories/orgapachetomcat-1386/org/apache/tomcat/jakartaee-migration/1.0.2/

1. There already exists "jakartaee-migration-1.0.2-src.tar.gz".

It is the first time I see a *.bz2 file in our distributions.

2. Looking at the source code,
I do not see where it comes from.

pom.xml:

[[[

maven-assembly-plugin
3.4.2

  
make-assembly

  single

package

  
src/assembly/bin.xml
src/assembly/src.xml
  

  

  
]]]

src/assembly/bin.xml:
src/assembly/src.xml:
both have the following:

[[[
  
tar.gz
zip
  
]]]

There is no "tar.bz2" above.


Best regards,
Konstantin Kolinko

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