diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2015-01-12 16:01:38 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2015-01-13 11:02:02 +0000 |
| commit | 1ad6489edabbfce85ee7362370cee4b34739c234 (patch) | |
| tree | 8ad8fb24714607d286a4efe997156ccd33b5f4bf /doc | |
| parent | 0ad2e0fcde2f23e3809687095bddb31f9af4896e (diff) | |
Make smtp_receive_timeout main option expanded. Bug 564
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/doc-docbook/spec.xfpt | 6 | ||||
| -rw-r--r-- | doc/doc-txt/ChangeLog | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index a102ad790..63fef7fc4 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -16084,7 +16084,7 @@ See &%smtp_ratelimit_hosts%& above. See &%smtp_ratelimit_hosts%& above. -.option smtp_receive_timeout main time 5m +.option smtp_receive_timeout main time&!! 5m .cindex "timeout" "for SMTP input" .cindex "SMTP" "input timeout" This sets a timeout value for SMTP reception. It applies to all forms of SMTP @@ -16099,6 +16099,10 @@ SMTP data timeout on connection from... The former means that Exim was expecting to read an SMTP command; the latter means that it was in the DATA phase, reading the contents of a message. +If the first character of the option is a &"$"& the option is +expanded before use and may depend on +&$sender_host_name$&, &$sender_host_address$& and &$sender_host_port$&. + .oindex "&%-os%&" The value set by this option can be overridden by the diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 78658c776..f333752d7 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -39,6 +39,8 @@ 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. +JH/10 The smtp_receive_timeout main option is now expanded before use. + Exim version 4.85 |