nm4 2009/01/02 17:22:12 GMT
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src/transports smtp.c
Log:
Added timeout setting to transport filter. Fixes: #614
Revision Changes Path
1.562 +3 -0 exim/exim-doc/doc-txt/ChangeLog
1.41 +1 -0 exim/exim-src/src/transports/smtp.c
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.561
retrieving revision 1.562
diff -u -r1.561 -r1.562
--- ChangeLog 2 Jan 2009 17:12:03 -0000 1.561
+++ ChangeLog 2 Jan 2009 17:22:12 -0000 1.562
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.561 2009/01/02 17:12:03 nm4 Exp $
+$Cambridge: exim/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/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
-----------------
Index: smtp.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/transports/smtp.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- smtp.c 5 Sep 2008 16:59:48 -0000 1.40
+++ smtp.c 2 Jan 2009 17:22:12 -0000 1.41
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/transports/smtp.c,v 1.40 2008/09/05 16:59:48 fanf2 Exp $ */
+/* $Cambridge: exim/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 @@
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. */
