This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit e22c24a75e8e1cad313756af3737e7dcc9086191 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Mon Oct 28 14:23:16 2019 +0100 Improve request handling in HTTP broker. --- debian/changelog | 1 + src/httpbrokerclient.cpp | 20 ++++++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 132f9d5..490b0b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,7 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium - Fix crashing if the path for automount in the session config file in wrong format. Supporting both Windows and Linux path in automount format. Check if path exists before mounting. - Do not show Pulseaudio warning on Windows, if Pulseaudio is disabled in settings or by command line. + - Improve request handling in HTTP broker. [ Mihai Moldovan ] * New upstream version (4.1.2.2): diff --git a/src/httpbrokerclient.cpp b/src/httpbrokerclient.cpp index e41e9d6..e202553 100644 --- a/src/httpbrokerclient.cpp +++ b/src/httpbrokerclient.cpp @@ -44,6 +44,11 @@ HttpBrokerClient::HttpBrokerClient ( ONMainWindow* wnd, ConfigFile* cfg ) config=cfg; mainWindow=wnd; sshConnection=0; + sessionsRequest=0l; + selSessRequest=0l; + chPassRequest=0l; + testConRequest=0l; + eventRequest=0l; QUrl lurl ( config->brokerurl ); if(lurl.userName().length()>0) config->brokerUser=lurl.userName(); @@ -629,6 +634,8 @@ void HttpBrokerClient::slotRequestFinished ( QNetworkReply* reply ) x2goDebug<<"Broker HTTP request failed with error: "<<reply->errorString(); if(reply == eventRequest) { + reply->deleteLater(); + eventRequest=0l; //do not exit, just return the function return; } @@ -641,22 +648,27 @@ void HttpBrokerClient::slotRequestFinished ( QNetworkReply* reply ) x2goDebug<<"A http request returned. Result was: "<<answer; if (reply == testConRequest) { + testConRequest=0l; slotConnectionTest(true,answer,0); } - if (reply == sessionsRequest) + else if (reply == sessionsRequest) { + sessionsRequest=0l; slotListSessions(true, answer,0); } - if (reply == selSessRequest) + else if (reply == selSessRequest) { + selSessRequest=0l; slotSelectSession(true,answer,0); } - if (reply == chPassRequest) + else if (reply == chPassRequest) { + chPassRequest=0l; slotPassChanged(true,answer,0); } - if (reply == eventRequest) + else if (reply == eventRequest) { + eventRequest=0l; slotEventSent(true,answer,0); } -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git