[X2Go-Commits] [x2goclient] 01/07: src/sshmasterconnection: send EOF before closing channel.

git-admin at x2go.org git-admin at x2go.org
Wed May 20 09:41:12 CEST 2020


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 4ae8b905e350deff8440ff4077be8f001781c6e9
Author: Melroy van den Berg <melroy at melroy.org>
Date:   Wed May 20 08:38:44 2020 +0200

    src/sshmasterconnection: send EOF before closing channel.
---
 debian/changelog            | 4 ++++
 src/sshmasterconnection.cpp | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index bcf48fa..75cb2ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,10 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium
   * New upstream version (4.1.2.3):
     - x2goclient.pro: use the right C++ standard library on OS X/macOS.
 
+  [ Melroy van den Berg ]
+  * New upstream version (4.1.2.3):
+    - src/sshmasterconnection: send EOF before closing channel.
+
  -- X2Go Release Manager <git-admin at x2go.org>  Thu, 13 Feb 2020 12:31:20 +0100
 
 x2goclient (4.1.2.2-0x2go1) unstable; urgency=medium
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 8b59fe7..7adf5d2 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1753,8 +1753,8 @@ bool SshMasterConnection::checkLogin()
             sshProcErrString=tr("Reconnect session");
             x2goDebug<<"Reconnect session";
         }
-        ssh_channel_close(channel);
         ssh_channel_send_eof(channel);
+        ssh_channel_close(channel);
         ssh_channel_free(channel);
 	return retVal;
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git


More information about the x2go-commits mailing list