ph10 2006/07/28 12:39:12 BST
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src globals.c
exim-test/log 0098
exim-test/scripts/0000-Basic 0098
exim-test/stdout 0098
Log:
Add { !eq{$h_list-id:$h_list-post:$h_list-subscribe:}{} } as another
"don't send" delay warning condition by default.
Revision Changes Path
1.385 +7 -6 exim/exim-doc/doc-txt/ChangeLog
1.57 +1 -0 exim/exim-src/src/globals.c
1.3 +7 -0 exim/exim-test/log/0098
1.3 +10 -0 exim/exim-test/scripts/0000-Basic/0098
1.3 +1 -0 exim/exim-test/stdout/0098
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.384
retrieving revision 1.385
diff -u -r1.384 -r1.385
--- ChangeLog 27 Jul 2006 13:50:43 -0000 1.384
+++ ChangeLog 28 Jul 2006 11:39:11 -0000 1.385
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.384 2006/07/27 13:50:43 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.385 2006/07/28 11:39:11 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -93,16 +93,17 @@
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
+PH/17 Added extra conditions 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} }
+ ${if or { \
+ { !eq{$h_list-id:$h_list-post:$h_list-subscribe:}{} } \
+ { 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.
+ The Auto-Submitted: and various List- headers are standardised, whereas I
+ don't think Precedence: ever was.
PH/18 Refactored debugging code in route_finduser() to show more information,
in particular, the error code if getpwnam() issues one.
Index: globals.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/globals.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- globals.c 13 Jul 2006 14:46:05 -0000 1.56
+++ globals.c 28 Jul 2006 11:39:11 -0000 1.57
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/globals.c,v 1.56 2006/07/13 14:46:05 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/globals.c,v 1.57 2006/07/28 11:39:11 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -451,6 +451,7 @@
int delay_warning[DELAY_WARNING_SIZE] = { DELAY_WARNING_SIZE, 1, 24*60*60 };
uschar *delay_warning_condition=
US"${if or {"
+ "{ !eq{$h_list-id:$h_list-post:$h_list-subscribe:}{} }"
"{ match{$h_precedence:}{(?i)bulk|list|junk} }"
"{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }"
"} {no}{yes}}";
Index: 0098
===================================================================
RCS file: /home/cvs/exim/exim-test/log/0098,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0098 13 Jul 2006 14:46:05 -0000 1.2
+++ 0098 28 Jul 2006 11:39:12 -0000 1.3
@@ -103,3 +103,10 @@
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
+1999-03-02 09:44:33 10HmbK-0005vi-00 removed by CALLER
+1999-03-02 09:44:33 10HmbK-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbL-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbL-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 10HmbL-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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0098 13 Jul 2006 14:46:05 -0000 1.2
+++ 0098 28 Jul 2006 11:39:12 -0000 1.3
@@ -58,4 +58,14 @@
****
exim -DDEFAULTDWC -Tqt 20s/ -odi -qf
****
+# Remove the previous message
+exim -Mrm $msg1
+****
+# Check no warnings for List-id: (in default config)
+exim -odi defer@???
+List-ID: Some data
+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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0098 13 Jul 2006 14:46:05 -0000 1.2
+++ 0098 28 Jul 2006 11:39:12 -0000 1.3
@@ -4,3 +4,4 @@
Message 10HmbD-0005vi-00 has been removed
Message 10HmbI-0005vi-00 has been removed
Message 10HmbJ-0005vi-00 has been removed
+Message 10HmbK-0005vi-00 has been removed
