[exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog NewSt…

Αρχική Σελίδα
Delete this message
Reply to this message
Συντάκτης: Philip Hazel
Ημερομηνία:  
Προς: exim-cvs
Αντικείμενο: [exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog NewStuff exim/exim-src/src deliver.c
ph10 2005/06/14 14:48:40 BST

  Modified files:
    exim-doc/doc-txt     ChangeLog NewStuff 
    exim-src/src         deliver.c 
  Log:
  Auto_thaw no longer applies to bounce messages.


  Revision  Changes    Path
  1.155     +2 -0      exim/exim-doc/doc-txt/ChangeLog
  1.49      +3 -0      exim/exim-doc/doc-txt/NewStuff
  1.17      +13 -8     exim/exim-src/src/deliver.c


  Index: ChangeLog
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
  retrieving revision 1.154
  retrieving revision 1.155
  diff -u -r1.154 -r1.155
  --- ChangeLog    14 Jun 2005 10:32:01 -0000    1.154
  +++ ChangeLog    14 Jun 2005 13:48:40 -0000    1.155
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.154 2005/06/14 10:32:01 ph10 Exp $
  +$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.155 2005/06/14 13:48:40 ph10 Exp $


Change log file for Exim from version 4.21
-------------------------------------------
@@ -113,6 +113,8 @@

   PH/12 Applied Alex Kiernan's patch for the API change for the error callback
         function for BDB 4.3.
  +
  +PH/13 Changed auto_thaw such that it does not apply to bounce messages.



Exim version 4.51

  Index: NewStuff
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-txt/NewStuff,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- NewStuff    31 May 2005 10:58:18 -0000    1.48
  +++ NewStuff    14 Jun 2005 13:48:40 -0000    1.49
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.48 2005/05/31 10:58:18 ph10 Exp $
  +$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.49 2005/06/14 13:48:40 ph10 Exp $


   New Features in Exim
   --------------------
  @@ -251,6 +251,9 @@
         as "postmaster" and checks the recipient <postmaster@domain>. If that
         fails, it tries just <postmaster>, without a domain, in accordance with
         the specification in RFC 2821.
  +
  +PH/03 The action of the auto_thaw option has been changed. It no longer applies
  +      to frozen bounce messages.



Version 4.51

  Index: deliver.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/deliver.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- deliver.c    7 Jun 2005 15:20:56 -0000    1.16
  +++ deliver.c    14 Jun 2005 13:48:40 -0000    1.17
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/deliver.c,v 1.16 2005/06/07 15:20:56 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/deliver.c,v 1.17 2005/06/14 13:48:40 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -4601,17 +4601,22 @@
       log_write(0, LOG_MAIN, "Unfrozen by errmsg timer");
       }


- /* If there's no auto thaw, or we haven't reached the auto thaw time yet, and
- this delivery is not forced by an admin user, do not attempt delivery of this
- message. Note that forced is set for continuing messages down the same
- channel, in order to skip load checking and ignore hold domains, but we
- don't want unfreezing in that case. */
+ /* If this is a bounce message, or there's no auto thaw, or we haven't
+ reached the auto thaw time yet, and this delivery is not forced by an admin
+ user, do not attempt delivery of this message. Note that forced is set for
+ continuing messages down the same channel, in order to skip load checking and
+ ignore hold domains, but we don't want unfreezing in that case. */

     else
       {
  -    if ((auto_thaw <= 0 || now <= deliver_frozen_at + auto_thaw) &&
  -      (!forced || !deliver_force_thaw || !admin_user ||
  -        continue_hostname != NULL))
  +    if ((sender_address[0] == 0 ||
  +         auto_thaw <= 0 ||
  +         now <= deliver_frozen_at + auto_thaw
  +        )
  +        &&
  +        (!forced || !deliver_force_thaw || !admin_user ||
  +          continue_hostname != NULL
  +        ))
         {
         close(deliver_datafile);
         deliver_datafile = -1;