Ticket #3560: secure-mail.patch

django/core/mail.py

@@ -50 +50 @@
     """
     try:
         server = smtplib.SMTP(settings.EMAIL_HOST, settings.EMAIL_PORT)
+        try:
+            if settings.EMAIL_SECURE_SMTP:
+                server.ehlo()
+                server.starttls()
+                server.ehlo()
+        except AttributeError:
+            pass
         if auth_user and auth_password:
             server.login(auth_user, auth_password)
     except:
@@ -79 +86 @@
                 raise
     try:
         server.quit()
+    except socket.sslerror:
+        pass
     except:
         if fail_silently:
             return