Merge branch 'master' into develop

README.rst

@@ -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>`_

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)

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