From: Bill Janssen <janssen@parc.com>
Date: Tue, 12 Aug 2008 17:09:57 +0000 (+0000)
Subject: update ssl documentation
X-Git-Tag: v2.6b3~93
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5bfbd763f3f34d779e6435fb13d79f61f25e1af6;p=thirdparty%2FPython%2Fcpython.git

update ssl documentation
---

diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index a41c6ea6217c..df161fd3c032 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -322,6 +322,15 @@ SSLSocket Objects
                 else:
                     raise
 
+.. 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