diff options
| author | José Padilla <jpadilla@webapplicate.com> | 2014-09-12 22:46:22 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-09-13 09:33:21 -0400 |
| commit | 5472d18e3193050f5b9a25b71852ca7b77f852a5 (patch) | |
| tree | b65e10a3ab0c5ee90fe0a5989050cbb21672c437 /docs/ref | |
| parent | 0ae79014c09f4ddd2575f53371d994773d0bd43c (diff) | |
Fixed #23461 -- Added EMAIL_TIMEOUT setting
Diffstat (limited to 'docs/ref')
| -rw-r--r-- | docs/ref/settings.txt | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 507f3f11c9..c1d094b629 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -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` |