diff options
| author | James Moger <james.moger@gmail.com> | 2017-06-05 04:30:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-05 04:30:35 -0700 |
| commit | a13f07850fccfb67c14737f1e09942e31023da66 (patch) | |
| tree | 7e12422b706a2c9f487fd89461e7cd56b057014f /src | |
| parent | c1d816da6e91037741a47fcd79458fe658a45b1d (diff) | |
| parent | 203748f479d06b284518b160e8196df61666235a (diff) | |
| download | gitblit-a13f07850fccfb67c14737f1e09942e31023da66.tar.gz gitblit-a13f07850fccfb67c14737f1e09942e31023da66.zip | |
Merge pull request #1243 from sebastianopilla/master
Fixes the 30 seconds timeout when cloning over HTTP
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/distrib/data/defaults.properties | 7 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/GitBlitServer.java | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/main/distrib/data/defaults.properties b/src/main/distrib/data/defaults.properties index 51fa1253..9c597903 100644 --- a/src/main/distrib/data/defaults.properties +++ b/src/main/distrib/data/defaults.properties @@ -2134,6 +2134,13 @@ server.requireClientCertificates = false # RESTART REQUIRED server.shutdownPort = 8081 +# 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.httpIdleTimeout = 30000 + # # Gitblit Filestore Settings # diff --git a/src/main/java/com/gitblit/GitBlitServer.java b/src/main/java/com/gitblit/GitBlitServer.java index 6123a872..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(30000); + 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(30000); + connector.setIdleTimeout(settings.getLong(Keys.server.httpIdleTimeout, 30000L)); connector.setPort(params.port); String bindInterface = settings.getString(Keys.server.httpBindInterface, null); if (!StringUtils.isEmpty(bindInterface)) { @@ -608,4 +608,4 @@ public class GitBlitServer { public String ldapLdifFile; } -}
\ No newline at end of file +} |