Attachment 857368 Details for Bug 1059557 – jbossweb-upload-timeout.patch / potential patch

[patch] jbossweb-upload-timeout.patch / potential patch

jbossweb-upload-timeout.patch (text/plain), 4.17 KB, created by Masafumi Miura on 2014-01-30 07:49:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Masafumi Miura

Created: 2014-01-30 07:49:41 UTC

Size: 4.17 KB

patch

obsolete

>Index: src/main/java/org/apache/coyote/http11/Constants.java
>===================================================================
>--- src/main/java/org/apache/coyote/http11/Constants.java	(revision 2358)
>+++ src/main/java/org/apache/coyote/http11/Constants.java	(working copy)
>@@ -41,7 +41,10 @@
> Integer.valueOf(System.getProperty("org.apache.coyote.http11.DEFAULT_CONNECTION_TIMEOUT", "60000")).intValue();
> public static final int DEFAULT_KEEP_ALIVE_TIMEOUT = 
> Integer.valueOf(System.getProperty("org.apache.coyote.http11.DEFAULT_KEEP_ALIVE_TIMEOUT", "-1")).intValue();
>- public static final int DEFAULT_CONNECTION_UPLOAD_TIMEOUT = 300000;
>+ public static final int DEFAULT_CONNECTION_UPLOAD_TIMEOUT = 
>+ Integer.valueOf(System.getProperty("org.apache.coyote.http11.DEFAULT_CONNECTION_UPLOAD_TIMEOUT", "300000")).intValue();
>+ public static final boolean DEFAULT_DISABLE_UPLOAD_TIMEOUT = 
>+ Boolean.valueOf(System.getProperty("org.apache.coyote.http11.DEFAULT_DISABLE_UPLOAD_TIMEOUT", "true")).booleanValue();
> public static final int DEFAULT_SERVER_SOCKET_TIMEOUT = 0;
> public static final boolean DEFAULT_TCP_NO_DELAY = true;
> 
>Index: src/main/java/org/apache/coyote/http11/Http11AprProtocol.java
>===================================================================
>--- src/main/java/org/apache/coyote/http11/Http11AprProtocol.java	(revision 2358)
>+++ src/main/java/org/apache/coyote/http11/Http11AprProtocol.java	(working copy)
>@@ -59,6 +59,8 @@
> //setServerSoTimeout(Constants.DEFAULT_SERVER_SOCKET_TIMEOUT);
> setTcpNoDelay(Constants.DEFAULT_TCP_NO_DELAY);
> setKeepAliveTimeout(Constants.DEFAULT_KEEP_ALIVE_TIMEOUT);
>+ setTimeout(Constants.DEFAULT_CONNECTION_UPLOAD_TIMEOUT);
>+ setDisableUploadTimeout(Constants.DEFAULT_DISABLE_UPLOAD_TIMEOUT);
> }
> 
> /** Pass config info
>Index: src/main/java/org/apache/coyote/http11/Http11NioProtocol.java
>===================================================================
>--- src/main/java/org/apache/coyote/http11/Http11NioProtocol.java	(revision 2358)
>+++ src/main/java/org/apache/coyote/http11/Http11NioProtocol.java	(working copy)
>@@ -64,6 +64,8 @@
> 		setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
> 		setTcpNoDelay(Constants.DEFAULT_TCP_NO_DELAY);
> setKeepAliveTimeout(Constants.DEFAULT_KEEP_ALIVE_TIMEOUT);
>+ setTimeout(Constants.DEFAULT_CONNECTION_UPLOAD_TIMEOUT);
>+ setDisableUploadTimeout(Constants.DEFAULT_DISABLE_UPLOAD_TIMEOUT);
> 	}
> 
> 	/*
>Index: src/main/java/org/apache/coyote/http11/Http11Protocol.java
>===================================================================
>--- src/main/java/org/apache/coyote/http11/Http11Protocol.java	(revision 2358)
>+++ src/main/java/org/apache/coyote/http11/Http11Protocol.java	(working copy)
>@@ -69,6 +69,8 @@
> //setServerSoTimeout(Constants.DEFAULT_SERVER_SOCKET_TIMEOUT);
> setTcpNoDelay(Constants.DEFAULT_TCP_NO_DELAY);
> setKeepAliveTimeout(Constants.DEFAULT_KEEP_ALIVE_TIMEOUT);
>+ setTimeout(Constants.DEFAULT_CONNECTION_UPLOAD_TIMEOUT);
>+ setDisableUploadTimeout(Constants.DEFAULT_DISABLE_UPLOAD_TIMEOUT);
> }
> 
> 
>Index: webapps/docs/sysprops.xml
>===================================================================
>--- webapps/docs/sysprops.xml	(revision 2358)
>+++ webapps/docs/sysprops.xml	(working copy)
>@@ -173,6 +173,20 @@
> which means it will use the default socket timeout.
> </property>
> 
>+ <property name="org.apache.coyote.http11.DEFAULT_CONNECTION_UPLOAD_TIMEOUT">
>+ Specifies the timeout, in milliseconds, to use while a data upload is
>+ in progress. The default value is <code>300000</code> ms. This only takes 
>+ effect if org.apache.coyote.http11.DEFAULT_DISABLE_UPLOAD_TIMEOUT 
>+ is set to <code>false</code>.
>+ </property>
>+
>+ <property name="org.apache.coyote.http11.DEFAULT_DISABLE_UPLOAD_TIMEOUT">
>+ This flag allows the servlet container to use a different, usually
>+ longer connection timeout during data upload. If not specified, this
>+ attribute is set to <code>true</code> which disables this longer timeout.
>+ 
>+ </property>
>+
> </properties>
> 
> </section>

Flags:

mmiura: review?

Actions: View | Diff

Attachments on bug 1059557: 857368