diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-06-15 15:36:30 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-06-15 15:36:30 -0700 |
| commit | 55d332bcc86c2775f259a2278aa85ba71126e978 (patch) | |
| tree | 60e89fec901ef9fa2d1219a34a093b2c5e3f2d7f | |
| parent | f89df6e70cee5840dbdbf41e68ae7d2384814373 (diff) | |
| parent | ee702f40710219290508f95ac01df50a96d04f3c (diff) | |
| download | slixmpp-55d332bcc86c2775f259a2278aa85ba71126e978.tar.gz slixmpp-55d332bcc86c2775f259a2278aa85ba71126e978.tar.bz2 slixmpp-55d332bcc86c2775f259a2278aa85ba71126e978.tar.xz slixmpp-55d332bcc86c2775f259a2278aa85ba71126e978.zip | |
Merge branch 'master' into develop
| -rw-r--r-- | README.rst | 2 | ||||
| -rw-r--r-- | sleekxmpp/version.py | 4 | ||||
| -rw-r--r-- | sleekxmpp/xmlstream/xmlstream.py | 4 |
3 files changed, 5 insertions, 5 deletions
@@ -45,7 +45,7 @@ The latest source code for SleekXMPP may be found on `Github ``develop`` branch. **Latest Release** - - `1.1.4 <http://github.com/fritzy/SleekXMPP/zipball/1.1.4>`_ + - `1.1.5 <http://github.com/fritzy/SleekXMPP/zipball/1.1.5>`_ **Develop Releases** - `Latest Develop Version <http://github.com/fritzy/SleekXMPP/zipball/develop>`_ diff --git a/sleekxmpp/version.py b/sleekxmpp/version.py index ec793dd8..7970c3b5 100644 --- a/sleekxmpp/version.py +++ b/sleekxmpp/version.py @@ -9,5 +9,5 @@ # We don't want to have to import the entire library # just to get the version info for setup.py -__version__ = '1.1.4' -__version_info__ = (1, 1, 4, '', 0) +__version__ = '1.1.5' +__version_info__ = (1, 1, 5, '', 0) 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 |