Author: remy.maucherat(a)jboss.com Date: 2014-10-01 07:58:54 -0400 (Wed, 01 Oct 2014) New Revision: 2512 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/Http11AbstractProtocol.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/Http11AprProtocol.java branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11Processor.java branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11Protocol.java Log: BZ1059511: Refix since the flag initial value should be on the protocol. 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-09-29 15:13:58 UTC (rev 2511) +++ branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11AbstractProcessor.java 2014-10-01 11:58:54 UTC (rev 2512) @@ -152,7 +152,7 @@ /** * Flag to disable setting a different time-out on uploads. */ - protected boolean disableUploadTimeout = Constants.DEFAULT_DISABLE_UPLOAD_TIMEOUT; + protected boolean disableUploadTimeout = true; /** * Allowed compression level. Modified: branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11AbstractProtocol.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11AbstractProtocol.java 2014-09-29 15:13:58 UTC (rev 2511) +++ branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11AbstractProtocol.java 2014-10-01 11:58:54 UTC (rev 2512) @@ -77,7 +77,7 @@ * If true, the regular socket timeout will be used for the full duration of * the connection. */ - protected boolean disableUploadTimeout = true; + protected boolean disableUploadTimeout = Constants.DEFAULT_DISABLE_UPLOAD_TIMEOUT; /** * Integrated compression support. */ 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-09-29 15:13:58 UTC (rev 2511) +++ branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11AprProcessor.java 2014-10-01 11:58:54 UTC (rev 2512) @@ -252,7 +252,7 @@ /** * Flag to disable setting a different time-out on uploads. */ - protected boolean disableUploadTimeout = Constants.DEFAULT_DISABLE_UPLOAD_TIMEOUT; + protected boolean disableUploadTimeout = true; /** Modified: branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11AprProtocol.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11AprProtocol.java 2014-09-29 15:13:58 UTC (rev 2511) +++ branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11AprProtocol.java 2014-10-01 11:58:54 UTC (rev 2512) @@ -316,7 +316,7 @@ * If true, the regular socket timeout will be used for the full duration * of the connection. */ - protected boolean disableUploadTimeout = true; + protected boolean disableUploadTimeout = Constants.DEFAULT_DISABLE_UPLOAD_TIMEOUT; public boolean getDisableUploadTimeout() { return disableUploadTimeout; } public void setDisableUploadTimeout(boolean isDisabled) { disableUploadTimeout = isDisabled; } 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-09-29 15:13:58 UTC (rev 2511) +++ branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11Processor.java 2014-10-01 11:58:54 UTC (rev 2512) @@ -234,7 +234,7 @@ /** * Flag to disable setting a different time-out on uploads. */ - protected boolean disableUploadTimeout = Constants.DEFAULT_DISABLE_UPLOAD_TIMEOUT; + protected boolean disableUploadTimeout = true; /** Modified: branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11Protocol.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11Protocol.java 2014-09-29 15:13:58 UTC (rev 2511) +++ branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11Protocol.java 2014-10-01 11:58:54 UTC (rev 2512) @@ -373,7 +373,7 @@ * If true, the regular socket timeout will be used for the full duration * of the connection. */ - protected boolean disableUploadTimeout = true; + protected boolean disableUploadTimeout = Constants.DEFAULT_DISABLE_UPLOAD_TIMEOUT; public boolean getDisableUploadTimeout() { return disableUploadTimeout; } public void setDisableUploadTimeout(boolean isDisabled) { disableUploadTimeout = isDisabled; }