Fix the repeated TimeOut response.

src/main/java/org/littleshoot/proxy/impl/ClientToProxyConnection.java

@@ -516,17 +516,19 @@ protected void connected() {
         recordClientConnected();
     }
 
-    @Override
-    protected void timedOut() {
-        boolean clientReadMoreRecentlyThanServer =
-                currentServerConnection == null
-                        || this.lastReadTime > currentServerConnection.lastReadTime;
-        if (clientReadMoreRecentlyThanServer) {
-            LOG.debug("Server timed out: {}", currentServerConnection);
+    void timedOut(ProxyToServerConnection serverConnection) {
+        if (currentServerConnection == serverConnection && this.lastReadTime > currentServerConnection.lastReadTime) {
+            // the idle timeout fired on the active server connection. send a timeout response to the client.
+            LOG.warn("Server timed out: {}", currentServerConnection);
             currentFilters.serverToProxyResponseTimedOut();
             writeGatewayTimeout(currentRequest);
-            // DO NOT call super.timedOut() if the server timed out, to avoid closing the connection unnecessarily
-        } else {
+        }
+    }
+
+    @Override
+    protected void timedOut() {
+        // idle timeout fired on the client channel. if we aren't waiting on a response from a server, hang up
+        if (currentServerConnection == null || this.lastReadTime <= currentServerConnection.lastReadTime) {
             super.timedOut();
         }
     }

src/main/java/org/littleshoot/proxy/impl/ProxyToServerConnection.java

@@ -409,7 +409,7 @@ protected void becameWritable() {
     @Override
     protected void timedOut() {
         super.timedOut();
-        clientConnection.timedOut();
+        clientConnection.timedOut(this);
     }
 
     @Override

src/test/java/org/littleshoot/proxy/KeepAliveTest.java

@@ -85,7 +85,7 @@ public void testHttp11DoesNotCloseConnectionByDefault() throws IOException, Inte
         this.socket = SocketClientUtil.getSocketToProxyServer(proxyServer);
 
         // construct the basic request: METHOD + URI + HTTP version + CRLF (to indicate the end of the request)
-        String successfulGet = "GET http://localhost:" + mockServerPort + "/success HTTP/1.1\n"
+        String successfulGet = "GET http://localhost:" + mockServerPort + "/success HTTP/1.1\r\n"
                 + "\r\n";
 
         // send the same request twice over the same connection
@@ -129,7 +129,7 @@ public void testProxyKeepsClientConnectionOpenAfterServerDisconnect() throws IOE
         this.socket = SocketClientUtil.getSocketToProxyServer(proxyServer);
 
         // construct the basic request: METHOD + URI + HTTP version + CRLF (to indicate the end of the request)
-        String successfulGet = "GET http://localhost:" + mockServerPort + "/success HTTP/1.1\n"
+        String successfulGet = "GET http://localhost:" + mockServerPort + "/success HTTP/1.1\r\n"
                 + "\r\n";
 
         // send the same request twice over the same connection
@@ -172,7 +172,7 @@ public void testBadGatewayDoesNotCloseConnection() throws IOException, Interrupt
 
         socket = SocketClientUtil.getSocketToProxyServer(proxyServer);
 
-        String badGatewayGet = "GET http://localhost:0/success HTTP/1.1\n"
+        String badGatewayGet = "GET http://localhost:0/success HTTP/1.1\r\n"
                 + "\r\n";
 
         // send the same request twice over the same connection
@@ -206,35 +206,27 @@ public void testGatewayTimeoutDoesNotCloseConnection() throws IOException, Inter
                         .withBody("success"));
 
         this.proxyServer = DefaultHttpProxyServer.bootstrap()
-                .withIdleConnectionTimeout(3)
+                .withIdleConnectionTimeout(2)
                 .withPort(0)
                 .start();
 
         socket = SocketClientUtil.getSocketToProxyServer(proxyServer);
 
-        String successfulGet = "GET http://localhost:" + mockServerPort + "/success HTTP/1.1\n"
+        String successfulGet = "GET http://localhost:" + mockServerPort + "/success HTTP/1.1\r\n"
                 + "\r\n";
 
         // send the same request twice over the same connection
         for (int i = 1; i <= 2; i++) {
             SocketClientUtil.writeStringToSocket(successfulGet, socket);
 
-            // wait a bit to allow the proxy server to respond
-            Thread.sleep(3500);
-
             String response = SocketClientUtil.readStringFromSocket(socket);
 
+	        // match the whole response to make sure that the it is not repeated
             assertThat("The response is repeated:", response, is("HTTP/1.1 504 Gateway Timeout\r\n" +
-                    "Content-Length: 15\r\n" +
-                    "Content-Type: text/html; charset=utf-8\r\n" +
-                    "\r\n" +
-                    "Gateway TimeoutHTTP/1.1 504 Gateway Timeout\r\n" +
                     "Content-Length: 15\r\n" +
                     "Content-Type: text/html; charset=utf-8\r\n" +
                     "\r\n" +
                     "Gateway Timeout"));
-
-            assertThat("Expected to receive an HTTP 200 from the server (iteration: " + i + ")", response, startsWith("HTTP/1.1 504 Gateway Timeout"));
         }
 
         assertTrue("Expected connection to proxy server to be open and readable", SocketClientUtil.isSocketReadyToRead(socket));
@@ -279,7 +271,7 @@ public HttpResponse clientToProxyRequest(HttpObject httpObject) {
 
         socket = SocketClientUtil.getSocketToProxyServer(proxyServer);
 
-        String successfulGet = "GET http://localhost:" + mockServerPort + "/success HTTP/1.1\n"
+        String successfulGet = "GET http://localhost:" + mockServerPort + "/success HTTP/1.1\r\n"
                 + "\r\n";
 
         // send the same request twice over the same connection
@@ -338,7 +330,7 @@ public HttpResponse clientToProxyRequest(HttpObject httpObject) {
 
         socket = SocketClientUtil.getSocketToProxyServer(proxyServer);
 
-        String successfulGet = "GET http://localhost:" + mockServerPort + "/success HTTP/1.1\n"
+        String successfulGet = "GET http://localhost:" + mockServerPort + "/success HTTP/1.1\r\n"
                 + "\r\n";
 
         // only send this request once, since we expect the short circuit response to close the connection

src/test/java/org/littleshoot/proxy/TimeoutTest.java

@@ -20,8 +20,8 @@
 import java.util.concurrent.TimeUnit;
 
 import static org.hamcrest.Matchers.lessThan;
-import static org.hamcrest.Matchers.startsWith;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThat;
 import static org.mockserver.model.HttpRequest.request;
 import static org.mockserver.model.HttpResponse.response;
@@ -132,9 +132,7 @@ public void testClientIdleBeforeRequestReceived() throws IOException, Interrupte
         // wait a bit to allow the proxy server to respond
         Thread.sleep(1500);
 
-        // the proxy should return an HTTP 504 due to the timeout
-        String response = SocketClientUtil.readStringFromSocket(socket);
-        assertThat("Expected to receive an HTTP 504 Gateway Timeout from the server", response, startsWith("HTTP/1.1 504"));
+        assertFalse("Client to proxy connection should be closed", SocketClientUtil.isSocketReadyToRead(socket));
 
         socket.close();
     }

src/test/java/org/littleshoot/proxy/test/SocketClientUtil.java

@@ -61,10 +61,10 @@ public static String readStringFromSocket(Socket socket) throws IOException {
     public static boolean isSocketReadyToWrite(Socket socket) throws IOException {
         OutputStream out = socket.getOutputStream();
         try {
-            out.write(0);
-            out.flush();
-            out.write(0);
-            out.flush();
+            for(int i = 0; i < 500; ++i) {
+                out.write(0);
+                out.flush();
+            }
         } catch (SocketException e) {
             return false;
         }