ph10 2005/12/14 10:00:05 GMT
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src smtp_in.c transport.c
Log:
Minor changes for the test harness.
Revision Changes Path
1.275 +5 -0 exim/exim-doc/doc-txt/ChangeLog
1.28 +0 -9 exim/exim-src/src/smtp_in.c
1.14 +1 -1 exim/exim-src/src/transport.c
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -r1.274 -r1.275
--- ChangeLog 12 Dec 2005 15:58:53 -0000 1.274
+++ ChangeLog 14 Dec 2005 10:00:05 -0000 1.275
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.274 2005/12/12 15:58:53 ph10 Exp $
+$Cambridge: exim/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
-------------------------------------------
@@ -34,6 +34,11 @@
numbers, for those that want even more. Backwards compatibility with old
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
Index: smtp_in.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/smtp_in.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- smtp_in.c 12 Dec 2005 15:58:53 -0000 1.27
+++ smtp_in.c 14 Dec 2005 10:00:05 -0000 1.28
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/smtp_in.c,v 1.27 2005/12/12 15:58:53 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/smtp_in.c,v 1.28 2005/12/14 10:00:05 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -1132,15 +1132,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 */
Index: transport.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/transport.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- transport.c 1 Aug 2005 14:41:25 -0000 1.13
+++ transport.c 14 Dec 2005 10:00:05 -0000 1.14
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/transport.c,v 1.13 2005/08/01 14:41:25 ph10 Exp $ */
+/* $Cambridge: exim/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 @@
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. */
