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

update ssl documentation
---

diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index 658d972e8e56..a0a64782618b 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -279,6 +279,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
+
 .. method:: SSLSocket.getpeercert(binary_form=False)
 
    If there is no certificate for the peer on the other end of the