* squid-2.4.DEVEL3-hno.devel.persistent_connections_and_request_timeout.patch *

Don't output the "lifetime" timeout message when the client doesn't
send a request in a timely fashion. Doing so confuses browsers using
persistent connections.

Index: squid/src/client_side.c
diff -u squid/src/client_side.c:1.1.1.3.10.7.2.6 squid/src/client_side.c:1.1.1.3.10.7.2.7
--- squid/src/client_side.c:1.1.1.3.10.7.2.6	Tue May 16 11:53:52 2000
+++ squid/src/client_side.c	Tue May 16 12:54:25 2000
@@ -3453,6 +3453,7 @@
     ConnStateData *conn = data;
     ErrorState *err;
     debug(33, 3) ("requestTimeout: FD %d: lifetime is expired.\n", fd);
+#if THIS_CONFUSES_PERSISTENT_CONNECTION_AWARE_BROWSERS_AND_USERS
     if (fd_table[fd].rwstate) {
 	/*
 	 * Some data has been sent to the client, just close the FD
@@ -3486,6 +3487,17 @@
 	 */
 	commSetSelect(fd, COMM_SELECT_READ, NULL, NULL, 0);
     }
+#else
+    /*
+     * Just close the connection to not confuse browsers
+     * using persistent connections. Some browsers opens
+     * an connection and then does not use it until much
+     * later (presumeably because the request triggering
+     * the open has already been completed on another
+     * connection)
+     */
+    comm_close(fd);
+#endif
 }
 
 static int