diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/doc-docbook/spec.xfpt | 7 | ||||
| -rw-r--r-- | doc/doc-txt/ChangeLog | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index cb3d78d5d..3e9cb733a 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -30790,12 +30790,19 @@ The supported option are: .code variant=rspamd Use Rspamd rather than SpamAssassin protocol time=<start>-<end> Use only between these times of day +tmo=<timespec> Connection time limit. weight=<value> Selection bias backup Use only if all non-backup servers fail .endd Time specifications for the &`time`& option are <hour>.<minute>.<second> in the local time zone; each element being one or more digits. +Either the seconds or both minutes and seconds, plus the leading &`.`& +characters, may be omitted and will be taken as zero. + +Timeout specifications for the &`tmo`& option are the usual Exim +time interval standard, eg. &`20s`& or &`1m`&. +The default value is two minutes. Servers are queried in a random fashion, weighted by the selection bias. The default value for selection bias is 1. diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index fbfe7507e..5b2155239 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -37,7 +37,7 @@ JH/08 The EXPERIMENTAL_DSN compile option is no longer needed; all Delivery JH/09 A timeout of 2 minutes is now applied to all malware scanner types by default, modifiable by a malware= option. The list separator for - the options can now be changed in the usual way. + the options can now be changed in the usual way. Bug 68. JH/10 The smtp_receive_timeout main option is now expanded before use. @@ -61,6 +61,9 @@ JH/16 The spamd_address main option now supports a mixed list of local and remote servers. Remote servers can be IPv6 addresses, and specify a port-range. +JH/17 Bug 68: The spamd_address main option now supports an optional + timeout value per server. + Exim version 4.85 |