git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(1) Typo in redirect router; (2) Update version number; (3) Update
[exim.git]
/
src
/
src
/
queue.c
diff --git
a/src/src/queue.c
b/src/src/queue.c
index cfcb0440afb6f4de1d914af6bf8bc8e15866bec3..1ad5a72bd06e47c93e78eb57e8251cbab77da210 100644
(file)
--- a/
src/src/queue.c
+++ b/
src/src/queue.c
@@
-1,10
+1,10
@@
-/* $Cambridge: exim/src/src/queue.c,v 1.
1 2004/10/07 10:39:01
ph10 Exp $ */
+/* $Cambridge: exim/src/src/queue.c,v 1.
4 2005/01/04 10:00:42
ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 200
4
*/
+/* Copyright (c) University of Cambridge 1995 - 200
5
*/
/* See the file NOTICE for conditions of use and distribution. */
/* Functions that operate on the input queue. */
/* See the file NOTICE for conditions of use and distribution. */
/* Functions that operate on the input queue. */
@@
-615,6
+615,7
@@
for (i = (queue_run_in_order? -1 : 0);
if ((pid = fork()) == 0)
{
int rc;
if ((pid = fork()) == 0)
{
int rc;
+ if (running_in_test_harness) millisleep(100);
(void)close(pfd[pipe_read]);
rc = deliver_message(f->text, force_delivery, FALSE);
_exit(rc == DELIVER_NOT_ATTEMPTED);
(void)close(pfd[pipe_read]);
rc = deliver_message(f->text, force_delivery, FALSE);
_exit(rc == DELIVER_NOT_ATTEMPTED);
@@
-1190,7
+1191,11
@@
switch(action)
if (deliver_datafile >= 0) printf("has been removed\n");
else printf("has been removed or did not exist\n");
if (deliver_datafile >= 0) printf("has been removed\n");
else printf("has been removed or did not exist\n");
- if (removed) log_write(0, LOG_MAIN, "removed by %s", username);
+ if (removed)
+ {
+ log_write(0, LOG_MAIN, "removed by %s", username);
+ log_write(0, LOG_MAIN, "Completed");
+ }
break;
break;