Allow Routers to have multiple conditions, IF each one yields a strict bool.

Fixes: #816

2 files changed, 13 insertions, 2 deletions

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index f5fbbd639..65d5d2dc9 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.627 2010/06/06 22:46:33 pdp Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.628 2010/06/07 07:09:10 pdp Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
@@ -44,6 +44,8 @@ PP/13 Bugzilla 752: Refuse to build/run if Exim user is root/0.
 
 PP/14 Build without WITH_CONTENT_SCAN. Path from Andreas Metzler.
 
+PP/15 Bugzilla 816: support multiple condition rules on Routers.
+
 
 Exim version 4.72
 -----------------
diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index 03c0d4833..559a9f4c0 100644
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/NewStuff,v 1.172 2010/06/06 02:46:13 pdp Exp $
+$Cambridge: exim/doc/doc-txt/NewStuff,v 1.173 2010/06/07 07:09:10 pdp Exp $
 
 New Features in Exim
 --------------------
@@ -75,6 +75,15 @@ Version 4.73
     then henceforth you will have to maintain your own local patches to strip
     the safeties off.
 
+ 8. Routers now support multiple "condition" tests, IF each router yields
+    a string which the bool{} operator recognises.  Note that this is a departure
+    from normal Router "condition" truth, requiring the stricter standard of
+    "true" that ACLS use.  This might be relaxed in a future release if there
+    is sufficient demand.
+    When debugging, bear in mind that these are internally wrapped up into
+    a longer, more complicated, string.  There's a reason that the bool{}
+    logic is a dependency.
+
 
 Version 4.72
 ------------