Commit 70b6c4c0 authored by Malcolm Tredinnick's avatar Malcolm Tredinnick
Browse files

Fixed #9233 -- Allow date and message-id headers to be passed in manually in 

email messages. Previously we were creating duplicate headers, which was bad.


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

django/core/mail.py

+8 −2
Original line number Diff line number Diff line
@@ -247,7 +247,13 @@ class EmailMessage(object): 
        msg['Subject'] = self.subject

        msg['From'] = self.from_email

        msg['To'] = ', '.join(self.to)



        # Email header names are case-insensitive (RFC 2045), so we have to

        # accommodate that when doing comparisons.

        header_names = [key.lower() for key in self.extra_headers]

        if 'date' not in header_names:

            msg['Date'] = formatdate()

        if 'message-id' not in header_names:

            msg['Message-ID'] = make_msgid()

        for name, value in self.extra_headers.items():

            msg[name] = value

tests/regressiontests/mail/tests.py

+8 −0
Original line number Diff line number Diff line
@@ -52,4 +52,12 @@ BadHeaderError: Header values can't contain newlines (got u'Subject\nInjection T 
>>> message.as_string()

'Content-Type: text/plain; charset="utf-8"\nMIME-Version: 1.0\nContent-Transfer-Encoding: quoted-printable\nSubject: Long subject lines that get wrapped should use a space continuation\n character to get expected behaviour in Outlook and Thunderbird\nFrom: from@example.com\nTo: to@example.com\nDate: ...\nMessage-ID: <...>\n\nContent'



# Specifying dates or message-ids in the extra headers overrides the defaul

# values (#9233).



>>> headers = {"date": "Fri, 09 Nov 2001 01:08:47 -0000", "Message-ID": "foo"}

>>> email = EmailMessage('subject', 'content', 'from@example.com', ['to@example.com'], headers=headers)

>>> email.message().as_string()

'Content-Type: text/plain; charset="utf-8"\nMIME-Version: 1.0\nContent-Transfer-Encoding: quoted-printable\nSubject: subject\nFrom: from@example.com\nTo: to@example.com\ndate: Fri, 09 Nov 2001 01:08:47 -0000\nMessage-ID: foo\n\ncontent'



"""