diff options
| author | Yasuhito FUTATSUKI <futatuki@poem.co.jp> | 2017-05-24 13:32:56 +0900 |
|---|---|---|
| committer | Yasuhito FUTATSUKI <futatuki@poem.co.jp> | 2017-05-24 13:32:56 +0900 |
| commit | bb87ece84df2753e481879f45fb9b5da014db893 (patch) | |
| tree | 74b7bb418516fe2f871cfefb1b4da8169a2b3f75 /Mailman/Handlers/SMTPDirect.py | |
| parent | 616bb6262452e23384e8d26d03577604c03ddf70 (diff) | |
| parent | c498829e94cafdc194a45eaf49d4f75785ac0a7a (diff) | |
| download | mailman2-bb87ece84df2753e481879f45fb9b5da014db893.tar.gz mailman2-bb87ece84df2753e481879f45fb9b5da014db893.tar.xz mailman2-bb87ece84df2753e481879f45fb9b5da014db893.zip | |
Merge lp:mailman/2.1 rev 1703
Diffstat (limited to 'Mailman/Handlers/SMTPDirect.py')
| -rw-r--r-- | Mailman/Handlers/SMTPDirect.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Mailman/Handlers/SMTPDirect.py b/Mailman/Handlers/SMTPDirect.py index 3b489c2f..ca6aebdd 100644 --- a/Mailman/Handlers/SMTPDirect.py +++ b/Mailman/Handlers/SMTPDirect.py @@ -30,6 +30,7 @@ import copy import time import socket import smtplib +from base64 import b64encode from types import UnicodeType from Mailman import mm_cfg @@ -371,6 +372,10 @@ def verpdeliver(mlist, msg, msgdata, envsender, failures, conn): del msgcopy['x-mailman-copy'] if msgdata.get('add-dup-header', {}).has_key(recip): msgcopy['X-Mailman-Copy'] = 'yes' + # If desired, add the RCPT_BASE64_HEADER_NAME header + if len(mm_cfg.RCPT_BASE64_HEADER_NAME) > 0: + del msgcopy[mm_cfg.RCPT_BASE64_HEADER_NAME] + msgcopy[mm_cfg.RCPT_BASE64_HEADER_NAME] = b64encode(recip) # For the final delivery stage, we can just bulk deliver to a party of # one. ;) bulkdeliver(mlist, msgcopy, msgdata, envsender, failures, conn) |