Rename the setting to httpIdleTimeout

diff --git a/src/main/distrib/data/defaults.properties b/src/main/distrib/data/defaults.properties
index e253064094ecb658a5f74d48fb01ce62f12f6938..9c5979030319e546ed4502363f77ebe3f9e1b1d3 100644 (file)
--- a/src/main/distrib/data/defaults.properties
+++ b/src/main/distrib/data/defaults.properties
@@ -2134,12 +2134,12 @@ server.requireClientCertificates = false
 # RESTART REQUIRED
 server.shutdownPort = 8081
 
-# Timeout (in milliseconds) for http and https requests
+# Http idle Timeout (in milliseconds) for http and https requests
 # Increase this value if you get java.util.concurrent.TimeoutException errors
 #
 # SINCE 1.9.0
 # RESTART REQUIRED
-server.httpTimeout = 30000
+server.httpIdleTimeout = 30000
 
 #
 # Gitblit Filestore Settings

diff --git a/src/main/java/com/gitblit/GitBlitServer.java b/src/main/java/com/gitblit/GitBlitServer.java
index 731ca8e5a8f548018221c12f055400d6ec2760eb..acdc2c26ac7d4e17f1065169b688b2376b9bad39 100644 (file)
--- a/src/main/java/com/gitblit/GitBlitServer.java
+++ b/src/main/java/com/gitblit/GitBlitServer.java
@@ -293,7 +293,7 @@ public class GitBlitServer {
 
                                ServerConnector connector = new ServerConnector(server, factory);
                                connector.setSoLingerTime(-1);
-                               connector.setIdleTimeout(settings.getLong(Keys.server.httpTimeout, 30000L));
+                               connector.setIdleTimeout(settings.getLong(Keys.server.httpIdleTimeout, 30000L));
                                connector.setPort(params.securePort);
                                String bindInterface = settings.getString(Keys.server.httpsBindInterface, null);
                                if (!StringUtils.isEmpty(bindInterface)) {
@@ -330,7 +330,7 @@ public class GitBlitServer {
 
                        ServerConnector connector = new ServerConnector(server, new HttpConnectionFactory(httpConfig));
                        connector.setSoLingerTime(-1);
-                       connector.setIdleTimeout(settings.getLong(Keys.server.httpTimeout, 30000L));
+                       connector.setIdleTimeout(settings.getLong(Keys.server.httpIdleTimeout, 30000L));
                        connector.setPort(params.port);
                        String bindInterface = settings.getString(Keys.server.httpBindInterface, null);
                        if (!StringUtils.isEmpty(bindInterface)) {