You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by lg...@apache.org on 2020/08/18 05:49:04 UTC

[mina-sshd] 01/06: Added support for 'keeaplive@*' global request pattern

This is an automated email from the ASF dual-hosted git repository.

lgoldstein pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git

commit faa087e8dda07d0c34ae5bd4a05da9ece79287c0
Author: Lyor Goldstein <lg...@apache.org>
AuthorDate: Mon Aug 17 12:08:35 2020 +0300

    Added support for 'keeaplive@*' global request pattern
---
 .../src/main/java/org/apache/sshd/server/global/KeepAliveHandler.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sshd-core/src/main/java/org/apache/sshd/server/global/KeepAliveHandler.java b/sshd-core/src/main/java/org/apache/sshd/server/global/KeepAliveHandler.java
index 5ee1f2c..0b67283 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/global/KeepAliveHandler.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/global/KeepAliveHandler.java
@@ -40,7 +40,8 @@ public class KeepAliveHandler extends AbstractConnectionServiceRequestHandler {
     public Result process(
             ConnectionService connectionService, String request, boolean wantReply, Buffer buffer)
             throws Exception {
-        if (!request.startsWith("keepalive@")) {
+        // some clients use different strings - e.g., keep-alive@bitvise.com, keepalive@putty.projects.tartarus.org
+        if ((!request.startsWith("keepalive@")) && (!request.startsWith("keep-alive@"))) {
             return super.process(connectionService, request, wantReply, buffer);
         }