Merge pull request #1231 from fl4via/UNDERTOW-1929

[UNDERTOW-1929] Prevent SocketTimeoutException by tuning up SoTimeout…
undertow-io · Aug 5, 2021 · 8de3e4b · 8de3e4b
2 parents 0c998f2 + 23094b5
commit 8de3e4b
Showing 1 changed file with 19 additions and 3 deletions.
diff --git a/core/src/test/java/io/undertow/testutils/TestHttpClient.java b/core/src/test/java/io/undertow/testutils/TestHttpClient.java
@@ -28,6 +28,7 @@
 import org.apache.http.impl.client.DefaultHttpRequestRetryHandler;
 import org.apache.http.params.HttpConnectionParams;
 import org.apache.http.params.HttpParams;
+import org.apache.http.params.SyncBasicHttpParams;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLException;
@@ -65,24 +66,39 @@ public boolean verify(String s, SSLSession sslSession) {
     private static final List<TestHttpClient> instances = new CopyOnWriteArrayList<>();
 
     public TestHttpClient() {
+        super(preventSocketTimeoutException(null));
         instances.add(this);
     }
 
     public TestHttpClient(HttpParams params) {
-        super(params);
+        super(preventSocketTimeoutException(params));
         instances.add(this);
     }
 
     public TestHttpClient(ClientConnectionManager conman) {
-        super(conman);
+        super(conman, preventSocketTimeoutException(null));
         instances.add(this);
     }
 
     public TestHttpClient(ClientConnectionManager conman, HttpParams params) {
-        super(conman, params);
+        super(conman, preventSocketTimeoutException(params));
         instances.add(this);
     }
 
+    private static HttpParams preventSocketTimeoutException(HttpParams params) {
+        // UNDERTOW-1929 prevent the SocketTimeoutException that we see recurring
+        // in CI when running tests on Windows / proxy ajp mode
+        if (System.getProperty("os.name").startsWith("Windows") && DefaultServer.isProxy() && DefaultServer.isAjp()) {
+            if (params == null) {
+                params = new SyncBasicHttpParams();
+                setDefaultHttpParams(params);
+            }
+            HttpConnectionParams.setSoTimeout(params, 120000);
+            return params;
+        }
+        return params;
+    }
+
     @Override
     protected HttpRequestRetryHandler createHttpRequestRetryHandler() {
         return new DefaultHttpRequestRetryHandler(0, false);