Merge branch '1.6'

qxmpp-project · Feb 13, 2024 · efe8685 · efe8685
2 parents 230a96f + 40528ef
commit efe8685
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/client/QXmppOutgoingClient.cpp b/src/client/QXmppOutgoingClient.cpp
@@ -552,9 +552,15 @@ void QXmppOutgoingClient::handleStanza(const QDomElement &nodeRecv)
     } else if (ns == ns_stream && nodeRecv.tagName() == "error") {
         // handle redirects
         const auto otherHost = nodeRecv.firstChildElement("see-other-host");
-        if (!otherHost.isNull() && setResumeAddress(otherHost.text())) {
-            QXmppStream::disconnectFromHost();
-            return;
+        if (!otherHost.isNull()) {
+            // try to parse address
+            if (auto [host, port] = parseHostAddress(otherHost.text()); !host.isEmpty()) {
+                d->redirectHost = host;
+                d->redirectPort = port > 0 ? port : 5222;
+
+                QXmppStream::disconnectFromHost();
+                return;
+            }
         }
 
         if (!nodeRecv.firstChildElement("conflict").isNull()) {