You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2022/06/23 22:06:31 UTC
[tomcat] branch 8.5.x updated (5f6c88b054 -> 3846af73bb)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from 5f6c88b054 Fix CVE-2022-34305 XSS in the examples web application
new dd7b032a79 Align with 10.0.x
new 3846af73bb Attempt to reduce test failures on slower systems
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
test/org/apache/coyote/http2/TestHttp2Limits.java | 2 +-
test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Align with 10.0.x
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit dd7b032a791b899a3407076d56bc84b64ded67f6
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jun 23 23:04:38 2022 +0100
Align with 10.0.x
---
test/org/apache/coyote/http2/TestHttp2Limits.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/org/apache/coyote/http2/TestHttp2Limits.java b/test/org/apache/coyote/http2/TestHttp2Limits.java
index 957c7473ee..787859c62b 100644
--- a/test/org/apache/coyote/http2/TestHttp2Limits.java
+++ b/test/org/apache/coyote/http2/TestHttp2Limits.java
@@ -41,7 +41,7 @@ public class TestHttp2Limits extends Http2TestBase {
@Test
public void testSettingsOverheadLimits() throws Exception {
- http2Connect(false);
+ http2Connect();
for (int i = 0; i < 100; i++) {
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Attempt to reduce test failures on slower systems
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 3846af73bb666eee805a366025952717964c68da
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jun 23 22:57:05 2022 +0100
Attempt to reduce test failures on slower systems
---
test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java b/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
index ad9366aba0..6525b523a3 100644
--- a/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
+++ b/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
@@ -140,11 +140,11 @@ public class TestWebSocketFrameClientSSL extends WebSocketBaseTest {
Assert.fail("No error reported by Endpoint when timeout was expected");
}
- // Wait up to another 10 seconds for the connection to be closed -
+ // Wait again for the connection to be closed -
// should be a lot faster.
System.out.println("Waiting for connection to be closed");
count = 0;
- limit = (TesterFirehoseServer.SEND_TIME_OUT_MILLIS * 2) / 100;
+ limit = TesterFirehoseServer.WAIT_TIME_MILLIS / 100;
while (TesterFirehoseServer.Endpoint.getOpenConnectionCount() != 0 && count < limit) {
Thread.sleep(100);
count ++;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org