Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.1.X] Fixed #11849 -- Corrected handling of use_tls in the SMTP mai…

…l handler. Thanks to aromano for the report.

Backport of r11714 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11715 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 9a38c1cdb2b04ab62d46ee3fcc709680ca5d74ed 1 parent a9c816c
@freakboy3742 freakboy3742 authored
Showing with 4 additions and 1 deletion.
  1. +4 −1 django/core/mail.py
View
5 django/core/mail.py
@@ -112,7 +112,10 @@ def __init__(self, host=None, port=None, username=None, password=None,
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.fail_silently = fail_silently
self.connection = None
Please sign in to comment.
Something went wrong with that request. Please try again.