Skip to content

Commit 203748f

Browse files
author
Sebastiano Pilla
committed
Rename the setting to httpIdleTimeout
1 parent ac94c2c commit 203748f

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/main/distrib/data/defaults.properties

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

2137-
# Timeout (in milliseconds) for http and https requests
2137+
# Http idle Timeout (in milliseconds) for http and https requests
21382138
# Increase this value if you get java.util.concurrent.TimeoutException errors
21392139
#
21402140
# SINCE 1.9.0
21412141
# RESTART REQUIRED
2142-
server.httpTimeout = 30000
2142+
server.httpIdleTimeout = 30000
21432143

21442144
#
21452145
# Gitblit Filestore Settings

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

+2-2
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(settings.getLong(Keys.server.httpTimeout, 30000L));
296+
connector.setIdleTimeout(settings.getLong(Keys.server.httpIdleTimeout, 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(settings.getLong(Keys.server.httpTimeout, 30000L));
333+
connector.setIdleTimeout(settings.getLong(Keys.server.httpIdleTimeout, 30000L));
334334
connector.setPort(params.port);
335335
String bindInterface = settings.getString(Keys.server.httpBindInterface, null);
336336
if (!StringUtils.isEmpty(bindInterface)) {

0 commit comments

Comments
 (0)