Author: remy.maucherat(a)jboss.com Date: 2014-06-03 08:16:02 -0400 (Tue, 03 Jun 2014) New Revision: 2441 Modified: branches/7.4.x/src/main/java/org/apache/coyote/http11/AbstractInternalInputBuffer.java branches/7.4.x/src/main/java/org/apache/coyote/http11/InternalNioInputBuffer.java branches/7.4.x/src/main/java/org/apache/coyote/http11/InternalNioOutputBuffer.java Log: BZ1104139: Tomcat sets an infinite timeout for IO on upgraded connections, so do the same. Modified: branches/7.4.x/src/main/java/org/apache/coyote/http11/AbstractInternalInputBuffer.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/coyote/http11/AbstractInternalInputBuffer.java 2014-06-03 11:55:52 UTC (rev 2440) +++ branches/7.4.x/src/main/java/org/apache/coyote/http11/AbstractInternalInputBuffer.java 2014-06-03 12:16:02 UTC (rev 2441) @@ -205,6 +205,7 @@ activeFilters[i].recycle(); } lastActiveFilter = -1; + readTimeout = Integer.MAX_VALUE; } /** Modified: branches/7.4.x/src/main/java/org/apache/coyote/http11/InternalNioInputBuffer.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/coyote/http11/InternalNioInputBuffer.java 2014-06-03 11:55:52 UTC (rev 2440) +++ branches/7.4.x/src/main/java/org/apache/coyote/http11/InternalNioInputBuffer.java 2014-06-03 12:16:02 UTC (rev 2441) @@ -197,6 +197,8 @@ bbuf.clear(); channel = null; available = true; + readTimeout = (endpoint.getSoTimeout() > 0 ? endpoint.getSoTimeout() + : Integer.MAX_VALUE); } /* Modified: branches/7.4.x/src/main/java/org/apache/coyote/http11/InternalNioOutputBuffer.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/coyote/http11/InternalNioOutputBuffer.java 2014-06-03 11:55:52 UTC (rev 2440) +++ branches/7.4.x/src/main/java/org/apache/coyote/http11/InternalNioOutputBuffer.java 2014-06-03 12:16:02 UTC (rev 2441) @@ -445,6 +445,7 @@ activeFilters[i].recycle(); } lastActiveFilter = -1; + writeTimeout = Integer.MAX_VALUE; } /** @@ -478,6 +479,8 @@ lastActiveFilter = -1; committed = false; finished = false; + writeTimeout = (endpoint.getSoTimeout() > 0 ? endpoint.getSoTimeout() + : Integer.MAX_VALUE); } /**