summaryrefslogtreecommitdiff
path: root/sleekxmpp
diff options
context:
space:
mode:
authormulog1990 <jimmylau.whu@gmail.com>2015-03-10 18:13:53 +0800
committermulog1990 <jimmylau.whu@gmail.com>2015-03-10 18:13:53 +0800
commit460de7d30138c39482efff1900ec23b23047949d (patch)
tree6fe708ba04a9d6183ff576bb0c519c6e3ac2b20c /sleekxmpp
parent27582f6fd29e365253e7f3bf2e318a5403da9b73 (diff)
downloadslixmpp-460de7d30138c39482efff1900ec23b23047949d.tar.gz
slixmpp-460de7d30138c39482efff1900ec23b23047949d.tar.bz2
slixmpp-460de7d30138c39482efff1900ec23b23047949d.tar.xz
slixmpp-460de7d30138c39482efff1900ec23b23047949d.zip
ssl-version not passed to wrap_socket, fixed
Diffstat (limited to 'sleekxmpp')
-rw-r--r--sleekxmpp/xmlstream/xmlstream.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py
index e011cf3d..62249f78 100644
--- a/sleekxmpp/xmlstream/xmlstream.py
+++ b/sleekxmpp/xmlstream/xmlstream.py
@@ -523,7 +523,8 @@ class XMLStream(object):
'keyfile': self.keyfile,
'ca_certs': self.ca_certs,
'cert_reqs': cert_policy,
- 'do_handshake_on_connect': False
+ 'do_handshake_on_connect': False,
+ "ssl_version": self.ssl_version
})
if sys.version_info >= (2, 7):
@@ -847,7 +848,8 @@ class XMLStream(object):
'keyfile': self.keyfile,
'ca_certs': self.ca_certs,
'cert_reqs': cert_policy,
- 'do_handshake_on_connect': False
+ 'do_handshake_on_connect': False,
+ "ssl_version": self.ssl_version
})
if sys.version_info >= (2, 7):