From 471fe93e3038d6a01673452fe5a6eb6baf0d2860 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Wed, 10 May 2017 14:34:55 +0900 Subject: [PATCH] SshDaemon: Set NIO2_READ_TIMEOUT to sshd.idleTimeout As described in SSHD-715 [1] the NIO2_READ_TIMEOUT parameter was introduced in sshd version 1.3. [1] https://issues.apache.org/jira/browse/SSHD-715 Bug: Issue 6173 Change-Id: I6f930cafef9583a83aed2e6d05ff2a9f27c33cb8 --- gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java | 1 + 1 file changed, 1 insertion(+) diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java index 97a24f9e34..3c108b0f14 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java @@ -188,6 +188,7 @@ public class SshDaemon extends SshServer implements SshInfo, LifecycleListener { long idleTimeoutSeconds = ConfigUtil.getTimeUnit(cfg, "sshd", null, "idleTimeout", 0, SECONDS); getProperties().put(IDLE_TIMEOUT, String.valueOf(SECONDS.toMillis(idleTimeoutSeconds))); + getProperties().put(NIO2_READ_TIMEOUT, String.valueOf(SECONDS.toMillis(idleTimeoutSeconds))); long rekeyTimeLimit = ConfigUtil.getTimeUnit(cfg, "sshd", null, "rekeyTimeLimit", 3600, SECONDS);