diff --git a/tests/data/test1015 b/tests/data/test1015 index beabcd1b90..9f2a53d49a 100644 --- a/tests/data/test1015 +++ b/tests/data/test1015 @@ -31,7 +31,7 @@ http http://%HOSTIP:%HTTPPORT/%TESTNUMBER --data-urlencode "my name is moo[]" --data-urlencode "y e s=s_i_r" --data-urlencode "v_alue@%LOGDIR/%TESTNUMBER.txt" --data-urlencode @%LOGDIR/%TESTNUMBER.txt -content to _?!#$'|<> +content to _?!#$'|%LT%GT diff --git a/tests/data/test1187 b/tests/data/test1187 index 82debafd04..fdfadd847f 100644 --- a/tests/data/test1187 +++ b/tests/data/test1187 @@ -30,7 +30,7 @@ To: another body -smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -F "=This is the mail text" -F '=File content;filename="strange\file\"name"' +smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -F "=This is the mail text" -F '=File content;filename="strange\file\"name"' @@ -43,8 +43,8 @@ s/boundary=------------------------[A-Za-z0-9]*/boundary=----------------------- EHLO %TESTNUMBER -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test1221 b/tests/data/test1221 index 6a410d95b8..1bfc61bdee 100644 --- a/tests/data/test1221 +++ b/tests/data/test1221 @@ -32,7 +32,7 @@ http http://%HOSTIP:%HTTPPORT/%TESTNUMBER --url-query "my name is moo[]" --url-query "yes=s i r" --url-query "v_alue@%LOGDIR/%TESTNUMBER.txt" --url-query @%LOGDIR/%TESTNUMBER.txt --url-query "+%3d%3d" --data-urlencode "start=once upon the time" -content to _?!#$'|<> +content to _?!#$'|%LT%GT diff --git a/tests/data/test1320 b/tests/data/test1320 index 92a23a4e9f..8c189ee9c7 100644 --- a/tests/data/test1320 +++ b/tests/data/test1320 @@ -48,8 +48,8 @@ smtp://smtp.%TESTNUMBER:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com EHLO %TESTNUMBER -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test1406 b/tests/data/test1406 index bdd142159d..492b5b8b31 100644 --- a/tests/data/test1406 +++ b/tests/data/test1406 @@ -49,9 +49,9 @@ ftp EHLO %TESTNUMBER -MAIL FROM: SIZE=38 -RCPT TO: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT SIZE=38 +RCPT TO:%LTrecipient.one@example.com%GT +RCPT TO:%LTrecipient.two@example.com%GT DATA QUIT diff --git a/tests/data/test1507 b/tests/data/test1507 index afc8712056..f48eff4de8 100644 --- a/tests/data/test1507 +++ b/tests/data/test1507 @@ -41,8 +41,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER EHLO %TESTNUMBER -MAIL FROM:<%TESTNUMBER-realuser@example.com> -RCPT TO:<%TESTNUMBER-recipient@example.com> +MAIL FROM:%LT%TESTNUMBER-realuser@example.com%GT +RCPT TO:%LT%TESTNUMBER-recipient@example.com%GT DATA diff --git a/tests/data/test1520 b/tests/data/test1520 index f49b914779..acd3413e2c 100644 --- a/tests/data/test1520 +++ b/tests/data/test1520 @@ -41,8 +41,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER EHLO %TESTNUMBER -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test1711 b/tests/data/test1711 index 709266eac6..d7725e96e5 100644 --- a/tests/data/test1711 +++ b/tests/data/test1711 @@ -35,8 +35,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr EHLO %TESTNUMBER -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test3002 b/tests/data/test3002 index ffb6e49a49..fdb657bd71 100644 --- a/tests/data/test3002 +++ b/tests/data/test3002 @@ -43,12 +43,12 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER EHLO %TESTNUMBER -MAIL FROM: -RCPT TO: -RCPT TO: -RCPT TO: -RCPT TO: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTinvalid.one%GT +RCPT TO:%LTrecipient.two@example.com%GT +RCPT TO:%LTrecipient.three@example.com%GT +RCPT TO:%LTrecipient.four@example.com%GT +RCPT TO:%LTrecipient.five@example.com%GT DATA QUIT diff --git a/tests/data/test3003 b/tests/data/test3003 index 07c72f0798..f382e0ec58 100644 --- a/tests/data/test3003 +++ b/tests/data/test3003 @@ -43,12 +43,12 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER EHLO %TESTNUMBER -MAIL FROM: -RCPT TO: -RCPT TO: -RCPT TO: -RCPT TO: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient.one@example.com%GT +RCPT TO:%LTrecipient.two@example.com%GT +RCPT TO:%LTrecipient.three@example.com%GT +RCPT TO:%LTrecipient.four@example.com%GT +RCPT TO:%LTinvalid.five%GT DATA QUIT diff --git a/tests/data/test3004 b/tests/data/test3004 index 52ef1188b9..d11e3dafe5 100644 --- a/tests/data/test3004 +++ b/tests/data/test3004 @@ -43,12 +43,12 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER EHLO %TESTNUMBER -MAIL FROM: -RCPT TO: -RCPT TO: -RCPT TO: -RCPT TO: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient.one@example.com%GT +RCPT TO:%LTrecipient.two@example.com%GT +RCPT TO:%LTinvalid.three%GT +RCPT TO:%LTrecipient.four@example.com%GT +RCPT TO:%LTrecipient.five@example.com%GT DATA QUIT diff --git a/tests/data/test3005 b/tests/data/test3005 index 68dedd2fc0..725cfce20c 100644 --- a/tests/data/test3005 +++ b/tests/data/test3005 @@ -43,12 +43,12 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER EHLO %TESTNUMBER -MAIL FROM: -RCPT TO: -RCPT TO: -RCPT TO: -RCPT TO: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTinvalid.one%GT +RCPT TO:%LTrecipient.two@example.com%GT +RCPT TO:%LTinvalid.three%GT +RCPT TO:%LTinvalid.four%GT +RCPT TO:%LTinvalid.five%GT DATA QUIT diff --git a/tests/data/test3006 b/tests/data/test3006 index d5086c23d6..2c705448da 100644 --- a/tests/data/test3006 +++ b/tests/data/test3006 @@ -47,12 +47,12 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER EHLO %TESTNUMBER -MAIL FROM: -RCPT TO: -RCPT TO: -RCPT TO: -RCPT TO: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTinvalid.one%GT +RCPT TO:%LTinvalid.two%GT +RCPT TO:%LTinvalid.three%GT +RCPT TO:%LTinvalid.four%GT +RCPT TO:%LTinvalid.five%GT QUIT diff --git a/tests/data/test3007 b/tests/data/test3007 index 3cc0aedc86..752aafb2b3 100644 --- a/tests/data/test3007 +++ b/tests/data/test3007 @@ -43,8 +43,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER EHLO %TESTNUMBER -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTinvalid.one%GT QUIT diff --git a/tests/data/test3209 b/tests/data/test3209 index 4c1c1888eb..d9cac89867 100644 --- a/tests/data/test3209 +++ b/tests/data/test3209 @@ -27,10 +27,10 @@ imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -u user:secret Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST) -From: Fred Foobar +From: Fred Foobar %LTfoobar@example.COM%GT Subject: afternoon meeting To: joe@example.com -Message-Id: +Message-Id: %LTB27397-0100000@example.COM%GT MIME-Version: 1.0 Content-Type: TEXT/PLAIN; CHARSET=US-ASCII @@ -49,10 +49,10 @@ A004 LOGOUT Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST) -From: Fred Foobar +From: Fred Foobar %LTfoobar@example.COM%GT Subject: afternoon meeting To: joe@example.com -Message-Id: +Message-Id: %LTB27397-0100000@example.COM%GT MIME-Version: 1.0 Content-Type: TEXT/PLAIN; CHARSET=US-ASCII diff --git a/tests/data/test3210 b/tests/data/test3210 index 7056b9c644..2cf71305e4 100644 --- a/tests/data/test3210 +++ b/tests/data/test3210 @@ -27,10 +27,10 @@ imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -u user:secret Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST) -From: Fred Foobar +From: Fred Foobar %LTfoobar@example.COM%GT Subject: afternoon meeting To: joe@example.com -Message-Id: +Message-Id: %LTB27397-0100000@example.COM%GT MIME-Version: 1.0 Content-Type: TEXT/PLAIN; CHARSET=US-ASCII @@ -49,10 +49,10 @@ A004 LOGOUT Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST) -From: Fred Foobar +From: Fred Foobar %LTfoobar@example.COM%GT Subject: afternoon meeting To: joe@example.com -Message-Id: +Message-Id: %LTB27397-0100000@example.COM%GT MIME-Version: 1.0 Content-Type: TEXT/PLAIN; CHARSET=US-ASCII diff --git a/tests/data/test3215 b/tests/data/test3215 index 97183c21d4..49d78e30c8 100644 --- a/tests/data/test3215 +++ b/tests/data/test3215 @@ -31,7 +31,7 @@ To: another body -smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt " NOTIFY=SUCCESS,FAILURE" --mail-from " RET=HDRS" -T - +smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt "%LTrecipient@example.com%GT NOTIFY=SUCCESS,FAILURE" --mail-from "%LTsender@example.com%GT RET=HDRS" -T - @@ -40,8 +40,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt " NOTIFY EHLO %TESTNUMBER -MAIL FROM: RET=HDRS -RCPT TO: NOTIFY=SUCCESS,FAILURE +MAIL FROM:%LTsender@example.com%GT RET=HDRS +RCPT TO:%LTrecipient@example.com%GT NOTIFY=SUCCESS,FAILURE DATA QUIT diff --git a/tests/data/test646 b/tests/data/test646 index cc400604db..1ef0c9f21b 100644 --- a/tests/data/test646 +++ b/tests/data/test646 @@ -40,7 +40,7 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER -F "=@%LOGDIR/test%TESTNUMBER.txt;headers=<%LOGDIR/headers%TESTNUMBER" -H "From: different" -H "To: another" --H "Reply-To: " +-H "Reply-To: %LTfollowup@example.com%GT" This is an attached file. @@ -66,8 +66,8 @@ s/boundary=------------------------[A-Za-z0-9]*/boundary=----------------------- EHLO %TESTNUMBER -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT @@ -76,7 +76,7 @@ Content-Type: multipart/mixed; boundary=----------------------------%CR Mime-Version: 1.0%CR From: different%CR To: another%CR -Reply-To: %CR +Reply-To: %LTfollowup@example.com%GT%CR %CR ------------------------------%CR Content-Type: multipart/alternative; boundary=----------------------------%CR diff --git a/tests/data/test647 b/tests/data/test647 index e6edb72c68..47297776ce 100644 --- a/tests/data/test647 +++ b/tests/data/test647 @@ -33,9 +33,9 @@ imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -F "=)" -F "=@%LOGDIR/test%TESTNUMBER.txt" -H "Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST)" --H "From: Fred Foobar " +-H "From: Fred Foobar %LTfoobar@example.com%GT" -H "To: joe@example.com" --H "Message-Id: " +-H "Message-Id: %LTB27397-0100000@example.com%GT" -H "Subject: afternoon meeting" -u user:secret @@ -63,9 +63,9 @@ A004 LOGOUT Content-Type: multipart/mixed; boundary=----------------------------%CR Mime-Version: 1.0%CR Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST)%CR -From: Fred Foobar %CR +From: Fred Foobar %LTfoobar@example.com%GT%CR To: joe@example.com%CR -Message-Id: %CR +Message-Id: %LTB27397-0100000@example.com%GT%CR Subject: afternoon meeting%CR %CR ------------------------------%CR diff --git a/tests/data/test648 b/tests/data/test648 index d36823e88f..3123c33e34 100644 --- a/tests/data/test648 +++ b/tests/data/test648 @@ -54,8 +54,8 @@ s/boundary=------------------------[A-Za-z0-9]*/boundary=----------------------- EHLO %TESTNUMBER -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test649 b/tests/data/test649 index 97f4f099ca..0e66c9d2f3 100644 --- a/tests/data/test649 +++ b/tests/data/test649 @@ -44,8 +44,8 @@ It contains at least an 8-bit byte value. EHLO %TESTNUMBER -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA diff --git a/tests/data/test652 b/tests/data/test652 index 25e5a6d9e3..4130012848 100644 --- a/tests/data/test652 +++ b/tests/data/test652 @@ -41,8 +41,8 @@ s/boundary=------------------------[A-Za-z0-9]*/boundary=----------------------- EHLO %TESTNUMBER -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsomebody@example.com%GT +RCPT TO:%LTsomeone@example.com%GT DATA QUIT diff --git a/tests/data/test805 b/tests/data/test805 index eadd8a4cb7..834d7c1de4 100644 --- a/tests/data/test805 +++ b/tests/data/test805 @@ -27,10 +27,10 @@ imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -u user:secret Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST) -From: Fred Foobar +From: Fred Foobar %LTfoobar@example.COM%GT Subject: afternoon meeting To: joe@example.com -Message-Id: +Message-Id: %LTB27397-0100000@example.COM%GT MIME-Version: 1.0 Content-Type: TEXT/PLAIN; CHARSET=US-ASCII @@ -49,10 +49,10 @@ A004 LOGOUT Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST) -From: Fred Foobar +From: Fred Foobar %LTfoobar@example.COM%GT Subject: afternoon meeting To: joe@example.com -Message-Id: +Message-Id: %LTB27397-0100000@example.COM%GT MIME-Version: 1.0 Content-Type: TEXT/PLAIN; CHARSET=US-ASCII diff --git a/tests/data/test864 b/tests/data/test864 index a21fc25175..80b7b462a5 100644 --- a/tests/data/test864 +++ b/tests/data/test864 @@ -11,7 +11,7 @@ APOP CAPA APOP -REPLY welcome +OK curl POP3 server ready to serve <1972.987654321\@curl> +REPLY welcome +OK curl POP3 server ready to serve %LT1972.987654321\@curl%GT From: me@somewhere diff --git a/tests/data/test900 b/tests/data/test900 index 8eb433b78e..59468252e5 100644 --- a/tests/data/test900 +++ b/tests/data/test900 @@ -37,8 +37,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr EHLO %TESTNUMBER -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test901 b/tests/data/test901 index 7e0b7034ac..8e3ca8ad3c 100644 --- a/tests/data/test901 +++ b/tests/data/test901 @@ -41,8 +41,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr EHLO %TESTNUMBER -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test902 b/tests/data/test902 index b913e4fcc8..ccf213a9cd 100644 --- a/tests/data/test902 +++ b/tests/data/test902 @@ -41,8 +41,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr EHLO %TESTNUMBER HELO %TESTNUMBER -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test903 b/tests/data/test903 index 07c2cd3d3a..13d6bc0ecc 100644 --- a/tests/data/test903 +++ b/tests/data/test903 @@ -43,8 +43,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr EHLO %TESTNUMBER AUTH PLAIN AHVzZXIAc2VjcmV0 -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test904 b/tests/data/test904 index 1c60c28fe5..81c6b107bc 100644 --- a/tests/data/test904 +++ b/tests/data/test904 @@ -44,8 +44,8 @@ EHLO %TESTNUMBER AUTH LOGIN dXNlcg== c2VjcmV0 -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test905 b/tests/data/test905 index 2c6f6e7c57..fe6a62f806 100644 --- a/tests/data/test905 +++ b/tests/data/test905 @@ -47,8 +47,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr EHLO %TESTNUMBER AUTH CRAM-MD5 dXNlciA3MDMxNzI1NTk5ZmRiYjVkNDEyNjg5YWEzMjNlM2UwYg== -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test906 b/tests/data/test906 index 4b99598e37..c19ece3cd2 100644 --- a/tests/data/test906 +++ b/tests/data/test906 @@ -50,8 +50,8 @@ EHLO %TESTNUMBER AUTH NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04= -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test907 b/tests/data/test907 index 48ae320b81..d4bab329dc 100644 --- a/tests/data/test907 +++ b/tests/data/test907 @@ -54,8 +54,8 @@ EHLO %TESTNUMBER AUTH DIGEST-MD5 dXNlcm5hbWU9InVzZXIiLHJlYWxtPSJjdXJsIixub25jZT0iNTMwMGQxN2ExZDY5NWJkNDExZTRjZGY5NmY5NTQ4YzIzY2VkNjE3NSIsY25vbmNlPSIzNDMzMzIzMTM1MzMzMjMxMzYzMzMyMzEzNzMzMzIzMSIsbmM9IjAwMDAwMDAxIixkaWdlc3QtdXJpPSJzbXRwLzEyNy4wLjAuMSIscmVzcG9uc2U9YTI3YzQzOTVmMzM4Njc0M2JlMTIyMDdiN2QxMTIxYzUscW9wPWF1dGg= -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test908 b/tests/data/test908 index 7bd4d5190b..4d8291186e 100644 --- a/tests/data/test908 +++ b/tests/data/test908 @@ -43,8 +43,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr EHLO %TESTNUMBER AUTH XOAUTH2 dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test909 b/tests/data/test909 index 91b7207257..0290eef8dd 100644 --- a/tests/data/test909 +++ b/tests/data/test909 @@ -35,8 +35,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr EHLO %TESTNUMBER -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test910 b/tests/data/test910 index bc572a36ee..60911603a7 100644 --- a/tests/data/test910 +++ b/tests/data/test910 @@ -35,8 +35,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr EHLO %TESTNUMBER -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test911 b/tests/data/test911 index 0ee44f2b84..9ee0fd7bf4 100644 --- a/tests/data/test911 +++ b/tests/data/test911 @@ -34,8 +34,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr EHLO %TESTNUMBER -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test912 b/tests/data/test912 index a5e284c7e6..0cdc9ca4f6 100644 --- a/tests/data/test912 +++ b/tests/data/test912 @@ -39,8 +39,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr EHLO %TESTNUMBER -MAIL FROM: SIZE=38 -RCPT TO: +MAIL FROM:%LTsender@example.com%GT SIZE=38 +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test913 b/tests/data/test913 index 20373cf183..8e9c0429a8 100644 --- a/tests/data/test913 +++ b/tests/data/test913 @@ -43,7 +43,7 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr EHLO %TESTNUMBER -MAIL FROM: SIZE=38 +MAIL FROM:%LTsender@example.com%GT SIZE=38 QUIT diff --git a/tests/data/test914 b/tests/data/test914 index a4a617a8be..0891b5fd6d 100644 --- a/tests/data/test914 +++ b/tests/data/test914 @@ -42,7 +42,7 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr EHLO %TESTNUMBER -MAIL FROM: +MAIL FROM:%LTinvalid%GT QUIT diff --git a/tests/data/test915 b/tests/data/test915 index 5243da9003..3a761b4bbe 100644 --- a/tests/data/test915 +++ b/tests/data/test915 @@ -35,8 +35,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com -T - EHLO %TESTNUMBER -MAIL FROM:<> -RCPT TO: +MAIL FROM:%LT%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test916 b/tests/data/test916 index 9d25ccae3d..e0108edb9f 100644 --- a/tests/data/test916 +++ b/tests/data/test916 @@ -39,8 +39,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt invalid --mail-from sender@exam EHLO %TESTNUMBER -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTinvalid%GT QUIT diff --git a/tests/data/test917 b/tests/data/test917 index 3ccc533452..a28ce3d3bc 100644 --- a/tests/data/test917 +++ b/tests/data/test917 @@ -42,12 +42,12 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER EHLO %TESTNUMBER -MAIL FROM: -RCPT TO: -RCPT TO: -RCPT TO: -RCPT TO: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient.one@example.com%GT +RCPT TO:%LTrecipient.two@example.com%GT +RCPT TO:%LTrecipient.three@example.com%GT +RCPT TO:%LTrecipient.four@example.com%GT +RCPT TO:%LTrecipient.five@example.com%GT DATA QUIT diff --git a/tests/data/test918 b/tests/data/test918 index d81b44db16..9507b769db 100644 --- a/tests/data/test918 +++ b/tests/data/test918 @@ -46,9 +46,9 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER EHLO %TESTNUMBER -MAIL FROM: -RCPT TO: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient.one@example.com%GT +RCPT TO:%LTinvalid%GT QUIT diff --git a/tests/data/test919 b/tests/data/test919 index 0d2ff8e119..97739093f3 100644 --- a/tests/data/test919 +++ b/tests/data/test919 @@ -42,8 +42,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr EHLO %TESTNUMBER AUTH PLAIN AHVzZXIAc2VjcmV0 -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test920 b/tests/data/test920 index 8720386662..8f4c981a26 100644 --- a/tests/data/test920 +++ b/tests/data/test920 @@ -43,8 +43,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr EHLO %TESTNUMBER AUTH LOGIN dXNlcg== c2VjcmV0 -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test921 b/tests/data/test921 index 664b98d80c..3bed5ed0f0 100644 --- a/tests/data/test921 +++ b/tests/data/test921 @@ -49,8 +49,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr EHLO %TESTNUMBER AUTH NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04= -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test922 b/tests/data/test922 index a8b1e20a44..d370087629 100644 --- a/tests/data/test922 +++ b/tests/data/test922 @@ -42,8 +42,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr EHLO %TESTNUMBER AUTH XOAUTH2 dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test924 b/tests/data/test924 index 986b4e9956..c1bd9f2286 100644 --- a/tests/data/test924 +++ b/tests/data/test924 @@ -11,9 +11,9 @@ VRFY 553-Ambiguous; Possibilities are: -553-Joe Smith -553-Harry Smith -553 Melvin Smith +553-Joe Smith %LTjoe.smith@example.com%GT +553-Harry Smith %LTharry.smith@example.com%GT +553 Melvin Smith %LTmelvin.smith@example.com%GT diff --git a/tests/data/test927 b/tests/data/test927 index 7c81632d9b..173caa2907 100644 --- a/tests/data/test927 +++ b/tests/data/test927 @@ -11,9 +11,9 @@ CUSTOMREQUEST # Server-side -250-Joe Smith -250-Harry Smith -250 Melvin Smith +250-Joe Smith %LTjoe.smith@example.com%GT +250-Harry Smith %LTharry.smith@example.com%GT +250 Melvin Smith %LTmelvin.smith@example.com%GT diff --git a/tests/data/test935 b/tests/data/test935 index 5f0dc9b0d3..07e7387cff 100644 --- a/tests/data/test935 +++ b/tests/data/test935 @@ -53,8 +53,8 @@ AUTH CRAM-MD5 * AUTH PLAIN AHVzZXIAc2VjcmV0 -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test936 b/tests/data/test936 index cd0fe30e3f..3586ed965a 100644 --- a/tests/data/test936 +++ b/tests/data/test936 @@ -55,8 +55,8 @@ TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= * AUTH PLAIN AHVzZXIAc2VjcmV0 -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test937 b/tests/data/test937 index 8060d8e940..9c8641a178 100644 --- a/tests/data/test937 +++ b/tests/data/test937 @@ -55,8 +55,8 @@ AUTH DIGEST-MD5 * AUTH PLAIN AHVzZXIAc2VjcmV0 -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test938 b/tests/data/test938 index a77a3a08e1..70d6b20748 100644 --- a/tests/data/test938 +++ b/tests/data/test938 @@ -46,15 +46,15 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER002 --mail-rcpt recipient@example.com --mail EHLO %TESTNUMBER001 AUTH PLAIN dXNlci5vbmUAdXNlci5vbmUAc2VjcmV0 -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT EHLO %TESTNUMBER002 AUTH PLAIN dXNlci50d28AdXNlci50d28Ac2VjcmV0 -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test939 b/tests/data/test939 index 68fc9f87c7..bebc9286c8 100644 --- a/tests/data/test939 +++ b/tests/data/test939 @@ -37,8 +37,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr EHLO %TESTNUMBER HELO %TESTNUMBER -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test940 b/tests/data/test940 index fa64163bd9..4395698a19 100644 --- a/tests/data/test940 +++ b/tests/data/test940 @@ -32,8 +32,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr EHLO %TESTNUMBER -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test941 b/tests/data/test941 index 36544e43c8..06a65b86da 100644 --- a/tests/data/test941 +++ b/tests/data/test941 @@ -44,8 +44,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr EHLO %TESTNUMBER -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test942 b/tests/data/test942 index 664ba4ea7d..7d2b40e6d0 100644 --- a/tests/data/test942 +++ b/tests/data/test942 @@ -43,8 +43,8 @@ mail body EHLO %TESTNUMBER AUTH EXTERNAL dXNlcg== -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test943 b/tests/data/test943 index 2003caf904..6244ca5bd1 100644 --- a/tests/data/test943 +++ b/tests/data/test943 @@ -43,8 +43,8 @@ mail body EHLO %TESTNUMBER AUTH EXTERNAL = -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test944 b/tests/data/test944 index a00a44e635..5cc76d59e4 100644 --- a/tests/data/test944 +++ b/tests/data/test944 @@ -42,8 +42,8 @@ mail body EHLO %TESTNUMBER AUTH EXTERNAL dXNlcg== -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test945 b/tests/data/test945 index 5f34e31ab7..c470072607 100644 --- a/tests/data/test945 +++ b/tests/data/test945 @@ -42,8 +42,8 @@ mail body EHLO %TESTNUMBER AUTH EXTERNAL = -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test946 b/tests/data/test946 index f463bfc4eb..dbbbe66b95 100644 --- a/tests/data/test946 +++ b/tests/data/test946 @@ -44,8 +44,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr EHLO %TESTNUMBER AUTH OAUTHBEARER %b64[n,a=user,%01host=127.0.0.1%01port=%SMTPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64% -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test947 b/tests/data/test947 index 995e54ed28..ade9aaef7b 100644 --- a/tests/data/test947 +++ b/tests/data/test947 @@ -43,8 +43,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr EHLO %TESTNUMBER AUTH OAUTHBEARER %b64[n,a=user,%01host=127.0.0.1%01port=%SMTPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64% -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test950 b/tests/data/test950 index 6f18037370..160773bee6 100644 --- a/tests/data/test950 +++ b/tests/data/test950 @@ -11,7 +11,7 @@ VRFY # Server-side -250 +250 %LTrecipient@example.com%GT diff --git a/tests/data/test951 b/tests/data/test951 index 616c6cd523..46c981cc60 100644 --- a/tests/data/test951 +++ b/tests/data/test951 @@ -32,8 +32,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr EHLO %TESTNUMBER -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test952 b/tests/data/test952 index f2a90bfbbd..7325e823e5 100644 --- a/tests/data/test952 +++ b/tests/data/test952 @@ -32,8 +32,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr EHLO %TESTNUMBER -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test953 b/tests/data/test953 index 04ebe21466..2fe9459283 100644 --- a/tests/data/test953 +++ b/tests/data/test953 @@ -43,8 +43,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr EHLO %TESTNUMBER AUTH PLAIN dXJzZWwAa3VydAB4aXBqM3BsbXE= -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test955 b/tests/data/test955 index be0565842f..eac15f0adc 100644 --- a/tests/data/test955 +++ b/tests/data/test955 @@ -49,7 +49,7 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr EHLO %TESTNUMBER -MAIL FROM: +MAIL FROM:%LTAvs%hex[%c3%a4]hex%ndaren@example.com%GT QUIT diff --git a/tests/data/test956 b/tests/data/test956 index aaae3544d0..f0e1e4d207 100644 --- a/tests/data/test956 +++ b/tests/data/test956 @@ -46,8 +46,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt St%hex[%c3%b6]hex%dmottagaren@e EHLO %TESTNUMBER -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTSt%hex[%c3%b6]hex%dmottagaren@example.com%GT QUIT diff --git a/tests/data/test959 b/tests/data/test959 index 3ee988c57f..ae21234d78 100644 --- a/tests/data/test959 +++ b/tests/data/test959 @@ -50,7 +50,7 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr EHLO %TESTNUMBER -MAIL FROM: +MAIL FROM:%LTsender@%hex[%c3%a5%c3%a4%c3%b6]hex%.se%GT QUIT diff --git a/tests/data/test960 b/tests/data/test960 index 64d5050a30..8420e02295 100644 --- a/tests/data/test960 +++ b/tests/data/test960 @@ -47,8 +47,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@%hex[%c3%a5%c3%a4%c3% EHLO %TESTNUMBER -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@%hex[%c3%a5%c3%a4%c3%b6]hex%.se%GT QUIT diff --git a/tests/data/test962 b/tests/data/test962 index 59ced3bc77..98be6f0e22 100644 --- a/tests/data/test962 +++ b/tests/data/test962 @@ -44,8 +44,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr EHLO %TESTNUMBER -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@xn--4cab6c.se%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test963 b/tests/data/test963 index 8b411458c6..0b042f0aa9 100644 --- a/tests/data/test963 +++ b/tests/data/test963 @@ -44,8 +44,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@%hex[%c3%a5%c3%a4%c3% EHLO %TESTNUMBER -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@xn--4cab6c.se%GT DATA QUIT diff --git a/tests/data/test965 b/tests/data/test965 index b4ccc70425..54f1f51b0a 100644 --- a/tests/data/test965 +++ b/tests/data/test965 @@ -47,8 +47,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr EHLO %TESTNUMBER -MAIL FROM: SMTPUTF8 -RCPT TO: +MAIL FROM:%LTAvs%hex[%c3%a4]hex%ndaren@xn--4cab6c.se%GT SMTPUTF8 +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test966 b/tests/data/test966 index 24ef559766..958df6858d 100644 --- a/tests/data/test966 +++ b/tests/data/test966 @@ -47,8 +47,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt St%hex[%c3%b6]hex%dmottagaren@% EHLO %TESTNUMBER -MAIL FROM: SMTPUTF8 -RCPT TO: +MAIL FROM:%LTsender@example.com%GT SMTPUTF8 +RCPT TO:%LTSt%hex[%c3%b6]hex%dmottagaren@xn--4cab6c.se%GT DATA QUIT diff --git a/tests/data/test969 b/tests/data/test969 index 00311d5f19..875ea6d4b5 100644 --- a/tests/data/test969 +++ b/tests/data/test969 @@ -15,9 +15,9 @@ IDN CAPA SMTPUTF8 -250-Joe Smith -250-Harry Smith -250 Melvin Smith +250-Joe Smith %LTjoe.smith@example.com%GT +250-Harry Smith %LTharry.smith@example.com%GT +250 Melvin Smith %LTmelvin.smith@example.com%GT diff --git a/tests/data/test981 b/tests/data/test981 index 94de9dfbea..f1ac9aa20f 100644 --- a/tests/data/test981 +++ b/tests/data/test981 @@ -33,10 +33,10 @@ imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -u user:secret Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST) -From: Fred Foobar +From: Fred Foobar %LTfoobar@example.COM%GT Subject: afternoon meeting To: joe@example.com -Message-Id: +Message-Id: %LTB27397-0100000@example.COM%GT MIME-Version: 1.0 Content-Type: TEXT/PLAIN; CHARSET=US-ASCII diff --git a/tests/data/test984 b/tests/data/test984 index e79efdf84b..4e802a1d2e 100644 --- a/tests/data/test984 +++ b/tests/data/test984 @@ -31,10 +31,10 @@ imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -u user:secret Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST) -From: Fred Foobar +From: Fred Foobar %LTfoobar@example.COM%GT Subject: afternoon meeting To: joe@example.com -Message-Id: +Message-Id: %LTB27397-0100000@example.COM%GT MIME-Version: 1.0 Content-Type: TEXT/PLAIN; CHARSET=US-ASCII diff --git a/tests/data/test987 b/tests/data/test987 index 312c406a70..7c158128fb 100644 --- a/tests/data/test987 +++ b/tests/data/test987 @@ -36,8 +36,8 @@ body EHLO %TESTNUMBER -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/data/test992 b/tests/data/test992 index 772ad91e79..bf8b0fb1c4 100644 --- a/tests/data/test992 +++ b/tests/data/test992 @@ -41,8 +41,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr EHLO %TESTNUMBER AUTH XOAUTH2 dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB -MAIL FROM: -RCPT TO: +MAIL FROM:%LTsender@example.com%GT +RCPT TO:%LTrecipient@example.com%GT DATA QUIT diff --git a/tests/testutil.pm b/tests/testutil.pm index 6317a5e931..7e2b279f07 100644 --- a/tests/testutil.pm +++ b/tests/testutil.pm @@ -156,6 +156,8 @@ sub subbase64 { $$thing =~ s/%SP/ /g; # space $$thing =~ s/%TAB/\t/g; # horizontal tab $$thing =~ s/%CR/\r/g; # carriage return aka \r aka 0x0d + $$thing =~ s/%LT//g; # include a file $$thing =~ s/%include ([^%]*)%[\n\r]+/includefile($1, 0)/ge;