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 3920c4d90829ae7152963f76ce14bbd6ccb3ce28 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Thu Jan 23 00:33:35 2014 +0100 - Increase timeout in ssh_select Conflicts (resolved by Mike Gabriel): debian/changelog --- debian/changelog | 4 +++- sshmasterconnection.cpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a8b55bc..a60493f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ x2goclient (4.0.1.4-0x2go1) UNRELEASED; urgency=low - * Continue development on current release / Baikal LTS branch... + [ Oleksandr Shneyder ] + * New upstream version (4.0.1.4): + - Increase timeout in ssh_select. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 22 Jan 2014 09:17:39 +0100 diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp index 8355611..d4f6e34 100755 --- a/sshmasterconnection.cpp +++ b/sshmasterconnection.cpp @@ -1445,7 +1445,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