Ticket #5248: mail_options.diff

django/conf/global_settings.py

@@ -127 +127 @@
 EMAIL_HOST_PASSWORD = ''
 EMAIL_USE_TLS = False
 
+# Optional SMTP mail_options
+EMAIL_MAIL_OPTIONS = []
+
 # List of strings representing installed apps.
 INSTALLED_APPS = ()
 

django/core/mail.py

@@ -107 +107 @@
     """
 
     def __init__(self, host=None, port=None, username=None, password=None,
-            use_tls=None, fail_silently=False):
+            use_tls=None, fail_silently=False, mail_options=[]):
         self.host = host or settings.EMAIL_HOST
         self.port = port or settings.EMAIL_PORT
         self.username = username or settings.EMAIL_HOST_USER
         self.password = password or settings.EMAIL_HOST_PASSWORD
         self.use_tls = (use_tls is not None) and use_tls or settings.EMAIL_USE_TLS
         self.fail_silently = fail_silently
+        self.mail_options = mail_options or settings.EMAIL_MAIL_OPTIONS
         self.connection = None
 
     def open(self):
@@ -180 +181 @@
         try:
             self.connection.sendmail(email_message.from_email,
                     email_message.recipients(),
-                    email_message.message().as_string())
+                    email_message.message().as_string(),
+                    self.mail_options)
         except:
             if not self.fail_silently:
                 raise

docs/email.txt

@@ -36 +36 @@
 .. _EMAIL_HOST_USER: ../settings/#email-host-user
 .. _EMAIL_HOST_PASSWORD: ../settings/#email-host-password
 .. _EMAIL_USE_TLS: ../settings/#email-use-tls
+.. _EMAIL_MAIL_OPTIONS: ../settings/#email-mail-options
 
 send_mail()
 ===========

docs/settings.txt

@@ -426 +426 @@
 
 See also ``EMAIL_HOST_PASSWORD``.
 
+EMAIL_MAIL_OPTIONS
+------------------
+
+Default: ``[]``
+
+The ESMTP options to use when sending mail to the SMTP server defined in 
+``EMAIL_HOST``.  The ESMTP options vary by MTA.  Example: Passing ['XVERP'] to
+Postfix, will enable varible envelope return path (VERP) delivery of messages.
+
 EMAIL_PORT
 ----------