Merged revisions 65658,65869,65882 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r65658 | bill.janssen | 2008-08-12 12:09:57 -0500 (Tue, 12 Aug 2008) | 1 line
update ssl documentation
................
r65869 | benjamin.peterson | 2008-08-19 14:27:53 -0500 (Tue, 19 Aug 2008) | 1 line
fix a little typo
................
r65882 | benjamin.peterson | 2008-08-19 16:07:15 -0500 (Tue, 19 Aug 2008) | 9 lines
Merged revisions 65876 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r65876 | benjamin.peterson | 2008-08-19 15:54:52 -0500 (Tue, 19 Aug 2008) | 1 line
apply a fix I think will help Windows
........
................
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index a0a6478..8e1c6b0 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -335,6 +335,15 @@
established, returns ``None``.
+.. method:: SSLSocket.unwrap()
+
+ Performs the SSL shutdown handshake, which removes the TLS layer
+ from the underlying socket, and returns the underlying socket
+ object. This can be used to go from encrypted operation over a
+ connection to unencrypted. The returned socket should always be
+ used for further communication with the other side of the
+ connection, rather than the original socket
+
.. index:: single: certificates
.. index:: single: X509 certificate