From 45f9366d586f1721a79241067de786bfd874695c Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Mon, 22 Dec 2008 09:59:35 +0000 Subject: [PATCH] do'nt try starttls if stream version < 1.0. Fixes #4600 --- src/common/xmpp/client_nb.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/xmpp/client_nb.py b/src/common/xmpp/client_nb.py index 0f84981b1..7cccb1065 100644 --- a/src/common/xmpp/client_nb.py +++ b/src/common/xmpp/client_nb.py @@ -329,16 +329,16 @@ class NonBlockingClient: # if we want plain connection, we're done now self._on_connect() return - if not self.Dispatcher.Stream.features.getTag('starttls'): - # if server doesn't advertise TLS in init response, we can't do more - log.warn('While connecting with type = "tls": TLS unsupported by remote server') - self._on_connect() - return if self.incoming_stream_version() != '1.0': # if stream version is less than 1.0, we can't do more log.warn('While connecting with type = "tls": stream version is less than 1.0') self._on_connect() return + if not self.Dispatcher.Stream.features.getTag('starttls'): + # if server doesn't advertise TLS in init response, we can't do more + log.warn('While connecting with type = "tls": TLS unsupported by remote server') + self._on_connect() + return # otherwise start TLS negotioation self.stream_started = False log.info("TLS supported by remote server. Requesting TLS start.")