Author: remy.maucherat(a)jboss.com Date: 2012-04-26 09:33:04 -0400 (Thu, 26 Apr 2012) New Revision: 2032 Modified: branches/7.0.x/java/org/apache/coyote/ajp/Constants.java branches/7.0.x/java/org/apache/coyote/http11/Constants.java branches/7.0.x/webapps/docs/changelog.xml trunk/java/org/apache/coyote/ajp/Constants.java trunk/java/org/apache/coyote/http11/Constants.java trunk/webapps/docs/changelog.xml Log: AS7-4566: Add system property to configure connection timeout Modified: branches/7.0.x/java/org/apache/coyote/ajp/Constants.java =================================================================== --- branches/7.0.x/java/org/apache/coyote/ajp/Constants.java 2012-04-25 16:51:10 UTC (rev 2031) +++ branches/7.0.x/java/org/apache/coyote/ajp/Constants.java 2012-04-26 13:33:04 UTC (rev 2032) @@ -39,7 +39,8 @@ public static final String Package = "org.apache.coyote.ajp"; public static final int DEFAULT_CONNECTION_LINGER = -1; - public static final int DEFAULT_CONNECTION_TIMEOUT = -1; + public static final int DEFAULT_CONNECTION_TIMEOUT = + Integer.valueOf(System.getProperty("org.apache.coyote.ajp.DEFAULT_CONNECTION_TIMEOUT", "-1")).intValue(); 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; Modified: branches/7.0.x/java/org/apache/coyote/http11/Constants.java =================================================================== --- branches/7.0.x/java/org/apache/coyote/http11/Constants.java 2012-04-25 16:51:10 UTC (rev 2031) +++ branches/7.0.x/java/org/apache/coyote/http11/Constants.java 2012-04-26 13:33:04 UTC (rev 2032) @@ -37,7 +37,8 @@ public static final String Package = "org.apache.coyote.http11"; public static final int DEFAULT_CONNECTION_LINGER = -1; - public static final int DEFAULT_CONNECTION_TIMEOUT = 60000; + public static final int DEFAULT_CONNECTION_TIMEOUT = + Integer.valueOf(System.getProperty("org.apache.coyote.http11.DEFAULT_CONNECTION_TIMEOUT", "60000")).intValue(); 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; Modified: branches/7.0.x/webapps/docs/changelog.xml =================================================================== --- branches/7.0.x/webapps/docs/changelog.xml 2012-04-25 16:51:10 UTC (rev 2031) +++ branches/7.0.x/webapps/docs/changelog.xml 2012-04-26 13:33:04 UTC (rev 2032) @@ -22,6 +22,9 @@ <jboss-jira>AS7-4151</jboss-jira>: Add system property to configure AJP packet size, and another for endpoint max threads. (remm) </fix> + <fix> + <jboss-jira>AS7-4566</jboss-jira>: Add system property to configure connection timeout. (remm) + </fix> </changelog> </subsection> <subsection name="Jasper"> Modified: trunk/java/org/apache/coyote/ajp/Constants.java =================================================================== --- trunk/java/org/apache/coyote/ajp/Constants.java 2012-04-25 16:51:10 UTC (rev 2031) +++ trunk/java/org/apache/coyote/ajp/Constants.java 2012-04-26 13:33:04 UTC (rev 2032) @@ -39,7 +39,8 @@ public static final String Package = "org.apache.coyote.ajp"; public static final int DEFAULT_CONNECTION_LINGER = -1; - public static final int DEFAULT_CONNECTION_TIMEOUT = -1; + public static final int DEFAULT_CONNECTION_TIMEOUT = + Integer.valueOf(System.getProperty("org.apache.coyote.ajp.DEFAULT_CONNECTION_TIMEOUT", "-1")).intValue(); 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; Modified: trunk/java/org/apache/coyote/http11/Constants.java =================================================================== --- trunk/java/org/apache/coyote/http11/Constants.java 2012-04-25 16:51:10 UTC (rev 2031) +++ trunk/java/org/apache/coyote/http11/Constants.java 2012-04-26 13:33:04 UTC (rev 2032) @@ -37,7 +37,8 @@ public static final String Package = "org.apache.coyote.http11"; public static final int DEFAULT_CONNECTION_LINGER = -1; - public static final int DEFAULT_CONNECTION_TIMEOUT = 60000; + public static final int DEFAULT_CONNECTION_TIMEOUT = + Integer.valueOf(System.getProperty("org.apache.coyote.http11.DEFAULT_CONNECTION_TIMEOUT", "60000")).intValue(); 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; Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2012-04-25 16:51:10 UTC (rev 2031) +++ trunk/webapps/docs/changelog.xml 2012-04-26 13:33:04 UTC (rev 2032) @@ -48,6 +48,9 @@ <jboss-jira>AS7-4151</jboss-jira>: Add system property to configure AJP packet size, and another for endpoint max threads. (remm) </fix> + <fix> + <jboss-jira>AS7-4566</jboss-jira>: Add system property to configure connection timeout. (remm) + </fix> </changelog> </subsection> <subsection name="Jasper">