Author: remy.maucherat(a)jboss.com Date: 2014-08-26 10:05:30 -0400 (Tue, 26 Aug 2014) New Revision: 2495 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/Http11AbstractProcessor.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/Http11Processor.java Log: BZ1059511: Add a DEFAULT_DISABLE_UPLOAD_TIMEOUT system property to go along with the others. 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-08-26 11:57:43 UTC (rev 2494) +++ branches/7.5.x/src/main/java/org/apache/coyote/http11/Constants.java 2014-08-26 14:05:30 UTC (rev 2495) @@ -44,8 +44,11 @@ public static final int DEFAULT_CONNECTION_UPLOAD_TIMEOUT = 300000; 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")) + .booleanValue(); + - /** * CRLF. */ Modified: branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11AbstractProcessor.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11AbstractProcessor.java 2014-08-26 11:57:43 UTC (rev 2494) +++ branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11AbstractProcessor.java 2014-08-26 14:05:30 UTC (rev 2495) @@ -152,7 +152,7 @@ /** * Flag to disable setting a different time-out on uploads. */ - protected boolean disableUploadTimeout = false; + protected boolean disableUploadTimeout = Constants.DEFAULT_DISABLE_UPLOAD_TIMEOUT; /** * Allowed compression level. 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-08-26 11:57:43 UTC (rev 2494) +++ branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11AprProcessor.java 2014-08-26 14:05:30 UTC (rev 2495) @@ -253,7 +253,7 @@ /** * Flag to disable setting a different time-out on uploads. */ - protected boolean disableUploadTimeout = false; + protected boolean disableUploadTimeout = Constants.DEFAULT_DISABLE_UPLOAD_TIMEOUT; /** 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-08-26 11:57:43 UTC (rev 2494) +++ branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11Processor.java 2014-08-26 14:05:30 UTC (rev 2495) @@ -235,7 +235,7 @@ /** * Flag to disable setting a different time-out on uploads. */ - protected boolean disableUploadTimeout = false; + protected boolean disableUploadTimeout = Constants.DEFAULT_DISABLE_UPLOAD_TIMEOUT; /**