don't require OpenSSL SNI to pass hostname to ssl functions (#22921)
Patch by Donald Stufft.
diff --git a/Lib/ftplib.py b/Lib/ftplib.py
index c83be2b..9c73f5f 100644
--- a/Lib/ftplib.py
+++ b/Lib/ftplib.py
@@ -747,9 +747,8 @@
resp = self.voidcmd('AUTH TLS')
else:
resp = self.voidcmd('AUTH SSL')
- server_hostname = self.host if ssl.HAS_SNI else None
self.sock = self.context.wrap_socket(self.sock,
- server_hostname=server_hostname)
+ server_hostname=self.host)
self.file = self.sock.makefile(mode='r', encoding=self.encoding)
return resp
@@ -788,9 +787,8 @@
def ntransfercmd(self, cmd, rest=None):
conn, size = FTP.ntransfercmd(self, cmd, rest)
if self._prot_p:
- server_hostname = self.host if ssl.HAS_SNI else None
conn = self.context.wrap_socket(conn,
- server_hostname=server_hostname)
+ server_hostname=self.host)
return conn, size
def abort(self):