This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from 2300b46 res/i18n/x2goclient_nb_no.ts: fix (meta data) typo introduced with last commit. new 2b70cfc sshmasterconnection.cpp: don't fetch invalid proxy socket. Fixes: #1000. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 9 +++++++++ src/sshmasterconnection.cpp | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 2b70cfccc00295a029015c9e181f8afdd21901e4 Author: Heinrich Schuchardt <xypron.glpk@gmx.de> Date: Mon Feb 22 00:08:28 2016 +0100 sshmasterconnection.cpp: don't fetch invalid proxy socket. Fixes: #1000. From http://doc.qt.io/qt-4.8/qabstractsocket.html#socketDescriptor: The socket descriptor is not available when QAbstractSocket is in UnconnectedState. So we have to connect to the proxy server first before retrieving the native socket. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> --- debian/changelog | 9 +++++++++ src/sshmasterconnection.cpp | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index cfea700..b680248 100644 --- a/debian/changelog +++ b/debian/changelog @@ -113,6 +113,15 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low * New upstream version (4.0.5.1): - res/i18n/x2goclient_nb_no.ts: update Bokmål (Norway) translation file. + [ Heinrich Schuchardt ] + * New upstream version (4.0.5.1): + - sshmasterconnection.cpp: don't fetch invalid proxy socket. Fixes: #1000. + From http://doc.qt.io/qt-4.8/qabstractsocket.html#socketDescriptor: + The socket descriptor is not available when QAbstractSocket is in + UnconnectedState. + So we have to connect to the proxy server first before retrieving the + native socket. + -- X2Go Release Manager <git-admin@x2go.org> Tue, 28 Jul 2015 06:05:27 +0200 x2goclient (4.0.5.0-0x2go1) unstable; urgency=low diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp index 5b3cff5..bb69047 100644 --- a/src/sshmasterconnection.cpp +++ b/src/sshmasterconnection.cpp @@ -548,7 +548,6 @@ void SshMasterConnection::run() tcpProxySocket = new QTcpSocket(); tcpProxySocket->setProxy( *tcpNetworkProxy ); tcpProxySocket->connectToHost(host, port); - proxysocket = tcpProxySocket->socketDescriptor(); if (!tcpProxySocket->waitForConnected(30000)) { QString message=tr ( "Cannot connect to proxy server." ); @@ -560,6 +559,7 @@ void SshMasterConnection::run() quit(); return; } + proxysocket = tcpProxySocket->socketDescriptor(); #ifdef DEBUG x2goDebug << "Created HTTP proxy socket: " << proxysocket << endl; #endif -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org