only enable TLS if supported by BOTH parties

1 files changed, 3 insertions, 4 deletions

diff --git a/src/QXmppStream.cpp b/src/QXmppStream.cpp
index d1456b23..4e655885 100644
--- a/src/QXmppStream.cpp
+++ b/src/QXmppStream.cpp
@@ -376,11 +376,10 @@ void QXmppStream::parser(const QByteArray& data)
                 }
 
                 if (d->socket->supportsSsl() &&
-                    (remoteSecurity == QXmppConfiguration::TLSRequired ||
-                     localSecurity != QXmppConfiguration::TLSDisabled))
+                    remoteSecurity != QXmppConfiguration::TLSDisabled && 
+                    localSecurity != QXmppConfiguration::TLSDisabled)
                 {
-                    // enable TLS as it is required by the server
-                    // or supported by the client
+                    // enable TLS as it is support by both parties
                     sendToServer("<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>");
                     return;
                 }