test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #9214: EmailMessage now respects the From header instead of blindly using from_email. Thanks, Tai Lee. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9842 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jacob Kaplan-Moss 2009-02-16 20:47:39 +00:00
parent ecc55503f4
commit 8ada8d7c03
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/core/mail.py
View File

@ -245,7 +245,7 @@ class EmailMessage(object):
else: else:
msg.attach(self._create_attachment(*attachment)) msg.attach(self._create_attachment(*attachment))
msg['Subject'] = self.subject msg['Subject'] = self.subject
msg['From'] = self.from_email msg['From'] = self.extra_headers.pop('From', self.from_email)
msg['To'] = ', '.join(self.to) msg['To'] = ', '.join(self.to)
# Email header names are case-insensitive (RFC 2045), so we have to # Email header names are case-insensitive (RFC 2045), so we have to

7
tests/regressiontests/mail/tests.py
View File

@ -88,4 +88,11 @@ BadHeaderError: Header values can't contain newlines (got u'Subject\nInjection T
>>> settings.ADMINS = old_admins >>> settings.ADMINS = old_admins
>>> settings.MANAGERS = old_managers >>> settings.MANAGERS = old_managers
# Make sure we can manually set the From header (#9214)
>>> email = EmailMessage('Subject', 'Content', 'bounce@example.com', ['to@example.com'], headers={'From': 'from@example.com'})
>>> message = email.message()
>>> message['From']
'from@example.com'
""" """