summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Kaplan-Moss <jacob@jacobian.org>2006-11-07 15:32:18 +0000
committerJacob Kaplan-Moss <jacob@jacobian.org>2006-11-07 15:32:18 +0000
commit6f164ad4856a1a5431b3b3e19ab6dbafe692a52d (patch)
tree2725b9c803386d29707779a71e6e85ef4b85d483
parentb1b4e8e7c43bb0ee93646493fcf2df4884c14030 (diff)
Fixed #2991: Added Message-ID header to messages sent from Django. Thanks, Graham King.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4051 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/core/mail.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/django/core/mail.py b/django/core/mail.py
index da4cacbe29..0f607136d8 100644
--- a/django/core/mail.py
+++ b/django/core/mail.py
@@ -4,6 +4,9 @@ from django.conf import settings
from email.MIMEText import MIMEText
from email.Header import Header
import smtplib, rfc822
+import socket
+import time
+import random
class BadHeaderError(ValueError):
pass
@@ -50,6 +53,7 @@ def send_mass_mail(datatuple, fail_silently=False, auth_user=settings.EMAIL_HOST
msg['From'] = from_email
msg['To'] = ', '.join(recipient_list)
msg['Date'] = rfc822.formatdate()
+ msg['Message-ID'] = "<%d.%d@%s>" % ( time.time(), random.getrandbits(64), socket.getfqdn() )
try:
server.sendmail(from_email, recipient_list, msg.as_string())
num_sent += 1