ph10 2005/12/15 15:44:46 GMT
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src rda.c
Log:
Moved a debug statement to avoid a testing race.
Revision Changes Path
1.277 +3 -0 exim/exim-doc/doc-txt/ChangeLog
1.11 +3 -8 exim/exim-src/src/rda.c
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -r1.276 -r1.277
--- ChangeLog 15 Dec 2005 11:18:21 -0000 1.276
+++ ChangeLog 15 Dec 2005 15:44:46 -0000 1.277
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.276 2005/12/15 11:18:21 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.277 2005/12/15 15:44:46 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -42,6 +42,9 @@
PH/08 Changed debug output of dbfn_open() flags from numbers to names, so as to
be the same on different OS.
+
+PH/09 Moved a debug statement in filter processing to avoid a race problem when
+ testing.
Exim version 4.60
Index: rda.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/rda.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rda.c 8 Aug 2005 13:21:46 -0000 1.10
+++ rda.c 15 Dec 2005 15:44:46 -0000 1.11
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/rda.c,v 1.10 2005/08/08 13:21:46 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/rda.c,v 1.11 2005/12/15 15:44:46 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -770,14 +770,6 @@
read(fd, &yield, sizeof(int)) != sizeof(int) ||
!rda_read_string(fd, error)) goto DISASTER;
-/* In the test harness, give the subprocess time to finish off and write
-any debugging output. */
-
-if (running_in_test_harness) millisleep(250);
-
-DEBUG(D_route)
- debug_printf("rda_interpret: subprocess yield=%d error=%s\n", yield, *error);
-
/* Read the contents of any syntax error blocks if we have a pointer */
if (eblockp != NULL)
@@ -933,6 +925,9 @@
goto FINAL_EXIT;
}
}
+
+DEBUG(D_route)
+ debug_printf("rda_interpret: subprocess yield=%d error=%s\n", yield, *error);
if (had_disaster)
{
