diff options
| author | Tim Graham <timograham@gmail.com> | 2016-12-23 09:22:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-23 09:22:23 -0500 |
| commit | bcae045de01588debe49b266a07a5bfb95068679 (patch) | |
| tree | 38fe5e778b75844a5b49b018f789df13295acc32 | |
| parent | 0a9bd266ff8e042f53e25928527a29ce896b4955 (diff) | |
Refs #26487 -- Removed unneeded ehlo() calls in SMTP backend.
starttls(), login(), and other connection methods already call
the method as needed.
| -rw-r--r-- | django/core/mail/backends/smtp.py | 2 |
1 files changed, 0 insertions, 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 |