mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-23 21:59:11 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #23461 -- Added EMAIL_TIMEOUT setting

Browse Source
This commit is contained in:
José Padilla
2014-09-12 22:46:22 -04:00
committed by Tim Graham
parent 0ae79014c0
commit 5472d18e31
6 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
docs/ref/settings.txt
View File

@@ -1266,6 +1266,18 @@ connection. Please refer to the documentation of Python's
:func:`python:ssl.wrap_socket` function for details on how the certificate chain
file and private key file are handled.
.. setting:: EMAIL_TIMEOUT
EMAIL_TIMEOUT
-------------
.. versionadded:: 1.8
Default: ``None``
Specifies a timeout in seconds for blocking operations like the connection
attempt.
.. setting:: FILE_CHARSET
FILE_CHARSET
@@ -3089,6 +3101,7 @@ Email
* :setting:`EMAIL_SSL_CERTFILE`
* :setting:`EMAIL_SSL_KEYFILE`
* :setting:`EMAIL_SUBJECT_PREFIX`
* :setting*`EMAIL_TIMEOUT`
* :setting:`EMAIL_USE_TLS`
* :setting:`MANAGERS`
* :setting:`SERVER_EMAIL`