Django

Code

Changeset 2665

Show
Ignore:
Timestamp:
04/10/06 22:23:03 (3 years ago)
Author:
adrian
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/conf/global_settings.py

    r2623 r2665  
    9090EMAIL_HOST = 'localhost' 
    9191 
     92# Port for sending e-mail. 
     93EMAIL_PORT = 25 
     94 
    9295# Optional SMTP authentication information for EMAIL_HOST. 
    9396EMAIL_HOST_USER = '' 

  • django/trunk/django/core/mail.py

    r2664 r2665  
    3131    """ 
    3232    try: 
    33         server = smtplib.SMTP(settings.EMAIL_HOST) 
     33        server = smtplib.SMTP(settings.EMAIL_HOST, settings.EMAIL_PORT) 
    3434        if auth_user and auth_password: 
    3535            server.login(auth_user, auth_password) 

  • django/trunk/docs/settings.txt

    r2548 r2665  
    335335The host to use for sending e-mail. 
    336336 
     337See also ``EMAIL_PORT``. 
     338 
    337339EMAIL_HOST_PASSWORD 
    338340------------------- 
    …… 
    358360 
    359361See also ``EMAIL_HOST_PASSWORD``. 
     362 
     363EMAIL_PORT 
     364---------- 
     365 
     366Default: ``25`` 
     367 
     368**New in Django development version.** 
     369 
     370Port to use for the SMTP server defined in ``EMAIL_HOST``. 
    360371 
    361372EMAIL_SUBJECT_PREFIX