Skip to content

Commit ac94c2c

Browse files
author
Sebastiano Pilla
committed
Adds the
server.httpTimeout setting to allow cloning big repositories over HTTP. This change fixes the java.util.concurrent.TimeoutException issue described in https://groups.google.com/d/topic/gitblit/UvDC48NpmF4/discussion .
1 parent c1d816d commit ac94c2c

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

src/main/distrib/data/defaults.properties

+7
Original file line numberDiff line numberDiff line change
@@ -2134,6 +2134,13 @@ server.requireClientCertificates = false
21342134
# RESTART REQUIRED
21352135
server.shutdownPort = 8081
21362136

2137+
# Timeout (in milliseconds) for http and https requests
2138+
# Increase this value if you get java.util.concurrent.TimeoutException errors
2139+
#
2140+
# SINCE 1.9.0
2141+
# RESTART REQUIRED
2142+
server.httpTimeout = 30000
2143+
21372144
#
21382145
# Gitblit Filestore Settings
21392146
#

src/main/java/com/gitblit/GitBlitServer.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ public void log(String message) {
293293

294294
ServerConnector connector = new ServerConnector(server, factory);
295295
connector.setSoLingerTime(-1);
296-
connector.setIdleTimeout(30000);
296+
connector.setIdleTimeout(settings.getLong(Keys.server.httpTimeout, 30000L));
297297
connector.setPort(params.securePort);
298298
String bindInterface = settings.getString(Keys.server.httpsBindInterface, null);
299299
if (!StringUtils.isEmpty(bindInterface)) {
@@ -330,7 +330,7 @@ public void log(String message) {
330330

331331
ServerConnector connector = new ServerConnector(server, new HttpConnectionFactory(httpConfig));
332332
connector.setSoLingerTime(-1);
333-
connector.setIdleTimeout(30000);
333+
connector.setIdleTimeout(settings.getLong(Keys.server.httpTimeout, 30000L));
334334
connector.setPort(params.port);
335335
String bindInterface = settings.getString(Keys.server.httpBindInterface, null);
336336
if (!StringUtils.isEmpty(bindInterface)) {
@@ -608,4 +608,4 @@ public static class Params {
608608
public String ldapLdifFile;
609609

610610
}
611-
}
611+
}

0 commit comments

Comments
 (0)