summaryrefslogtreecommitdiff
path: root/sleekxmpp/xmlstream
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-06-15 15:36:30 -0700
committerLance Stout <lancestout@gmail.com>2012-06-15 15:36:30 -0700
commit55d332bcc86c2775f259a2278aa85ba71126e978 (patch)
tree60e89fec901ef9fa2d1219a34a093b2c5e3f2d7f /sleekxmpp/xmlstream
parentf89df6e70cee5840dbdbf41e68ae7d2384814373 (diff)
parentee702f40710219290508f95ac01df50a96d04f3c (diff)
downloadslixmpp-55d332bcc86c2775f259a2278aa85ba71126e978.tar.gz
slixmpp-55d332bcc86c2775f259a2278aa85ba71126e978.tar.bz2
slixmpp-55d332bcc86c2775f259a2278aa85ba71126e978.tar.xz
slixmpp-55d332bcc86c2775f259a2278aa85ba71126e978.zip
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/xmlstream')
-rw-r--r--sleekxmpp/xmlstream/xmlstream.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py
index c0d02e9b..40ae38c9 100644
--- a/sleekxmpp/xmlstream/xmlstream.py
+++ b/sleekxmpp/xmlstream/xmlstream.py
@@ -534,7 +534,7 @@ class XMLStream(object):
if not self.event_handled('ssl_invalid_cert'):
self.disconnect(send_close=False)
else:
- self.event('ssl_invalid_cert', cert, direct=True)
+ self.event('ssl_invalid_cert', pem_cert, direct=True)
self.set_socket(self.socket, ignore=True)
#this event is where you should set your application state
@@ -821,7 +821,7 @@ class XMLStream(object):
if not self.event_handled('ssl_invalid_cert'):
self.disconnect(self.auto_reconnect, send_close=False)
else:
- self.event('ssl_invalid_cert', cert, direct=True)
+ self.event('ssl_invalid_cert', pem_cert, direct=True)
self.set_socket(self.socket)
return True