[X2Go-Commits] [x2goclient] 01/03: - Increase timeout in ssh_select

git-admin at x2go.org git-admin at x2go.org
Fri Jan 24 11:22:05 CET 2014


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

x2go pushed a commit to branch revtunnel
in repository x2goclient.

commit c796fa35327986f2f4883b39fdb7e0d881c89c38
Author: Oleksandr Shneyder <o.shneyder at phoca-gmbh.de>
Date:   Thu Jan 23 00:33:35 2014 +0100

    - Increase timeout in ssh_select
---
 debian/changelog        |    3 ++-
 sshmasterconnection.cpp |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2ba3cdc..5a2ac3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,8 @@ x2goclient (4.0.1.3-0x2go1) UNRELEASED; urgency=low
     - Enables forwarding (delegation) of GSSAPI credentials to the server. 
     - Make GSSAPI delegation configurable.
     - Update Russian translation file.
-    - Revrite SSH Classes to support libssh fix
+    - Rewrite SSH Classes to support libssh fix
+    - Increase timeout in ssh_select 
 
   [ Orion Poplawski ]
   * New upstream version (4.0.1.3):
diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp
index c161ab3..f7012fe 100755
--- a/sshmasterconnection.cpp
+++ b/sshmasterconnection.cpp
@@ -1391,7 +1391,7 @@ void SshMasterConnection::channelLoop()
         struct timeval tv;
 
         tv.tv_sec = 0;
-        tv.tv_usec = 500;
+        tv.tv_usec = 100000;
 
         int retval;
         int maxsock=-1;

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git



More information about the x2go-commits mailing list