diff options
| author | Sebastiano Pilla <sebastiano@sebastianopilla.com> | 2017-06-03 14:25:01 +0200 |
|---|---|---|
| committer | Sebastiano Pilla <sebastiano@sebastianopilla.com> | 2017-06-03 14:25:01 +0200 |
| commit | 203748f479d06b284518b160e8196df61666235a (patch) | |
| tree | 7e12422b706a2c9f487fd89461e7cd56b057014f | |
| parent | ac94c2c0c4dbcda4a6641ad16d9ece20258a10f4 (diff) | |
| download | gitblit-203748f479d06b284518b160e8196df61666235a.tar.gz gitblit-203748f479d06b284518b160e8196df61666235a.zip | |
Rename the setting to httpIdleTimeout
| -rw-r--r-- | src/main/distrib/data/defaults.properties | 4 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/GitBlitServer.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/main/distrib/data/defaults.properties b/src/main/distrib/data/defaults.properties index e2530640..9c597903 100644 --- 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 731ca8e5..acdc2c26 100644 --- 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)) { |