From 1c30bc929b626df942d4092535f9d4d217828e83 Mon Sep 17 00:00:00 2001 From: Jaka Kranjc Date: Sat, 7 Feb 2015 11:04:42 +0100 Subject: [PATCH] CRM-15934: more loop patterns for responses like: mail forwarding loop for Mail-Loop Too many recursive forwards --- CRM/Upgrade/Incremental/sql/4.6.alpha6.mysql.tpl | 4 ++++ xml/templates/civicrm_data.tpl | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CRM/Upgrade/Incremental/sql/4.6.alpha6.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.alpha6.mysql.tpl index 447926a93a..3bc047265d 100644 --- a/CRM/Upgrade/Incremental/sql/4.6.alpha6.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/4.6.alpha6.mysql.tpl @@ -27,3 +27,7 @@ INSERT INTO civicrm_mailing_bounce_pattern (bounce_type_id, pattern) (@bounceTypeID, 'User banned'); UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = 'not accepting (mail|messages)' WHERE `id` = 37; + +SELECT @bounceTypeID := max(id) FROM civicrm_mailing_bounce_type WHERE name = 'Loop'; +UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = '(mail( forwarding)?|routing).loop' WHERE `id` = 81; +UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = 'too many (hops|recursive forwards)' WHERE `id` = 86; diff --git a/xml/templates/civicrm_data.tpl b/xml/templates/civicrm_data.tpl index 5449b7a602..9ffed67729 100644 --- a/xml/templates/civicrm_data.tpl +++ b/xml/templates/civicrm_data.tpl @@ -1281,12 +1281,12 @@ SELECT @bounceTypeID := max(id) FROM civicrm_mailing_bounce_type WHERE name = 'L INSERT INTO civicrm_mailing_bounce_pattern (bounce_type_id, pattern) VALUES - (@bounceTypeID, '(mail|routing) loop'), + (@bounceTypeID, '(mail( forwarding)?|routing).loop'), (@bounceTypeID, 'excessive recursion'), (@bounceTypeID, 'loop detected'), (@bounceTypeID, 'maximum hop count exceeded'), (@bounceTypeID, 'message was forwarded more than the maximum allowed times'), - (@bounceTypeID, 'too many hops'); + (@bounceTypeID, 'too many (hops|recursive forwards)'); INSERT INTO civicrm_mailing_bounce_type (name, description, hold_threshold) -- 2.25.1