summaryrefslogtreecommitdiff
path: root/doc/doc-txt
diff options
context:
space:
mode:
authorPhilip Hazel <ph10@hermes.cam.ac.uk>2004-11-04 12:19:48 +0000
committerPhilip Hazel <ph10@hermes.cam.ac.uk>2004-11-04 12:19:48 +0000
commit4deaf07d6cdd04468e4bc383945b9e19d7d55aa3 (patch)
tree1f6376117c8027f4606d2a8dc5293fd640e42082 /doc/doc-txt
parent23c7ff99864ed699b3c6e547c1396a02eb6e4b73 (diff)
Added a "connect=<time>" option to callouts, for a separate timeout
for making the connection. As part of this, the debug output for a failed connection now shows the error, and, if it's a timeout, the timeout value.
Diffstat (limited to 'doc/doc-txt')
-rw-r--r--doc/doc-txt/ChangeLog5
-rw-r--r--doc/doc-txt/NewStuff10
2 files changed, 13 insertions, 2 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index a57b077a1..01bfcf8f1 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.14 2004/11/04 10:42:11 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.15 2004/11/04 12:19:48 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -56,6 +56,9 @@ Exim version 4.44
14. Added forbid_sieve_filter and forbid_exim_filter to the redirect router.
+15. Added a new option "connect=<time>" to callout options, to set a different
+ connection timeout.
+
Exim version 4.43
-----------------
diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index b8cf61cc9..79e347698 100644
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/NewStuff,v 1.5 2004/11/04 10:42:11 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/NewStuff,v 1.6 2004/11/04 12:19:48 ph10 Exp $
New Features in Exim
--------------------
@@ -33,6 +33,14 @@ Version 4.44
options control which type(s) of filtering are permitted. By default, both
Exim and Sieve filters are allowed.
+ 6. A new option for callouts makes it possible to set a different (usually
+ smaller) timeout for making the SMTP connection. The keyword is "connect".
+ For example:
+
+ verify = sender/callout=5s,connect=1s
+
+ If not specified, it defaults to the general timeout value.
+
Version 4.43
------------