summaryrefslogtreecommitdiff
path: root/sleekxmpp/xmlstream
diff options
context:
space:
mode:
authorMike Taylor <bear42@gmail.com>2015-04-11 18:26:05 -0400
committerMike Taylor <bear42@gmail.com>2015-04-11 18:26:05 -0400
commit271343a32d60dccf7c8095b7e469eaa0609b81b1 (patch)
tree416b939c9f98adfb8baf77e68484ae50b88b2578 /sleekxmpp/xmlstream
parent48857b0030fd53d19ebc07a50a7ec6cecdc8f558 (diff)
parent460de7d30138c39482efff1900ec23b23047949d (diff)
downloadslixmpp-271343a32d60dccf7c8095b7e469eaa0609b81b1.tar.gz
slixmpp-271343a32d60dccf7c8095b7e469eaa0609b81b1.tar.bz2
slixmpp-271343a32d60dccf7c8095b7e469eaa0609b81b1.tar.xz
slixmpp-271343a32d60dccf7c8095b7e469eaa0609b81b1.zip
Merge pull request #349 from mulog1990/ssl-version-fix
ssl-version not passed to wrap_socket, fixed
Diffstat (limited to 'sleekxmpp/xmlstream')
-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):