Added timeout setting to transport filter. Fixes: #614

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 98c8ad403a782ab566cbeb87334f57c88e090c19..7b1e85ef4eb370c9187c99d677c3c75db671f29f 100644 (file)
--- 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
 -------------------------------------------
 
 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/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
 -----------------
 
 Exim version 4.69
 -----------------

diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index e8354ad7a449b1f88c6f1a945fcccf3abcced536..e56093f4d8a9b5fec7d696cc1ab356cc64185064 100644 (file)
--- 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    *
 
 /*************************************************
 *     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);
   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. */
 
   /* On failure, copy the error to all addresses, abandon the SMTP call, and
   yield ERROR. */