mirror of
https://github.com/django/django.git
synced 2024-12-24 10:05:46 +00:00
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
This commit is contained in:
parent
f9ead3fe42
commit
77b602a4ab
@ -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()
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user