jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Lance Stout 2012-06-15 15:36:30 -07:00
commit 55d332bcc8
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.rst
View File

@ -45,7 +45,7 @@ The latest source code for SleekXMPP may be found on `Github
``develop`` branch. ``develop`` branch.
**Latest Release** **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** **Develop Releases**
- `Latest Develop Version <http://github.com/fritzy/SleekXMPP/zipball/develop>`_ - `Latest Develop Version <http://github.com/fritzy/SleekXMPP/zipball/develop>`_

4
sleekxmpp/version.py
View File

@ -9,5 +9,5 @@
# We don't want to have to import the entire library # We don't want to have to import the entire library
# just to get the version info for setup.py # just to get the version info for setup.py
__version__ = '1.1.4' __version__ = '1.1.5'
__version_info__ = (1, 1, 4, '', 0) __version_info__ = (1, 1, 5, '', 0)

4
sleekxmpp/xmlstream/xmlstream.py
View File

@ -534,7 +534,7 @@ class XMLStream(object):
if not self.event_handled('ssl_invalid_cert'): if not self.event_handled('ssl_invalid_cert'):
self.disconnect(send_close=False) self.disconnect(send_close=False)
else: 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) self.set_socket(self.socket, ignore=True)
#this event is where you should set your application state #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'): if not self.event_handled('ssl_invalid_cert'):
self.disconnect(self.auto_reconnect, send_close=False) self.disconnect(self.auto_reconnect, send_close=False)
else: else:
self.event('ssl_invalid_cert', cert, direct=True) self.event('ssl_invalid_cert', pem_cert, direct=True)
self.set_socket(self.socket) self.set_socket(self.socket)
return True return True