summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2008-08-19 21:42:13 (GMT)
committerBenjamin Peterson <benjamin@python.org>2008-08-19 21:42:13 (GMT)
commit4aeec046244fc5a069668f8b42b6ea58a988e8ff (patch)
tree0a8e2911e1c4d02e39d3a5b3c5577a1a236e7114 /Doc
parent949d47dc7adc464c0c70b258a02b89fd67791c1a (diff)
downloadcpython-4aeec046244fc5a069668f8b42b6ea58a988e8ff.zip
cpython-4aeec046244fc5a069668f8b42b6ea58a988e8ff.tar.gz
cpython-4aeec046244fc5a069668f8b42b6ea58a988e8ff.tar.bz2
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 ........ ................
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/ssl.rst9
1 files changed, 9 insertions, 0 deletions
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 @@ SSLSocket Objects
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