diff options
| author | Florent Le Coz <louiz@louiz.org> | 2014-07-20 20:46:03 +0200 |
|---|---|---|
| committer | Florent Le Coz <louiz@louiz.org> | 2014-07-20 20:46:03 +0200 |
| commit | c2f6f077762282d311a6f876f94cc1a4eb9e805f (patch) | |
| tree | 935725c968da27ea1713617fa6fffcf2edbdc299 /slixmpp/features/feature_starttls/starttls.py | |
| parent | 5ab77c745270d7d5c016c1dc7ef2a82533a4b16e (diff) | |
| download | slixmpp-c2f6f077762282d311a6f876f94cc1a4eb9e805f.tar.gz slixmpp-c2f6f077762282d311a6f876f94cc1a4eb9e805f.tar.bz2 slixmpp-c2f6f077762282d311a6f876f94cc1a4eb9e805f.tar.xz slixmpp-c2f6f077762282d311a6f876f94cc1a4eb9e805f.zip | |
Make xmlstream use an asyncio loop
Scheduled events, connection, TLS handshake (with STARTTLS), read and write
on the socket are all done using only asyncio.
A lot of threads, and thread-related (and thus useless) things still remain.
This is only a first step.
Diffstat (limited to 'slixmpp/features/feature_starttls/starttls.py')
| -rw-r--r-- | slixmpp/features/feature_starttls/starttls.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/slixmpp/features/feature_starttls/starttls.py b/slixmpp/features/feature_starttls/starttls.py index 4b9dd60b..a05f755b 100644 --- a/slixmpp/features/feature_starttls/starttls.py +++ b/slixmpp/features/feature_starttls/starttls.py @@ -52,7 +52,7 @@ class FeatureSTARTTLS(BasePlugin): # We have already negotiated TLS, but the server is # offering it again, against spec. return False - elif not self.xmpp.use_tls: + elif self.xmpp.disable_starttls: return False else: self.xmpp.send(features['starttls'], now=True) @@ -63,4 +63,3 @@ class FeatureSTARTTLS(BasePlugin): log.debug("Starting TLS") if self.xmpp.start_tls(): self.xmpp.features.add('starttls') - raise RestartStream() |