[X2Go-Commits] [x2goclient] 01/01: src/onmainwindow.cpp: also remove proxy "host:port" parsing at connect time. Fixes: #1418.

git-admin at x2go.org git-admin at x2go.org
Sun Dec 1 09:55:10 CET 2019


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

x2go pushed a commit to branch master
in repository x2goclient.

commit 50cb6c6fe1456c06b76ab4083f0c2784b38f5157
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun Dec 1 09:54:55 2019 +0100

    src/onmainwindow.cpp: also remove proxy "host:port" parsing at connect time. Fixes: #1418.
---
 debian/changelog     | 2 ++
 src/onmainwindow.cpp | 6 ------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2a51b0c..0ee9918 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -126,6 +126,8 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium
       "normal" host address and this behavior clashes with IPv6 addresses. We
       COULD, theoretically, keep it, but that would require writing an
       arbitrary address parser. Too much effort for little gain.
+    - src/onmainwindow.cpp: also remove proxy "host:port" parsing at connect
+      time. Fixes: #1418.
   * debian/control:
     + Add build-depend on pkg-config.
   * x2goclient.spec:
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 872f952..b226c62 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -3786,12 +3786,6 @@ bool ONMainWindow::startSession ( const QString& sid, CONTYPE conType )
         proxyKrbLogin = config.proxyKrbLogin;
     }
 
-    if (proxyserver.indexOf (":") != -1) {
-        QStringList parts = proxyserver.split (":");
-        proxyserver = parts[0];
-        proxyport = parts[1].toInt ();
-    }
-
     bool proxySamePass=(st->setting()->value (
                             sid+"/sshproxysamepass",
                             false

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git


More information about the x2go-commits mailing list