1
0
mirror of https://github.com/django/django.git synced 2025-11-07 07:15:35 +00:00

Fixed #21271 -- Added timeout parameter to SMTP EmailBackend.

Thanks Tobias McNulty and Tim Graham for discussions and code review.
Thanks Andre Cruz the suggestion and initial patch.
This commit is contained in:
SusanTan
2013-10-15 16:18:06 +01:00
committed by Tim Graham
parent 9eecb91695
commit 4e0a2fe59c
4 changed files with 67 additions and 26 deletions

View File

@@ -248,6 +248,8 @@ Email
* :func:`~django.core.mail.send_mail` now accepts an ``html_message``
parameter for sending a multipart ``text/plain`` and ``text/html`` email.
* The SMTP :class:`~django.core.mail.backends.smtp.EmailBackend` now accepts a
:attr:`~django.core.mail.backends.smtp.EmailBackend.timeout` parameter.
File Uploads
^^^^^^^^^^^^