innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Refs #26487 -- Removed unneeded ehlo() calls in SMTP backend. 

starttls(), login(), and other connection methods already call
the method as needed.
This commit is contained in:
Tim Graham 2016-12-23 09:22:23 -05:00 committed by GitHub
parent 0a9bd266ff
commit bcae045de0
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/core/mail/backends/smtp.py
View File

@ -66,9 +66,7 @@ class EmailBackend(BaseEmailBackend):
# TLS/SSL are mutually exclusive, so only attempt TLS over # TLS/SSL are mutually exclusive, so only attempt TLS over
# non-secure connections. # non-secure connections.
if not self.use_ssl and self.use_tls: if not self.use_ssl and self.use_tls:
self.connection.ehlo()
self.connection.starttls(keyfile=self.ssl_keyfile, certfile=self.ssl_certfile) self.connection.starttls(keyfile=self.ssl_keyfile, certfile=self.ssl_certfile)
self.connection.ehlo()
if self.username and self.password: if self.username and self.password:
self.connection.login(force_str(self.username), force_str(self.password)) self.connection.login(force_str(self.username), force_str(self.password))
return True return True