ph10 2006/07/13 15:46:05 BST
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src globals.c
exim-test/confs 0098
exim-test/log 0098
exim-test/scripts/0000-Basic 0098
exim-test/stdout 0098
Log:
Add a check for Auto-Submitted to the default for
delay_warning_condition.
Revision Changes Path
1.374 +11 -0 exim/exim-doc/doc-txt/ChangeLog
1.56 +5 -1 exim/exim-src/src/globals.c
1.2 +3 -0 exim/exim-test/confs/0098
1.2 +14 -0 exim/exim-test/log/0098
1.2 +20 -0 exim/exim-test/scripts/0000-Basic/0098
1.2 +2 -0 exim/exim-test/stdout/0098
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.373
retrieving revision 1.374
diff -u -r1.373 -r1.374
--- ChangeLog 13 Jul 2006 13:53:32 -0000 1.373
+++ ChangeLog 13 Jul 2006 14:46:05 -0000 1.374
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.373 2006/07/13 13:53:32 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.374 2006/07/13 14:46:05 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -92,6 +92,17 @@
PH/16 Recognize SMTP codes at the start of "message" in ACLs and after :fail:
and :defer: in a redirect router. Add forbid_smtp_code to suppress the
latter.
+
+PH/17 Added an extra condition to the default value of delay_warning_condition
+ so that it is now:
+
+ ${if or {
+ { match{$h_precedence:}{(?i)bulk|list|junk} }
+ { match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }
+ }{no}{yes}}
+
+ The Auto-Submitted: header is standardised, whereas I don't think
+ Precedence: ever was.
Exim version 4.62
Index: globals.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/globals.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- globals.c 13 Jul 2006 13:53:33 -0000 1.55
+++ globals.c 13 Jul 2006 14:46:05 -0000 1.56
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/globals.c,v 1.55 2006/07/13 13:53:33 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/globals.c,v 1.56 2006/07/13 14:46:05 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -449,7 +449,11 @@
int debug_options_count = sizeof(debug_options)/sizeof(bit_table);
unsigned int debug_selector = 0;
int delay_warning[DELAY_WARNING_SIZE] = { DELAY_WARNING_SIZE, 1, 24*60*60 };
-uschar *delay_warning_condition= US"${if match{$h_precedence:}{(?i)bulk|list|junk}{no}{yes}}";
+uschar *delay_warning_condition=
+ US"${if or {"
+ "{ match{$h_precedence:}{(?i)bulk|list|junk} }"
+ "{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }"
+ "} {no}{yes}}";
BOOL delivery_date_remove = TRUE;
uschar *deliver_address_data = NULL;
int deliver_datafile = -1;
Index: 0098
===================================================================
RCS file: /home/cvs/exim/exim-test/confs/0098,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0098 7 Feb 2006 10:34:25 -0000 1.1
+++ 0098 13 Jul 2006 14:46:05 -0000 1.2
@@ -17,7 +17,10 @@
domainlist local_domains = test.ex : another.test.ex
delay_warning = 10s:40s:10m
+
+.ifndef DEFAULTDWC
delay_warning_condition = ${if !eq{$domain}{another.test.ex}{yes}{no}}
+.endif
log_selector = +subject
Index: 0098
===================================================================
RCS file: /home/cvs/exim/exim-test/log/0098,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0098 7 Feb 2006 10:34:46 -0000 1.1
+++ 0098 13 Jul 2006 14:46:05 -0000 1.2
@@ -89,3 +89,17 @@
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
1999-03-02 09:44:33 10HmbI-0005vi-00 == defer@??? R=alias defer (-1): This address has been forced to defer.
1999-03-02 09:44:33 End queue run: pid=pppp -qf
+1999-03-02 09:44:33 10HmbI-0005vi-00 removed by CALLER
+1999-03-02 09:44:33 10HmbI-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbJ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbJ-0005vi-00 == defer@??? R=alias defer (-1): This address has been forced to defer.
+1999-03-02 09:44:33 Start queue run: pid=pppp -qf
+1999-03-02 09:44:33 10HmbJ-0005vi-00 == defer@??? R=alias defer (-1): This address has been forced to defer.
+1999-03-02 09:44:33 End queue run: pid=pppp -qf
+1999-03-02 09:44:33 10HmbJ-0005vi-00 removed by CALLER
+1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbK-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbK-0005vi-00 == defer@??? R=alias defer (-1): This address has been forced to defer.
+1999-03-02 09:44:33 Start queue run: pid=pppp -qf
+1999-03-02 09:44:33 10HmbK-0005vi-00 == defer@??? R=alias defer (-1): This address has been forced to defer.
+1999-03-02 09:44:33 End queue run: pid=pppp -qf
Index: 0098
===================================================================
RCS file: /home/cvs/exim/exim-test/scripts/0000-Basic/0098,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0098 7 Feb 2006 10:54:33 -0000 1.1
+++ 0098 13 Jul 2006 14:46:05 -0000 1.2
@@ -38,4 +38,24 @@
****
exim -Tqt 20s/ -odi -qf
****
+# Remove the previous message
+exim -Mrm $msg1
+****
+# Check no warnings for Precedence: list (in default config)
+exim -odi defer@???
+Precedence: list
+Test message
+****
+exim -DDEFAULTDWC -Tqt 20s/ -odi -qf
+****
+# Remove the previous message
+exim -Mrm $msg1
+****
+# Check no warnings for Auto-Submitted: auto-generated (in default config)
+exim -odi defer@???
+Auto-Submitted: auto-generated
+Test message
+****
+exim -DDEFAULTDWC -Tqt 20s/ -odi -qf
+****
no_msglog_check
Index: 0098
===================================================================
RCS file: /home/cvs/exim/exim-test/stdout/0098,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0098 7 Feb 2006 10:47:37 -0000 1.1
+++ 0098 13 Jul 2006 14:46:05 -0000 1.2
@@ -2,3 +2,5 @@
Message 10HmaZ-0005vi-00 has been removed
Message 10HmbB-0005vi-00 has been removed
Message 10HmbD-0005vi-00 has been removed
+Message 10HmbI-0005vi-00 has been removed
+Message 10HmbJ-0005vi-00 has been removed
