diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2005-12-15 15:44:46 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2005-12-15 15:44:46 +0000 |
| commit | 1921d2ea1648c90d45da23f26cf8855465521426 (patch) | |
| tree | ed48d381a7d8bb87e1d0e18d7c6243074ecd0265 | |
| parent | eff37e472369435d294c297f2a4aabb8de151554 (diff) | |
Moved a debug statement to avoid a testing race.
| -rw-r--r-- | doc/doc-txt/ChangeLog | 5 | ||||
| -rw-r--r-- | src/src/rda.c | 13 |
2 files changed, 8 insertions, 10 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 27c74dabb..7ac300ce2 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.276 2005/12/15 11:18:21 ph10 Exp $ +$Cambridge: 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 ------------------------------------------- @@ -43,6 +43,9 @@ PH/07 Two small changes when running in the test harness: increase delay when 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 ----------------- diff --git a/src/src/rda.c b/src/src/rda.c index 1c45f7bb3..1acc75288 100644 --- a/src/src/rda.c +++ b/src/src/rda.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/rda.c,v 1.10 2005/08/08 13:21:46 ph10 Exp $ */ +/* $Cambridge: 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 @@ if (read(fd, filtertype, sizeof(int)) != sizeof(int) || 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) @@ -934,6 +926,9 @@ while ((rc = wait(&status)) != pid) } } +DEBUG(D_route) + debug_printf("rda_interpret: subprocess yield=%d error=%s\n", yield, *error); + if (had_disaster) { *error = string_sprintf("internal problem in %s: failure to transfer " |