Commit 77b602a4 authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

Fixed #11849 -- Corrected handling of use_tls in the SMTP mail handler. Thanks... 

Fixed #11849 -- Corrected handling of use_tls in the SMTP mail handler. Thanks to aromano for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@11714 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent f9ead3fe

django/core/mail/backends/smtp.py

+4 −1
Original line number Diff line number Diff line
@@ -19,7 +19,10 @@ class EmailBackend(BaseEmailBackend): 
        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

        if use_tls is None:

            self.use_tls = settings.EMAIL_USE_TLS

        else:

            self.use_tls = use_tls

        self.connection = None

        self._lock = threading.RLock()