Author: remy.maucherat(a)jboss.com Date: 2014-10-06 14:45:20 -0400 (Mon, 06 Oct 2014) New Revision: 2518 Modified: branches/7.5.x/src/main/java/org/apache/coyote/http11/Constants.java branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11AprProcessor.java branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11NioProcessor.java branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11Processor.java Log: Fix regression with timeout handling with java.io (change back the default too, since it got changed maybe due to some confusion). Modified: branches/7.5.x/src/main/java/org/apache/coyote/http11/Constants.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/coyote/http11/Constants.java 2014-10-06 14:52:34 UTC (rev 2517) +++ branches/7.5.x/src/main/java/org/apache/coyote/http11/Constants.java 2014-10-06 18:45:20 UTC (rev 2518) @@ -45,7 +45,7 @@ public static final int DEFAULT_SERVER_SOCKET_TIMEOUT = 0; public static final boolean DEFAULT_TCP_NO_DELAY = true; public static final boolean DEFAULT_DISABLE_UPLOAD_TIMEOUT = Boolean.valueOf( - System.getProperty("org.apache.coyote.http11.DEFAULT_DISABLE_UPLOAD_TIMEOUT", "false")) + System.getProperty("org.apache.coyote.http11.DEFAULT_DISABLE_UPLOAD_TIMEOUT", "true")) .booleanValue(); public static final boolean DISABLE_KEEPALIVE_ON_CONCLOSE = Boolean.valueOf(System.getProperty("org.apache.coyote.http11.DISABLE_KEEPALIVE_ON_CONCLOSE", "false")).booleanValue(); Modified: branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11AprProcessor.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11AprProcessor.java 2014-10-06 14:52:34 UTC (rev 2517) +++ branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11AprProcessor.java 2014-10-06 18:45:20 UTC (rev 2518) @@ -840,8 +840,8 @@ } request.setStartTime(System.currentTimeMillis()); keptAlive = true; - if (!disableUploadTimeout) { - Socket.timeoutSet(socket, timeout * 1000); + if (!disableUploadTimeout && soTimeout > 0) { + Socket.timeoutSet(socket, soTimeout * 1000); } inputBuffer.parseHeaders(); } catch (IOException e) { Modified: branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11NioProcessor.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11NioProcessor.java 2014-10-06 14:52:34 UTC (rev 2517) +++ branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11NioProcessor.java 2014-10-06 18:45:20 UTC (rev 2518) @@ -283,7 +283,7 @@ // Parsing the request header try { if (!disableUploadTimeout && keptAlive && soTimeout > 0) { - endpoint.setSoTimeout(soTimeout * 1000); + endpoint.setSoTimeout(soTimeout); } if (!inputBuffer.parseRequestLine(keptAlive)) { @@ -319,8 +319,8 @@ request.setStartTime(System.currentTimeMillis()); keptAlive = true; - if (!disableUploadTimeout) { - endpoint.setSoTimeout(timeout * 1000); + if (!disableUploadTimeout && soTimeout > 0) { + endpoint.setSoTimeout(soTimeout); } inputBuffer.parseHeaders(); } catch (IOException e) { Modified: branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11Processor.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11Processor.java 2014-10-06 14:52:34 UTC (rev 2517) +++ branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11Processor.java 2014-10-06 18:45:20 UTC (rev 2518) @@ -812,16 +812,15 @@ if (keptAlive) { if (keepAliveTimeout > 0) { socket.setSoTimeout(keepAliveTimeout); - } - else if (soTimeout > 0) { + } else if (soTimeout > 0) { socket.setSoTimeout(soTimeout); } } inputBuffer.parseRequestLine(); request.setStartTime(System.currentTimeMillis()); keptAlive = true; - if (!disableUploadTimeout) { - socket.setSoTimeout(timeout); + if (!disableUploadTimeout && soTimeout > 0) { + socket.setSoTimeout(soTimeout); } inputBuffer.parseHeaders(); } catch (IOException e) {