diff options
| author | Tony Finch <dot@dotat.at> | 2012-12-06 19:28:27 +0000 |
|---|---|---|
| committer | Tony Finch <dot@dotat.at> | 2012-12-06 19:28:27 +0000 |
| commit | 1ddeb334a49cdd6ec28f982f4a8429503720633b (patch) | |
| tree | ca78201dd4cffded4b53aed9cbf5282dcb65d10b /doc/doc-txt | |
| parent | 326cdc37059420d73ba121daaf74def9b53b9e3b (diff) | |
Fix my earlier "fix" for intermittently deliverable recipients.
Only do the ultimate address timeout check if there is an address
retry record and there is not a domain retry record; this implies
that previous attempts to handle the address had the retry_use_local_parts
option turned on. We use this as an approximation for the destination
being like a local delivery, as in LMTP.
Diffstat (limited to 'doc/doc-txt')
| -rw-r--r-- | doc/doc-txt/ChangeLog | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index b516a7118..11e9f6f18 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -113,9 +113,13 @@ TF/01 Fix ultimate retry timeouts for intermittently deliverable recipients. to deal with this. However it did not apply to per-recipient defers in remote deliveries, e.g. over LMTP to a separate IMAP message store. - This commit adds a proper retry rule check during routing so that - the final cutoff time is checked against the message's age. I also - took the opportunity to unify three very similar blocks of code. + This change adds a proper retry rule check during routing so that the + final cutoff time is checked against the message's age. We only do + this check if there is an address retry record and there is not a + domain retry record; this implies that previous attempts to handle + the address had the retry_use_local_parts option turned on. We use + this as an approximation for the destination being like a local + delivery, as in LMTP. I suspect this new check makes the old local delivery cutoff check redundant, but I have not verified this so I left the code in place. |