diff options
| author | Nigel Metheringham <nigel@exim.org> | 2009-01-02 17:22:12 +0000 |
|---|---|---|
| committer | Nigel Metheringham <nigel@exim.org> | 2009-01-02 17:22:12 +0000 |
| commit | 9b989985f96d57acea1fda778a439172134a9e10 (patch) | |
| tree | aaa43e26d12e35d4920baa6cb12320582a46dbcd | |
| parent | 4c69d561122718efebb6e0aec43bc5afa4958657 (diff) | |
Added timeout setting to transport filter. Fixes: #614
| -rw-r--r-- | doc/doc-txt/ChangeLog | 5 | ||||
| -rw-r--r-- | src/src/transports/smtp.c | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 98c8ad403..7b1e85ef4 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.561 2009/01/02 17:12:03 nm4 Exp $ +$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.562 2009/01/02 17:22:12 nm4 Exp $ Change log file for Exim from version 4.21 ------------------------------------------- @@ -91,6 +91,9 @@ NM/12 Bugzilla 497: Correct behaviour of exiwhat when no config exists. NM/13 Bugzilla 590: Correct handling of Resent-Date headers. Patch provided by Brad "anomie" Jorsch +NM/14 Bugzilla 614: Added timeout setting to transport filter. + Patch provided by Dean Brooks + Exim version 4.69 ----------------- diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c index e8354ad7a..e56093f4d 100644 --- a/src/src/transports/smtp.c +++ b/src/src/transports/smtp.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/transports/smtp.c,v 1.40 2008/09/05 16:59:48 fanf2 Exp $ */ +/* $Cambridge: exim/src/src/transports/smtp.c,v 1.41 2009/01/02 17:22:12 nm4 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -1382,6 +1382,7 @@ if (tblock->filter_command != NULL) sprintf(CS buffer, "%.50s transport", tblock->name); rc = transport_set_up_command(&transport_filter_argv, tblock->filter_command, TRUE, DEFER, addrlist, buffer, NULL); + transport_filter_timeout = tblock->filter_timeout; /* On failure, copy the error to all addresses, abandon the SMTP call, and yield ERROR. */ |