summaryrefslogtreecommitdiff
path: root/odoo/addons/base/models/ir_mail_server.py
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2019-07-05 11:13:53 +0200
committerChristophe Simonis <chs@odoo.com>2019-07-05 11:13:53 +0200
commit039e6bae9916aaa9d82bc558817a7ed7d0ea3c68 (patch)
treefa0f0e71de1c077db86593704eb83fc1b2115e87 /odoo/addons/base/models/ir_mail_server.py
parent50d21df1561f660c184329cfc4cb567ea5d79ace (diff)
parent9c742d0c656412beba7201085abd4cecc81f5d27 (diff)
[MERGE] forward port branch 12.0 up to 9c742d0c656
Diffstat (limited to 'odoo/addons/base/models/ir_mail_server.py')
-rw-r--r--odoo/addons/base/models/ir_mail_server.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/odoo/addons/base/models/ir_mail_server.py b/odoo/addons/base/models/ir_mail_server.py
index 2422b9cf4a9..9ab49f9e5c5 100644
--- a/odoo/addons/base/models/ir_mail_server.py
+++ b/odoo/addons/base/models/ir_mail_server.py
@@ -279,6 +279,11 @@ class IrMailServer(models.Model):
smtp_user = pycompat.to_text(ustr(smtp_user))
smtp_password = pycompat.to_text(ustr(smtp_password))
connection.login(smtp_user, smtp_password)
+
+ # Some methods of SMTP don't check whether EHLO/HELO was sent.
+ # Anyway, as it may have been sent by login(), all subsequent usages should consider this command as sent.
+ connection.ehlo_or_helo_if_needed()
+
return connection
def build_email(self, email_from, email_to, subject, body, email_cc=None, email_bcc=None, reply_to=False,