[X2Go-Commits] [x2goclient] 01/01: Increase ssh_select timeout to 0.5 sec.

[git-admin at x2go.org]

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

x2go pushed a commit to branch release/4.0.1.x
in repository x2goclient.

commit 5b935e26eab2bdfb4be1a7e63509b570f466ac51
Author: Oleksandr Shneyder <o.schneyder at phoca-gmbh.de>
Date:   Fri Jan 24 12:21:10 2014 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 7a27bea..b3e4049 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ x2goclient (4.0.1.4-0x2go1) UNRELEASED; urgency=low
 
   [ Oleksandr Shneyder ]
   * New upstream version (4.0.1.4):
-    - Increase timeout in ssh_select.
+    - Increase ssh_select timeout to 0.5 sec.
     - Set mod map from client to server on Mac, hide keyboard settings on Mac.
     - Fix mod map on Mac with kerberos.
     - Fix focus on pass form.
diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp
index d4f6e34..34eea42 100755
--- a/sshmasterconnection.cpp
+++ b/sshmasterconnection.cpp
@@ -1445,7 +1445,7 @@ void SshMasterConnection::channelLoop()
         struct timeval tv;
 
         tv.tv_sec = 0;
-        tv.tv_usec = 100000;
+        tv.tv_usec = 500000;
 
         int retval;
         int maxsock=-1;

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