[X2Go-Commits] [x2goclient] 01/01: src/sessionwidget.cpp: stop parsing proxy address as "host:port" if the address contains a colon. Fixes: #1418.

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository x2goclient.

commit 31a4d6c1b46c1608a5441e23c80f8e0db5e0d3a7
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun Dec 1 04:54:34 2019 +0100

    src/sessionwidget.cpp: stop parsing proxy address as "host:port" if the address contains a colon. Fixes: #1418.
    
    We don't do this for the "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.
---
 debian/changelog      | 5 +++++
 src/sessionwidget.cpp | 7 -------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0a280b4..2a51b0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -121,6 +121,11 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium
       retranslations required.
     - src/httpbrokerclient.cpp: do not leak password length in debug output
       either.
+    - src/sessionwidget.cpp: stop parsing proxy address as "host:port: if the
+      address contains a colon. Fixes: #1418. We don't do this for the
+      "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.
   * debian/control:
     + Add build-depend on pkg-config.
   * x2goclient.spec:
diff --git a/src/sessionwidget.cpp b/src/sessionwidget.cpp
index 4ead112..528495e 100644
--- a/src/sessionwidget.cpp
+++ b/src/sessionwidget.cpp
@@ -668,13 +668,6 @@ void SessionWidget::readConfig()
                                     false
                                 ).toBool() );
 
-    if(proxyHost->text().indexOf(":")!=-1)
-    {
-        QStringList parts=proxyHost->text().split(":");
-        proxyHost->setText(parts[0]);
-        proxyPort->setValue(parts[1].toInt());
-    }
-
 
     QTimer::singleShot(1, this,SLOT(slot_proxySameLogin()));
     QTimer::singleShot(2, this,SLOT(slot_proxyType()));

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