summaryrefslogtreecommitdiff
path: root/Doc/library/ftplib.rst
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2013-12-02 02:56:02 +0100
committerChristian Heimes <christian@cheimes.de>2013-12-02 02:56:02 +0100
commitd2fb1d098e418d099d7a2b7893a1201f606122fe (patch)
tree5e4bc5b212ad96d1c810c378cffede37ce02d3dc /Doc/library/ftplib.rst
parent2d78ed490748611e7dfa8c5f64b4fb77cffa6b1a (diff)
downloadcpython-d2fb1d098e418d099d7a2b7893a1201f606122fe.tar.gz
Issue #19781: ftplib now supports SSLContext.check_hostname and server name
indication for TLS/SSL connections.
Diffstat (limited to 'Doc/library/ftplib.rst')
-rw-r--r--Doc/library/ftplib.rst10
1 files changed, 10 insertions, 0 deletions
diff --git a/Doc/library/ftplib.rst b/Doc/library/ftplib.rst
index dcb2ac4107..7f98d0bd81 100644
--- a/Doc/library/ftplib.rst
+++ b/Doc/library/ftplib.rst
@@ -94,6 +94,11 @@ The module defines the following items:
.. versionchanged:: 3.3
*source_address* parameter was added.
+ .. versionchanged:: 3.4
+ The class now supports hostname check with
+ :attr:`SSLContext.check_hostname` and *Server Name Indicator* (see
+ :data:`~ssl.HAS_SNI`).
+
Here's a sample session using the :class:`FTP_TLS` class:
>>> from ftplib import FTP_TLS
@@ -427,6 +432,11 @@ FTP_TLS Objects
Set up secure control connection by using TLS or SSL, depending on what
specified in :meth:`ssl_version` attribute.
+ .. versionchanged:: 3.4
+ The method now supports hostname check with
+ :attr:`SSLContext.check_hostname` and *Server Name Indicator* (see
+ :data:`~ssl.HAS_SNI`).
+
.. method:: FTP_TLS.ccc()
Revert control channel back to plaintext. This can be useful to take