From bcae045de01588debe49b266a07a5bfb95068679 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Fri, 23 Dec 2016 09:22:23 -0500 Subject: [PATCH] Refs #26487 -- Removed unneeded ehlo() calls in SMTP backend. starttls(), login(), and other connection methods already call the method as needed. --- django/core/mail/backends/smtp.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/django/core/mail/backends/smtp.py b/django/core/mail/backends/smtp.py index aaacaad517..dbff399d8c 100644 --- a/django/core/mail/backends/smtp.py +++ b/django/core/mail/backends/smtp.py @@ -66,9 +66,7 @@ class EmailBackend(BaseEmailBackend): # TLS/SSL are mutually exclusive, so only attempt TLS over # non-secure connections. 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.ehlo() if self.username and self.password: self.connection.login(force_str(self.username), force_str(self.password)) return True