Ticket #13142: smtp_ssl_final.diff

docs/topics/email.txt

@@ -27 +27 @@
 :setting:`EMAIL_HOST` and :setting:`EMAIL_PORT` settings. The
 :setting:`EMAIL_HOST_USER` and :setting:`EMAIL_HOST_PASSWORD` settings, if
 set, are used to authenticate to the SMTP server, and the
-:setting:`EMAIL_USE_TLS` setting controls whether a secure connection is used.
+:setting:`EMAIL_USE_TLS` or :setting:`EMAIL_USE_SSL` setting controls whether a secure connection is used.
 
 .. note::
 

docs/ref/settings.txt

@@ -977 +977 @@
 
 Whether to use a TLS (secure) connection when talking to the SMTP server.
 
+.. setting:: EMAIL_USE_SSL
+
+EMAIL_USE_SSL
+-------------
+
+Default: ``False``
+
+Whether to use a SSL (secure) connection when talking to the SMTP server. 
+
+.. warning::
+
+        Requirements: Python 2.6 or higher
+
 .. setting:: FILE_CHARSET
 
 FILE_CHARSET
@@ -1027 +1040 @@
 
 .. warning::
 
-    **Always prefix the mode with a 0.**
+        **Always prefix the mode with a 0.**
 
     If you're not familiar with file modes, please note that the leading
     ``0`` is very important: it indicates an octal number, which is the

django/conf/global_settings.py

@@ -171 +171 @@
 EMAIL_HOST_USER = ''
 EMAIL_HOST_PASSWORD = ''
 EMAIL_USE_TLS = False
+EMAIL_USE_SSL = False
 
 # List of strings representing installed apps.
 INSTALLED_APPS = ()

django/core/mail/backends/smtp.py

@@ -2 +2 @@
 import smtplib
 import socket
 import threading
+from sys import version_info
 
 from django.conf import settings
 from django.core.mail.backends.base import BaseEmailBackend
@@ -14 +15 @@
     A wrapper that manages the SMTP network connection.
     """
     def __init__(self, host=None, port=None, username=None, password=None,
-                 use_tls=None, fail_silently=False, **kwargs):
+                 use_ssl=None, use_tls=None, fail_silently=False, **kwargs):
         super(EmailBackend, self).__init__(fail_silently=fail_silently)
         self.host = host or settings.EMAIL_HOST
         self.port = port or settings.EMAIL_PORT
@@ -26 +27 @@
             self.password = settings.EMAIL_HOST_PASSWORD
         else:
             self.password = password
+        if use_ssl is None: 
+            if settings.EMAIL_USE_SSL and version_info < (2, 6): 
+                self.use_ssl = False 
+            self.use_ssl = settings.EMAIL_USE_SSL 
         if use_tls is None:
             self.use_tls = settings.EMAIL_USE_TLS
         else:
@@ -44 +49 @@
         try:
             # If local_hostname is not specified, socket.getfqdn() gets used.
             # For performance, we use the cached FQDN for local_hostname.
-            self.connection = smtplib.SMTP(self.host, self.port,
-                                           local_hostname=DNS_NAME.get_fqdn())
+            if self.use_ssl:
+                self.connection = smtplib.SMTP_SSL(self.host, self.port,
+                        local_hostname=DNS_NAME.get_fqdn())
+            else:
+                self.connection = smtplib.SMTP(self.host, self.port,
+                        local_hostname=DNS_NAME.get_fqdn())
             if self.use_tls:
                 self.connection.ehlo()
                 self.connection.starttls()