pep/slixmpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #349 from mulog1990/ssl-version-fix

Browse source 
ssl-version not passed to wrap_socket, fixed
This commit is contained in:
Mike Taylor 2015-04-11 18:26:05 -04:00
commit 271343a32d
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sleekxmpp/xmlstream/xmlstream.py
View file

@ -523,7 +523,8 @@ class XMLStream(object):
'keyfile': self.keyfile, 'keyfile': self.keyfile,
'ca_certs': self.ca_certs, 'ca_certs': self.ca_certs,
'cert_reqs': cert_policy, '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): if sys.version_info >= (2, 7):
@ -847,7 +848,8 @@ class XMLStream(object):
'keyfile': self.keyfile, 'keyfile': self.keyfile,
'ca_certs': self.ca_certs, 'ca_certs': self.ca_certs,
'cert_reqs': cert_policy, '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): if sys.version_info >= (2, 7):