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 2020/04/08 15:13:58 UTC
[tomcat] branch 9.0.x updated (5e0dd5d -> f83a992)
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 5e0dd5d Add an extra field to keep around the configured protocol
new ddf1dc8 BZ 64311 - Prevent test from hanging if client fails to connect
new 9e05ecd BZ 64311 Add debug logging to aid investigation of test failures
new f83a992 BZ 64311. Allow for java.net.preferIPv4Stack in APR AnyLocalAddress test
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/tomcat/jni/TestSocketServerAnyLocalAddress.java | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/03: BZ 64311 Add debug logging to aid investigation of
test failures
Posted by ma...@apache.org.
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 9e05ecd57dab026964df496d238f446cc1ceaeb1
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Apr 8 15:47:47 2020 +0100
BZ 64311 Add debug logging to aid investigation of test failures
---
test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java b/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
index b13b116..e1f78d6 100644
--- a/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
+++ b/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
@@ -124,6 +124,7 @@ public class TestSocketServerAnyLocalAddress extends AbstractJniTest {
try {
InetSocketAddress connectAddress = getConnectAddress(serverSocket);
+ System.out.println("Client attempting to connect to [" + connectAddress + "]");
java.net.Socket sock = new java.net.Socket();
sock.connect(connectAddress, TIMEOUT_MICROSECONDS);
sock.setSoTimeout(TIMEOUT_MICROSECONDS);
@@ -165,6 +166,7 @@ public class TestSocketServerAnyLocalAddress extends AbstractJniTest {
} else {
localAddress = new InetSocketAddress("0.0.0.0", addr.port);
}
+ System.out.println("Server is listening at [" + localAddress + "]");
// Need a local address of the same type (IPv4 or IPV6) as the
// configured bind address since the connector may be configured
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/03: BZ 64311 - Prevent test from hanging if client
fails to connect
Posted by ma...@apache.org.
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 ddf1dc84147d023bd3a9560f7c49e35628383187
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Apr 8 15:46:01 2020 +0100
BZ 64311 - Prevent test from hanging if client fails to connect
---
test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java b/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
index 866ba77..b13b116 100644
--- a/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
+++ b/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
@@ -146,6 +146,9 @@ public class TestSocketServerAnyLocalAddress extends AbstractJniTest {
sock.close();
} catch (Exception e) {
e.printStackTrace();
+ // Prevent the test from hanging on Socket.accept(serverSocket)
+ // if the client fails
+ Socket.shutdown(serverSocket, Socket.APR_SHUTDOWN_READWRITE);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 03/03: BZ 64311. Allow for java.net.preferIPv4Stack in APR
AnyLocalAddress test
Posted by ma...@apache.org.
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 f83a9928c1dc0c4e34d96c2e1c44deecc68475a8
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Apr 8 16:10:20 2020 +0100
BZ 64311. Allow for java.net.preferIPv4Stack in APR AnyLocalAddress test
Fixes https://bz.apache.org/bugzilla/show_bug.cgi?id=64311
---
test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java b/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
index e1f78d6..0023db2 100644
--- a/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
+++ b/test/org/apache/tomcat/jni/TestSocketServerAnyLocalAddress.java
@@ -43,8 +43,13 @@ public class TestSocketServerAnyLocalAddress extends AbstractJniTest {
@Before
public void init() throws Exception {
long serverPool = Pool.create(0);
- long inetAddress = Address.info(null, Socket.APR_UNSPEC,
- 0, 0, serverPool);
+ int family;
+ if (Boolean.getBoolean("java.net.preferIPv4Stack")) {
+ family = Socket.APR_INET;
+ } else {
+ family = Socket.APR_UNSPEC;
+ }
+ long inetAddress = Address.info(null, family, 0, 0, serverPool);
serverSocket = Socket.create(Address.getInfo(inetAddress).family, Socket.SOCK_STREAM,
Socket.APR_PROTO_TCP, serverPool);
if (OS.IS_UNIX) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org