Kaydet (Commit) 77b602a4 authored tarafından Russell Keith-Magee's avatar Russell Keith-Magee

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
üst f9ead3fe
...@@ -19,7 +19,10 @@ class EmailBackend(BaseEmailBackend): ...@@ -19,7 +19,10 @@ class EmailBackend(BaseEmailBackend):
self.port = port or settings.EMAIL_PORT self.port = port or settings.EMAIL_PORT
self.username = username or settings.EMAIL_HOST_USER self.username = username or settings.EMAIL_HOST_USER
self.password = password or settings.EMAIL_HOST_PASSWORD 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.connection = None
self._lock = threading.RLock() self._lock = threading.RLock()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment