Author: js Date: 2009-01-10 23:47:17 +0100 (Sat, 10 Jan 2009) New Revision: 10964

Modified: branches/osx_newbuildsys/src/common/xmpp/client_nb.py Log: Merge trunk r10963.

Modified: branches/osx_newbuildsys/src/common/xmpp/client_nb.py =================================================================== --- branches/osx_newbuildsys/src/common/xmpp/client_nb.py 2009-01-10 22:46:26 UTC (rev 10963) +++ branches/osx_newbuildsys/src/common/xmpp/client_nb.py 2009-01-10 22:47:17 UTC (rev 10964) @@ -346,6 +346,7 @@ if self.desired_security == 'plain': # if we want and have plain connection, we're done now self._on_connect() + return else: # try to negotiate TLS if self.incoming_stream_version() != '1.0': @@ -358,12 +359,15 @@ self.stream_started = False log.info('TLS supported by remote server. Requesting TLS start.') self._tls_negotiation_handler() + return else: log.warn('While connecting with type = "tls": TLS unsupported by remote server') self._on_connect() + return

elif self.connected in ['ssl', 'tls']: self._on_connect() + return assert False # should never be reached

def _tls_negotiation_handler(self, con=None, tag=None):