diff options
| author | Magnus Holmgren <holmgren@lysator.liu.se> | 2007-01-23 12:33:08 +0000 |
|---|---|---|
| committer | Magnus Holmgren <holmgren@lysator.liu.se> | 2007-01-23 12:33:08 +0000 |
| commit | 0e8a94711a90ed63933a10ac7598e8743432837c (patch) | |
| tree | 4c3be9c112df71a24f25e7e7b8213b8db8eda582 | |
| parent | f08724248e7a36fab313e332288de73165d07fe5 (diff) | |
Fix for bug #451: set deliver_freeze = FALSE after unlinking the spool files in order not to trigger spool_move_message() near the bottom.
| -rw-r--r-- | doc/doc-txt/ChangeLog | 6 | ||||
| -rw-r--r-- | src/src/deliver.c | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 5b57e4251..cbda709f7 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.459 2007/01/23 12:22:00 ph10 Exp $ +$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.460 2007/01/23 12:33:08 magnus Exp $ Change log file for Exim from version 4.21 ------------------------------------------- @@ -41,6 +41,10 @@ PH/06 Some tidies to the infrastructure of the Test Suite that is concerned including adding "make clean"; (3) Added -fPIC when compiling the test dynamically loaded module, to get rid of a warning. +MH/02 Fix for bug #451, causing paniclog entries to be written if a bounce + message fails, move_frozen_messages = true and ignore_bounce_errors_after + = 0s. The bug is otherwise harmless. + PH/07 There was a bug in the dovecot authenticator such that the value of $auth1 could be overwritten, and so not correctly preserved, after a successful authentication. This usually meant that the value preserved by diff --git a/src/src/deliver.c b/src/src/deliver.c index fae67dc79..4bc8c5f2c 100644 --- a/src/src/deliver.c +++ b/src/src/deliver.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/deliver.c,v 1.41 2007/01/22 16:29:54 ph10 Exp $ */ +/* $Cambridge: exim/src/src/deliver.c,v 1.42 2007/01/23 12:33:08 magnus Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -6572,6 +6572,9 @@ if (addr_defer == NULL) readconf_printtime(time(NULL) - received_time)); else log_write(0, LOG_MAIN, "Completed"); + + /* Unset deliver_freeze so that we won't try to move the spool files further down */ + deliver_freeze = FALSE; } /* If there are deferred addresses, we are keeping this message because it is |