Permalink
Browse files

Fixed #1555 -- Added EMAIL_PORT setting. Thanks, bde3

git-svn-id: http://code.djangoproject.com/svn/django/trunk@2665 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
adrianholovaty committed Apr 11, 2006
1 parent cd7dbd8 commit 8d70ed4b25d65df8fe9f2a783f9f2a87bc7aaea1
Showing with 15 additions and 1 deletion.
  1. +3 −0 django/conf/global_settings.py
  2. +1 −1 django/core/mail.py
  3. +11 −0 docs/settings.txt
@@ -89,6 +89,9 @@
# Host for sending e-mail.
EMAIL_HOST = 'localhost'
# Port for sending e-mail.
EMAIL_PORT = 25
# Optional SMTP authentication information for EMAIL_HOST.
EMAIL_HOST_USER = ''
EMAIL_HOST_PASSWORD = ''
@@ -30,7 +30,7 @@ def send_mass_mail(datatuple, fail_silently=False, auth_user=settings.EMAIL_HOST
If auth_user and auth_password are set, they're used to log in.
"""
try:
server = smtplib.SMTP(settings.EMAIL_HOST)
server = smtplib.SMTP(settings.EMAIL_HOST, settings.EMAIL_PORT)
if auth_user and auth_password:
server.login(auth_user, auth_password)
except:
@@ -334,6 +334,8 @@ Default: ``'localhost'``
The host to use for sending e-mail.
See also ``EMAIL_PORT``.
EMAIL_HOST_PASSWORD
-------------------
@@ -358,6 +360,15 @@ Django won't attempt authentication.
See also ``EMAIL_HOST_PASSWORD``.
EMAIL_PORT
----------
Default: ``25``
**New in Django development version.**
Port to use for the SMTP server defined in ``EMAIL_HOST``.
EMAIL_SUBJECT_PREFIX
--------------------

0 comments on commit 8d70ed4

Please sign in to comment.