changeset:   94016:98ee845a139a
branch:      2.7
parent:      94010:1346a6013127
user:        Benjamin Peterson <benjamin@python.org>
date:        Sun Jan 04 10:20:16 2015 -0600
files:       Doc/library/ftplib.rst Lib/ftplib.py Misc/NEWS
description:
make SSLv23 the default version in ftplib (closes #23111)


diff -r 1346a6013127 -r 98ee845a139a Doc/library/ftplib.rst
--- a/Doc/library/ftplib.rst	Sat Jan 03 05:23:39 2015 -0500
+++ b/Doc/library/ftplib.rst	Sun Jan 04 10:20:16 2015 -0600
@@ -384,7 +384,7 @@
 
 .. attribute:: FTP_TLS.ssl_version
 
-   The SSL version to use (defaults to *TLSv1*).
+   The SSL version to use (defaults to :attr:`ssl.PROTOCOL_SSLv23`).
 
 .. method:: FTP_TLS.auth()
 
diff -r 1346a6013127 -r 98ee845a139a Lib/ftplib.py
--- a/Lib/ftplib.py	Sat Jan 03 05:23:39 2015 -0500
+++ b/Lib/ftplib.py	Sun Jan 04 10:20:16 2015 -0600
@@ -638,7 +638,7 @@
         '221 Goodbye.'
         >>>
         '''
-        ssl_version = ssl.PROTOCOL_TLSv1
+        ssl_version = ssl.PROTOCOL_SSLv23
 
         def __init__(self, host='', user='', passwd='', acct='', keyfile=None,
                      certfile=None, timeout=_GLOBAL_DEFAULT_TIMEOUT):
@@ -656,7 +656,7 @@
             '''Set up secure control connection by using TLS/SSL.'''
             if isinstance(self.sock, ssl.SSLSocket):
                 raise ValueError("Already using TLS")
-            if self.ssl_version == ssl.PROTOCOL_TLSv1:
+            if self.ssl_version >= ssl.PROTOCOL_SSLv23:
                 resp = self.voidcmd('AUTH TLS')
             else:
                 resp = self.voidcmd('AUTH SSL')
diff -r 1346a6013127 -r 98ee845a139a Misc/NEWS
--- a/Misc/NEWS	Sat Jan 03 05:23:39 2015 -0500
+++ b/Misc/NEWS	Sun Jan 04 10:20:16 2015 -0600
@@ -15,6 +15,8 @@
 Library
 -------
 
+- Issue #23111: Maximize compatibility in protocol versions of ftplib.FTP_TLS.
+
 - Issue #23112: Fix SimpleHTTPServer to correctly carry the query string and
   fragment when it redirects to add a trailing slash.