diff options
| -rw-r--r-- | doc/doc-txt/ChangeLog | 7 | ||||
| -rw-r--r-- | src/src/smtp_in.c | 11 | ||||
| -rw-r--r-- | src/src/transport.c | 4 |
3 files changed, 9 insertions, 13 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 822795ba7..37693d078 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.274 2005/12/12 15:58:53 ph10 Exp $ +$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.275 2005/12/14 10:00:05 ph10 Exp $ Change log file for Exim from version 4.21 ------------------------------------------- @@ -35,6 +35,11 @@ PH/06 Increased the number of ACL variables to 20 of each type, and arranged spool files has been maintained. However, going back to a previous Exim release will lost any variables that are in spool files. +PH/07 Two small changes when running in the test harness: increase delay when + passing a TCP/IP connection to a new process, in case the original + process has to generate a bounce, and remove special handling of + 127.0.0.2 (sic), which is no longer necessary. + Exim version 4.60 ----------------- diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c index 5c953375c..00d0fb259 100644 --- a/src/src/smtp_in.c +++ b/src/src/smtp_in.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/smtp_in.c,v 1.27 2005/12/12 15:58:53 ph10 Exp $ */ +/* $Cambridge: exim/src/src/smtp_in.c,v 1.28 2005/12/14 10:00:05 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -1133,15 +1133,6 @@ int size = 256; int i, ptr; uschar *p, *s, *ss; -/* If we are running in the test harness, and the incoming call is from -127.0.0.2 (sic), have a short delay. This makes it possible to test handling of -input sent too soon (before the banner is output). */ - -if (running_in_test_harness && - sender_host_address != NULL && - Ustrcmp(sender_host_address, "127.0.0.2") == 0) - sleep(1); - /* Default values for certain variables */ helo_seen = esmtp = helo_accept_junk = FALSE; diff --git a/src/src/transport.c b/src/src/transport.c index e66e498be..cc6103df5 100644 --- a/src/src/transport.c +++ b/src/src/transport.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/transport.c,v 1.13 2005/08/01 14:41:25 ph10 Exp $ */ +/* $Cambridge: exim/src/src/transport.c,v 1.14 2005/12/14 10:00:05 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -1749,7 +1749,7 @@ if ((pid = fork()) == 0) automatic comparison. */ if ((pid = fork()) != 0) _exit(EXIT_SUCCESS); - if (running_in_test_harness) millisleep(500); + if (running_in_test_harness) sleep(1); /* Set up the calling arguments; use the standard function for the basics, but we have a number of extras that may be added. */ |