summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2013-12-02 01:56:02 (GMT)
committerChristian Heimes <christian@cheimes.de>2013-12-02 01:56:02 (GMT)
commite5b5edfa2ccf2c031be156a03267dc5629feda77 (patch)
treeaadbba4b4cfadf99b963a7db9e18d8fa2bb6c08d /Doc/library
parent1aa9a75fbff2333fd07574e3de8710c629483258 (diff)
downloadcpython-e5b5edfa2ccf2c031be156a03267dc5629feda77.zip
cpython-e5b5edfa2ccf2c031be156a03267dc5629feda77.tar.gz
cpython-e5b5edfa2ccf2c031be156a03267dc5629feda77.tar.bz2
Issue #19781: ftplib now supports SSLContext.check_hostname and server name
indication for TLS/SSL connections.
Diffstat (limited to 'Doc/library')
-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 dcb2ac4..7f98d0b 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