tests/data: more XML-compliance via `%LT` and `%GT` macros in email addresses

Reduce number of files failing `xmllint --format` from 133 to 57 (-76)
(3% of 1894), by replacing `<` and `>` with new macro `%LT` and `%GT`,
in most places, which is in email addresses (192 lines).

Follow-up to a9ec2a676c4257cf522a4349fb24fa547ed48aad #19491

Closes #19470

diff --git a/tests/data/test1015 b/tests/data/test1015
index beabcd1b901763e367b5850fbf1676203fa7e7f0..9f2a53d49a873614c409238660f8074a885cc607 100644 (file)
--- 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
 </command>
 <file name="%LOGDIR/%TESTNUMBER.txt">
-content to _?!#$'|<>
+content to _?!#$'|%LT%GT
 </file>
 </client>
 

diff --git a/tests/data/test1187 b/tests/data/test1187
index 82debafd04045d5fdf25ee972a467cac0c79af3a..fdfadd847f8aa7b6fd386ad6f6ff59534a38eaf9 100644 (file)
--- a/tests/data/test1187
+++ b/tests/data/test1187
@@ -30,7 +30,7 @@ To: another
 body
 </stdin>
 <command>
-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"'
 </command>
 </client>
 
@@ -43,8 +43,8 @@ s/boundary=------------------------[A-Za-z0-9]*/boundary=-----------------------
 </strippart>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test1221 b/tests/data/test1221
index 6a410d95b898e91f9d875e509d6bf695c12a6b41..1bfc61bdee3e07deec4c3710db704544b37b7603 100644 (file)
--- 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"
 </command>
 <file name="%LOGDIR/%TESTNUMBER.txt">
-content to _?!#$'|<>
+content to _?!#$'|%LT%GT
 </file>
 </client>
 

diff --git a/tests/data/test1320 b/tests/data/test1320
index 92a23a4e9f4e6dddaaa7dd502709acdd23439254..8c189ee9c7b2593be3a94f7faf7f9d7894c64575 100644 (file)
--- a/tests/data/test1320
+++ b/tests/data/test1320
@@ -48,8 +48,8 @@ smtp://smtp.%TESTNUMBER:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com
 <verify>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test1406 b/tests/data/test1406
index bdd142159d9ccfa422273c66f587a0af3b7bf403..492b5b8b31d1853e78b682a127026b372c7b6082 100644 (file)
--- a/tests/data/test1406
+++ b/tests/data/test1406
@@ -49,9 +49,9 @@ ftp
 <verify>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<sender@example.com> SIZE=38
-RCPT TO:<recipient.one@example.com>
-RCPT TO:<recipient.two@example.com>
+MAIL FROM:%LTsender@example.com%GT SIZE=38
+RCPT TO:%LTrecipient.one@example.com%GT
+RCPT TO:%LTrecipient.two@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test1507 b/tests/data/test1507
index afc87120566beb8f23b25ba739da6bbaae6e1a39..f48eff4de884e4c5129f8ad180f77b0da057e119 100644 (file)
--- a/tests/data/test1507
+++ b/tests/data/test1507
@@ -41,8 +41,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
 <verify>
 <protocol crlf="yes">
 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
 </protocol>
 <upload>

diff --git a/tests/data/test1520 b/tests/data/test1520
index f49b9147799c197fd9db2a7e369f9144f8df360d..acd3413e2cf7f7a782ba35727797ef38dd0b6b70 100644 (file)
--- a/tests/data/test1520
+++ b/tests/data/test1520
@@ -41,8 +41,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
 <verify>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test1711 b/tests/data/test1711
index 709266eac619060b31d9e89349ed44801533a956..d7725e96e5ed3dda24a8895e99d07f1994c2098e 100644 (file)
--- a/tests/data/test1711
+++ b/tests/data/test1711
@@ -35,8 +35,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 <verify>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test3002 b/tests/data/test3002
index ffb6e49a49dc1e320ca3efd08c91bf97e82bf32b..fdb657bd71332e3716a00c4afa07e23c64994853 100644 (file)
--- a/tests/data/test3002
+++ b/tests/data/test3002
@@ -43,12 +43,12 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
 <verify>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<sender@example.com>
-RCPT TO:<invalid.one>
-RCPT TO:<recipient.two@example.com>
-RCPT TO:<recipient.three@example.com>
-RCPT TO:<recipient.four@example.com>
-RCPT TO:<recipient.five@example.com>
+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
 </protocol>

diff --git a/tests/data/test3003 b/tests/data/test3003
index 07c72f0798a87f2db62ad1fc56bad126254887ee..f382e0ec581fa6fd0226662a4331edea6e7b4dfd 100644 (file)
--- a/tests/data/test3003
+++ b/tests/data/test3003
@@ -43,12 +43,12 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
 <verify>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient.one@example.com>
-RCPT TO:<recipient.two@example.com>
-RCPT TO:<recipient.three@example.com>
-RCPT TO:<recipient.four@example.com>
-RCPT TO:<invalid.five>
+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
 </protocol>

diff --git a/tests/data/test3004 b/tests/data/test3004
index 52ef1188b9284d9923d2d6dc19a980ee5a0c7fb3..d11e3dafe5d65e7a195337fc90db89c19fc75b35 100644 (file)
--- a/tests/data/test3004
+++ b/tests/data/test3004
@@ -43,12 +43,12 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
 <verify>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient.one@example.com>
-RCPT TO:<recipient.two@example.com>
-RCPT TO:<invalid.three>
-RCPT TO:<recipient.four@example.com>
-RCPT TO:<recipient.five@example.com>
+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
 </protocol>

diff --git a/tests/data/test3005 b/tests/data/test3005
index 68dedd2fc0022b99a44ac7e5f25488c06935fc9a..725cfce20cdb24f3784a9cf9e29ea54c93e12a7b 100644 (file)
--- a/tests/data/test3005
+++ b/tests/data/test3005
@@ -43,12 +43,12 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
 <verify>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<sender@example.com>
-RCPT TO:<invalid.one>
-RCPT TO:<recipient.two@example.com>
-RCPT TO:<invalid.three>
-RCPT TO:<invalid.four>
-RCPT TO:<invalid.five>
+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
 </protocol>

diff --git a/tests/data/test3006 b/tests/data/test3006
index d5086c23d6047a4e499f6297c794cbf614c6af37..2c705448dac691ae05eba132077346ade5f31472 100644 (file)
--- a/tests/data/test3006
+++ b/tests/data/test3006
@@ -47,12 +47,12 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
 </errorcode>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<sender@example.com>
-RCPT TO:<invalid.one>
-RCPT TO:<invalid.two>
-RCPT TO:<invalid.three>
-RCPT TO:<invalid.four>
-RCPT TO:<invalid.five>
+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
 </protocol>
 </verify>

diff --git a/tests/data/test3007 b/tests/data/test3007
index 3cc0aedc86e849196eb3aa03ae270efb2967a78d..752aafb2b3db4b10396cfef8227ffdadb3f04943 100644 (file)
--- a/tests/data/test3007
+++ b/tests/data/test3007
@@ -43,8 +43,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
 </errorcode>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<sender@example.com>
-RCPT TO:<invalid.one>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTinvalid.one%GT
 QUIT
 </protocol>
 </verify>

diff --git a/tests/data/test3209 b/tests/data/test3209
index 4c1c1888ebf59491a203153a2a900637fa3fc702..d9cac898674a6f9348a33bf8cf2ba29e82874430 100644 (file)
--- a/tests/data/test3209
+++ b/tests/data/test3209
@@ -27,10 +27,10 @@ imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -u user:secret
 </command>
 <file name="%LOGDIR/upload%TESTNUMBER">
 Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST)
-From: Fred Foobar <foobar@example.COM>
+From: Fred Foobar %LTfoobar@example.COM%GT
 Subject: afternoon meeting
 To: joe@example.com
-Message-Id: <B27397-0100000@example.COM>
+Message-Id: %LTB27397-0100000@example.COM%GT
 MIME-Version: 1.0
 Content-Type: TEXT/PLAIN; CHARSET=US-ASCII
 
@@ -49,10 +49,10 @@ A004 LOGOUT
 </protocol>
 <upload>
 Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST)
-From: Fred Foobar <foobar@example.COM>
+From: Fred Foobar %LTfoobar@example.COM%GT
 Subject: afternoon meeting
 To: joe@example.com
-Message-Id: <B27397-0100000@example.COM>
+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 7056b9c6447abef1c59339a051c3915d3f0bd942..2cf71305e4a87dcc77ef6bf181ee8a6ffea6d44f 100644 (file)
--- a/tests/data/test3210
+++ b/tests/data/test3210
@@ -27,10 +27,10 @@ imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -u user:secret
 </command>
 <file name="%LOGDIR/upload%TESTNUMBER">
 Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST)
-From: Fred Foobar <foobar@example.COM>
+From: Fred Foobar %LTfoobar@example.COM%GT
 Subject: afternoon meeting
 To: joe@example.com
-Message-Id: <B27397-0100000@example.COM>
+Message-Id: %LTB27397-0100000@example.COM%GT
 MIME-Version: 1.0
 Content-Type: TEXT/PLAIN; CHARSET=US-ASCII
 
@@ -49,10 +49,10 @@ A004 LOGOUT
 </protocol>
 <upload>
 Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST)
-From: Fred Foobar <foobar@example.COM>
+From: Fred Foobar %LTfoobar@example.COM%GT
 Subject: afternoon meeting
 To: joe@example.com
-Message-Id: <B27397-0100000@example.COM>
+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 97183c21d487ab577c0695842ff956c49b3143ba..49d78e30c8e5844fc4075a9b40a84563e22c2821 100644 (file)
--- a/tests/data/test3215
+++ b/tests/data/test3215
@@ -31,7 +31,7 @@ To: another
 body
 </stdin>
 <command>
-smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt "<recipient@example.com> NOTIFY=SUCCESS,FAILURE" --mail-from "<sender@example.com> 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 -
 </command>
 </client>
 
@@ -40,8 +40,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt "<recipient@example.com> NOTIFY
 <verify>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<sender@example.com> RET=HDRS
-RCPT TO:<recipient@example.com> NOTIFY=SUCCESS,FAILURE
+MAIL FROM:%LTsender@example.com%GT RET=HDRS
+RCPT TO:%LTrecipient@example.com%GT NOTIFY=SUCCESS,FAILURE
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test646 b/tests/data/test646
index cc400604dbd1c3d7d1797dd315995d47f363aa9a..1ef0c9f21ba3074f6c46c33ed41753a72a28a888 100644 (file)
--- 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: <followup@example.com>"
+-H "Reply-To: %LTfollowup@example.com%GT"
 </command>
 <file1 name="%LOGDIR/test%TESTNUMBER.txt">
 This is an attached file.
@@ -66,8 +66,8 @@ s/boundary=------------------------[A-Za-z0-9]*/boundary=-----------------------
 </strippart>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>
@@ -76,7 +76,7 @@ Content-Type: multipart/mixed; boundary=----------------------------%CR
 Mime-Version: 1.0%CR
 From: different%CR
 To: another%CR
-Reply-To: <followup@example.com>%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 e6edb72c686c557711840cc8a2109c3bd60d721b..47297776ce13e2cc5fb55fa522c02c02e1dc105f 100644 (file)
--- 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 <foobar@example.com>"
+-H "From: Fred Foobar %LTfoobar@example.com%GT"
 -H "To: joe@example.com"
--H "Message-Id: <B27397-0100000@example.com>"
+-H "Message-Id: %LTB27397-0100000@example.com%GT"
 -H "Subject: afternoon meeting"
 -u user:secret
 </command>
@@ -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 <foobar@example.com>%CR
+From: Fred Foobar %LTfoobar@example.com%GT%CR
 To: joe@example.com%CR
-Message-Id: <B27397-0100000@example.com>%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 d36823e88fbd0095f1cf016f1d9b04a90e2e672a..3123c33e34df3e1fc1500caf8a9abeab05d936ad 100644 (file)
--- a/tests/data/test648
+++ b/tests/data/test648
@@ -54,8 +54,8 @@ s/boundary=------------------------[A-Za-z0-9]*/boundary=-----------------------
 </strippart>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test649 b/tests/data/test649
index 97f4f099ca1a3478e5b3caff82bca2f9bd6b7178..0e66c9d2f3cc7ab1aebb5f31161a68884dbe10e3 100644 (file)
--- a/tests/data/test649
+++ b/tests/data/test649
@@ -44,8 +44,8 @@ It contains at least an 8-bit byte value.
 <verify>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 </protocol>
 <errorcode>

diff --git a/tests/data/test652 b/tests/data/test652
index 25e5a6d9e3bbc9b4e5a21a6c1bf4b9abbc3ddaa6..4130012848715e7b56896fc97c811b1f0bd562ee 100644 (file)
--- a/tests/data/test652
+++ b/tests/data/test652
@@ -41,8 +41,8 @@ s/boundary=------------------------[A-Za-z0-9]*/boundary=-----------------------
 </strippart>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<somebody@example.com>
-RCPT TO:<someone@example.com>
+MAIL FROM:%LTsomebody@example.com%GT
+RCPT TO:%LTsomeone@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test805 b/tests/data/test805
index eadd8a4cb7b44f31a5ed9ade6d7cb3e0fdc79561..834d7c1de4da4b4fabce22a8d1ac7dc7c4df88c8 100644 (file)
--- a/tests/data/test805
+++ b/tests/data/test805
@@ -27,10 +27,10 @@ imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -u user:secret
 </command>
 <file name="%LOGDIR/upload%TESTNUMBER" crlf="yes">
 Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST)
-From: Fred Foobar <foobar@example.COM>
+From: Fred Foobar %LTfoobar@example.COM%GT
 Subject: afternoon meeting
 To: joe@example.com
-Message-Id: <B27397-0100000@example.COM>
+Message-Id: %LTB27397-0100000@example.COM%GT
 MIME-Version: 1.0
 Content-Type: TEXT/PLAIN; CHARSET=US-ASCII
 
@@ -49,10 +49,10 @@ A004 LOGOUT
 </protocol>
 <upload crlf="yes">
 Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST)
-From: Fred Foobar <foobar@example.COM>
+From: Fred Foobar %LTfoobar@example.COM%GT
 Subject: afternoon meeting
 To: joe@example.com
-Message-Id: <B27397-0100000@example.COM>
+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 a21fc25175823007ba330c669b327481f5e4e4c9..80b7b462a5b61a45f29b1d6a85735be385efd37c 100644 (file)
--- a/tests/data/test864
+++ b/tests/data/test864
@@ -11,7 +11,7 @@ APOP
 <reply>
 <servercmd>
 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
 </servercmd>
 <data crlf="yes">
 From: me@somewhere

diff --git a/tests/data/test900 b/tests/data/test900
index 8eb433b78e37c9675fce53d8fee372f344d84004..59468252e57122dd3e9bb1db1ee0cb9dbebf6257 100644 (file)
--- a/tests/data/test900
+++ b/tests/data/test900
@@ -37,8 +37,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 <verify>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test901 b/tests/data/test901
index 7e0b7034acd42ddaa918f85e3eccebaa0fe69e9e..8e3ca8ad3c5bb1e3a3638827c7ff20d471c519b4 100644 (file)
--- a/tests/data/test901
+++ b/tests/data/test901
@@ -41,8 +41,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 <verify>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test902 b/tests/data/test902
index b913e4fcc8bafe11cc2b491c7cea1ea56dae19da..ccf213a9cdabdcc658d39e58d79acf368ebddf1a 100644 (file)
--- a/tests/data/test902
+++ b/tests/data/test902
@@ -41,8 +41,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 <protocol crlf="yes">
 EHLO %TESTNUMBER
 HELO %TESTNUMBER
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test903 b/tests/data/test903
index 07c2cd3d3a7934c45b3d353b910c5d3bf0aba775..13d6bc0ecca2ee91aca8bd32109ceb2da208643c 100644 (file)
--- 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:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test904 b/tests/data/test904
index 1c60c28fe52f33f60feb278d30b1cc083e864379..81c6b107bcf1d43fc2fb119b25a8ff4cd6203fac 100644 (file)
--- a/tests/data/test904
+++ b/tests/data/test904
@@ -44,8 +44,8 @@ EHLO %TESTNUMBER
 AUTH LOGIN
 dXNlcg==
 c2VjcmV0
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test905 b/tests/data/test905
index 2c6f6e7c576f55c4165a65959c490b0dc9f966ac..fe6a62f806635cc4b4cacf6108f65a7c0114e538 100644 (file)
--- 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:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test906 b/tests/data/test906
index 4b99598e3744678c796251a8e57cc3b7e2c52642..c19ece3cd2be3e8931a2d7234a5aebc181f4259a 100644 (file)
--- a/tests/data/test906
+++ b/tests/data/test906
@@ -50,8 +50,8 @@ EHLO %TESTNUMBER
 AUTH NTLM
 TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test907 b/tests/data/test907
index 48ae320b81d326925eae06c6297c0cd77710c89c..d4bab329dc4f3fb8bdd59a0ac5c9b30b8e34b66a 100644 (file)
--- a/tests/data/test907
+++ b/tests/data/test907
@@ -54,8 +54,8 @@ EHLO %TESTNUMBER
 AUTH DIGEST-MD5
 dXNlcm5hbWU9InVzZXIiLHJlYWxtPSJjdXJsIixub25jZT0iNTMwMGQxN2ExZDY5NWJkNDExZTRjZGY5NmY5NTQ4YzIzY2VkNjE3NSIsY25vbmNlPSIzNDMzMzIzMTM1MzMzMjMxMzYzMzMyMzEzNzMzMzIzMSIsbmM9IjAwMDAwMDAxIixkaWdlc3QtdXJpPSJzbXRwLzEyNy4wLjAuMSIscmVzcG9uc2U9YTI3YzQzOTVmMzM4Njc0M2JlMTIyMDdiN2QxMTIxYzUscW9wPWF1dGg=
 
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test908 b/tests/data/test908
index 7bd4d5190b3b7556f48c12a6bbf65588e8a60ba7..4d8291186e2e598683c98a2772ae913a06e8f241 100644 (file)
--- 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:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test909 b/tests/data/test909
index 91b720725769f0e88a4299eb1b431ccb05be5ad6..0290eef8dd86715036ee2f855e69f416d38ce101 100644 (file)
--- a/tests/data/test909
+++ b/tests/data/test909
@@ -35,8 +35,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 <verify>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test910 b/tests/data/test910
index bc572a36ee7a6164fc105b5fe23e45d7a8571465..60911603a75b68c48fa4a7b50146927fe3091b10 100644 (file)
--- a/tests/data/test910
+++ b/tests/data/test910
@@ -35,8 +35,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 <verify>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test911 b/tests/data/test911
index 0ee44f2b84ccfb19be1678e32546e184f5875907..9ee0fd7bf437222ab679e184cbe77a598500b3b0 100644 (file)
--- a/tests/data/test911
+++ b/tests/data/test911
@@ -34,8 +34,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 <verify>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test912 b/tests/data/test912
index a5e284c7e69ee2eaf458fb36175eaff0e982a682..0cdc9ca4f69db629bec87453f0c243c426ea319c 100644 (file)
--- a/tests/data/test912
+++ b/tests/data/test912
@@ -39,8 +39,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 <verify>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<sender@example.com> SIZE=38
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT SIZE=38
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test913 b/tests/data/test913
index 20373cf183b20602c5ea928041fdf238e076f160..8e9c0429a883f01c6f0a77421c320d36f1b2e053 100644 (file)
--- a/tests/data/test913
+++ b/tests/data/test913
@@ -43,7 +43,7 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 </errorcode>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<sender@example.com> SIZE=38
+MAIL FROM:%LTsender@example.com%GT SIZE=38
 QUIT
 </protocol>
 </verify>

diff --git a/tests/data/test914 b/tests/data/test914
index a4a617a8bea673ea5ebd69a969ad7f7287eef2dc..0891b5fd6d5908374cebcd778097fc3ace43f2c5 100644 (file)
--- a/tests/data/test914
+++ b/tests/data/test914
@@ -42,7 +42,7 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 </errorcode>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<invalid>
+MAIL FROM:%LTinvalid%GT
 QUIT
 </protocol>
 </verify>

diff --git a/tests/data/test915 b/tests/data/test915
index 5243da9003c48120c67dc76e1d846bd9d8ae2e32..3a761b4bbe4c7b238d3983c9df9d7d3bdec17691 100644 (file)
--- a/tests/data/test915
+++ b/tests/data/test915
@@ -35,8 +35,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com -T -
 <verify>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LT%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test916 b/tests/data/test916
index 9d25ccae3ddceef2b1fe19a39ddfeb65edb343d7..e0108edb9fb05bb45e85d87c50440ff4ac2e97f0 100644 (file)
--- a/tests/data/test916
+++ b/tests/data/test916
@@ -39,8 +39,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt invalid --mail-from sender@exam
 </errorcode>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<sender@example.com>
-RCPT TO:<invalid>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTinvalid%GT
 QUIT
 </protocol>
 </verify>

diff --git a/tests/data/test917 b/tests/data/test917
index 3ccc5334526f7238103182740d7cdf80655b53e0..a28ce3d3bc62bc6f689e662aaeadfc365fa5d9c4 100644 (file)
--- a/tests/data/test917
+++ b/tests/data/test917
@@ -42,12 +42,12 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
 <verify>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient.one@example.com>
-RCPT TO:<recipient.two@example.com>
-RCPT TO:<recipient.three@example.com>
-RCPT TO:<recipient.four@example.com>
-RCPT TO:<recipient.five@example.com>
+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
 </protocol>

diff --git a/tests/data/test918 b/tests/data/test918
index d81b44db16945084ce083b0518c9d7dcf06ebdb8..9507b769db4a91270be7dd90e17d30aeb0203e4a 100644 (file)
--- a/tests/data/test918
+++ b/tests/data/test918
@@ -46,9 +46,9 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
 </errorcode>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient.one@example.com>
-RCPT TO:<invalid>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient.one@example.com%GT
+RCPT TO:%LTinvalid%GT
 QUIT
 </protocol>
 </verify>

diff --git a/tests/data/test919 b/tests/data/test919
index 0d2ff8e1195eae66d6829c31e8f2f258d62d4839..97739093f302dac43b817c924a50f2cce2ac13cc 100644 (file)
--- a/tests/data/test919
+++ b/tests/data/test919
@@ -42,8 +42,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 <protocol crlf="yes">
 EHLO %TESTNUMBER
 AUTH PLAIN AHVzZXIAc2VjcmV0
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test920 b/tests/data/test920
index 87203866621191b09ace72fec23ee0ff5a244b60..8f4c981a26ab04dcbd7d642ad37da6ff4cce2b7c 100644 (file)
--- 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:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test921 b/tests/data/test921
index 664b98d80c9f6963589f4db695158867e68f6d3e..3bed5ed0f0bf1328ab10d8c724059498eaa2d1de 100644 (file)
--- 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:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test922 b/tests/data/test922
index a8b1e20a44e23052169e07deb358f1292d552d84..d3700876295cbb28b35ccca53886de387fe83cf8 100644 (file)
--- a/tests/data/test922
+++ b/tests/data/test922
@@ -42,8 +42,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 <protocol crlf="yes">
 EHLO %TESTNUMBER
 AUTH XOAUTH2 dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test924 b/tests/data/test924
index 986b4e9956ca16d36eb82097ac560d38e1517de5..c1bd9f2286721f4cef9360e5450ad4a009fb6600 100644 (file)
--- a/tests/data/test924
+++ b/tests/data/test924
@@ -11,9 +11,9 @@ VRFY
 <reply>
 <data crlf="yes">
 553-Ambiguous; Possibilities are:
-553-Joe Smith <joe.smith@example.com>
-553-Harry Smith <harry.smith@example.com>
-553 Melvin Smith <melvin.smith@example.com>
+553-Joe Smith %LTjoe.smith@example.com%GT
+553-Harry Smith %LTharry.smith@example.com%GT
+553 Melvin Smith %LTmelvin.smith@example.com%GT
 </data>
 </reply>
 

diff --git a/tests/data/test927 b/tests/data/test927
index 7c81632d9bead84d8dfc03f47b816f5e35507911..173caa2907f24edd45f1cf07bcc53da6f04aaaec 100644 (file)
--- a/tests/data/test927
+++ b/tests/data/test927
@@ -11,9 +11,9 @@ CUSTOMREQUEST
 # Server-side
 <reply>
 <data crlf="yes">
-250-Joe Smith <joe.smith@example.com>
-250-Harry Smith <harry.smith@example.com>
-250 Melvin Smith <melvin.smith@example.com>
+250-Joe Smith %LTjoe.smith@example.com%GT
+250-Harry Smith %LTharry.smith@example.com%GT
+250 Melvin Smith %LTmelvin.smith@example.com%GT
 </data>
 </reply>
 

diff --git a/tests/data/test935 b/tests/data/test935
index 5f0dc9b0d3a00622a2b75c2cf242d60b70d2ef8f..07e7387cff5ad11fc5e3b1add759fbc2a681671e 100644 (file)
--- a/tests/data/test935
+++ b/tests/data/test935
@@ -53,8 +53,8 @@ AUTH CRAM-MD5
 *
 AUTH PLAIN
 AHVzZXIAc2VjcmV0
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test936 b/tests/data/test936
index cd0fe30e3f15c1ca08a2dfc1c51113cc3c39f4a5..3586ed965a3374de930abb7984884710bf913a64 100644 (file)
--- a/tests/data/test936
+++ b/tests/data/test936
@@ -55,8 +55,8 @@ TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 *
 AUTH PLAIN
 AHVzZXIAc2VjcmV0
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test937 b/tests/data/test937
index 8060d8e940561196e9932384d2d65b644a55e6b7..9c8641a17893d193824f7f1c710d6a1c28427b32 100644 (file)
--- a/tests/data/test937
+++ b/tests/data/test937
@@ -55,8 +55,8 @@ AUTH DIGEST-MD5
 *
 AUTH PLAIN
 AHVzZXIAc2VjcmV0
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test938 b/tests/data/test938
index a77a3a08e1ca26dcf1bed95218ef4837f26aa0d9..70d6b207482b6058a88cb291ac04e903d0dcd92b 100644 (file)
--- 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:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 EHLO %TESTNUMBER002
 AUTH PLAIN
 dXNlci50d28AdXNlci50d28Ac2VjcmV0
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test939 b/tests/data/test939
index 68fc9f87c7ec9d18ecc6b8d99769261422b9ddc7..bebc9286c8bc8ea3c9b28b389f65001f40134063 100644 (file)
--- a/tests/data/test939
+++ b/tests/data/test939
@@ -37,8 +37,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 <protocol crlf="yes">
 EHLO %TESTNUMBER
 HELO %TESTNUMBER
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test940 b/tests/data/test940
index fa64163bd945d8d941019dcfa76df88aff94b61d..4395698a197d783edf49b01128d266caa7ab3311 100644 (file)
--- a/tests/data/test940
+++ b/tests/data/test940
@@ -32,8 +32,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 <verify>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test941 b/tests/data/test941
index 36544e43c835ba0fe5d449d1c23ccce98be19436..06a65b86da81a4a82b3a5ff099283b0e7d3edb27 100644 (file)
--- a/tests/data/test941
+++ b/tests/data/test941
@@ -44,8 +44,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 <verify>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test942 b/tests/data/test942
index 664ba4ea7d6824c916fff65c79f1dbbf579fcb6a..7d2b40e6d04ae4f16f07db4dc1b96d52448ff784 100644 (file)
--- a/tests/data/test942
+++ b/tests/data/test942
@@ -43,8 +43,8 @@ mail body
 EHLO %TESTNUMBER
 AUTH EXTERNAL
 dXNlcg==
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test943 b/tests/data/test943
index 2003caf904041ca2d9f431a439013562e49732c0..6244ca5bd1412dd7093a2c0f122afe4c11312343 100644 (file)
--- a/tests/data/test943
+++ b/tests/data/test943
@@ -43,8 +43,8 @@ mail body
 EHLO %TESTNUMBER
 AUTH EXTERNAL
 =
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test944 b/tests/data/test944
index a00a44e635d2ff346f635b2572ee851ed5039aae..5cc76d59e4526359fc5f1d6836ab6649718fe187 100644 (file)
--- a/tests/data/test944
+++ b/tests/data/test944
@@ -42,8 +42,8 @@ mail body
 <protocol crlf="yes">
 EHLO %TESTNUMBER
 AUTH EXTERNAL dXNlcg==
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test945 b/tests/data/test945
index 5f34e31ab73003a974f86c9424a89507a23d80e2..c470072607b200acbdc8d3297fc37cc494025bcb 100644 (file)
--- a/tests/data/test945
+++ b/tests/data/test945
@@ -42,8 +42,8 @@ mail body
 <protocol crlf="yes">
 EHLO %TESTNUMBER
 AUTH EXTERNAL =
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test946 b/tests/data/test946
index f463bfc4eb9a9d6d2d6f1c93394337d930815c3f..dbbbe66b950f217529a0056841330e57f2b617d4 100644 (file)
--- 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:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test947 b/tests/data/test947
index 995e54ed28ca1e578855074452c39474e6a109fe..ade9aaef7b627294475e335e58e3880f3a5a77cc 100644 (file)
--- a/tests/data/test947
+++ b/tests/data/test947
@@ -43,8 +43,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 <protocol crlf="yes">
 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:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test950 b/tests/data/test950
index 6f18037370b923972ca9ab95568a31ebdc80785a..160773bee68f6754920599f66330043d2460776f 100644 (file)
--- a/tests/data/test950
+++ b/tests/data/test950
@@ -11,7 +11,7 @@ VRFY
 # Server-side
 <reply>
 <data crlf="yes">
-250 <recipient@example.com>
+250 %LTrecipient@example.com%GT
 </data>
 </reply>
 

diff --git a/tests/data/test951 b/tests/data/test951
index 616c6cd5235e62d1ec7e0f0e327cdac6cbaac5df..46c981cc60b464b6d8147e494e977af7a26555f6 100644 (file)
--- a/tests/data/test951
+++ b/tests/data/test951
@@ -32,8 +32,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 <verify>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test952 b/tests/data/test952
index f2a90bfbbd9e0868027e73f4ef4076ef34ace3f6..7325e823e58bde799ef01ce5506b44e621a715d7 100644 (file)
--- a/tests/data/test952
+++ b/tests/data/test952
@@ -32,8 +32,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 <verify>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test953 b/tests/data/test953
index 04ebe214666e0a3ec692b68bc9e4d2c7d1909686..2fe9459283c65888771396014801e6f3f3673e63 100644 (file)
--- 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:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test955 b/tests/data/test955
index be0565842f7f886a647715eb53845f2e29957359..eac15f0adca2847eed67ae3bd1ef937f5f874f84 100644 (file)
--- a/tests/data/test955
+++ b/tests/data/test955
@@ -49,7 +49,7 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 </errorcode>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<Avs%hex[%c3%a4]hex%ndaren@example.com>
+MAIL FROM:%LTAvs%hex[%c3%a4]hex%ndaren@example.com%GT
 QUIT
 </protocol>
 </verify>

diff --git a/tests/data/test956 b/tests/data/test956
index aaae3544d0716f630a39fd458644fdc68dca9285..f0e1e4d2074be70abf67312a6c37f410c48d7fb4 100644 (file)
--- 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
 </errorcode>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<sender@example.com>
-RCPT TO:<St%hex[%c3%b6]hex%dmottagaren@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTSt%hex[%c3%b6]hex%dmottagaren@example.com%GT
 QUIT
 </protocol>
 </verify>

diff --git a/tests/data/test959 b/tests/data/test959
index 3ee988c57f8ef74e10cbd374abec1924a84ba297..ae21234d780575883eb9e142797e4a6740be01eb 100644 (file)
--- a/tests/data/test959
+++ b/tests/data/test959
@@ -50,7 +50,7 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 </errorcode>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<sender@%hex[%c3%a5%c3%a4%c3%b6]hex%.se>
+MAIL FROM:%LTsender@%hex[%c3%a5%c3%a4%c3%b6]hex%.se%GT
 QUIT
 </protocol>
 </verify>

diff --git a/tests/data/test960 b/tests/data/test960
index 64d5050a30b2f3efa75c61c1514b77baf9ab6ec9..8420e022951d3875c5bca75f23ed4f438f8fd351 100644 (file)
--- 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%
 </errorcode>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient@%hex[%c3%a5%c3%a4%c3%b6]hex%.se>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@%hex[%c3%a5%c3%a4%c3%b6]hex%.se%GT
 QUIT
 </protocol>
 </verify>

diff --git a/tests/data/test962 b/tests/data/test962
index 59ced3bc77369336bed493a0c7ff61a4a0bbd86e..98be6f0e2244358259090efe16e84dbc45f90acd 100644 (file)
--- a/tests/data/test962
+++ b/tests/data/test962
@@ -44,8 +44,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 <verify>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<sender@xn--4cab6c.se>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@xn--4cab6c.se%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test963 b/tests/data/test963
index 8b411458c6a9735b54c5e4488f9d8aed22a488a9..0b042f0aa9a8fc3809246b625b1ab89ef14d7a70 100644 (file)
--- 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%
 <verify>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient@xn--4cab6c.se>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@xn--4cab6c.se%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test965 b/tests/data/test965
index b4ccc70425fa26423dc4118552647554b79d512b..54f1f51b0ad94bbaa56eeb0b3aad0e3903d86c9f 100644 (file)
--- a/tests/data/test965
+++ b/tests/data/test965
@@ -47,8 +47,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
 <verify>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<Avs%hex[%c3%a4]hex%ndaren@xn--4cab6c.se> SMTPUTF8
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTAvs%hex[%c3%a4]hex%ndaren@xn--4cab6c.se%GT SMTPUTF8
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test966 b/tests/data/test966
index 24ef5597665c77b34e6b5274d1085a7732b45b41..958df6858d875ea1df68d98bd4abef2a33abeff3 100644 (file)
--- a/tests/data/test966
+++ b/tests/data/test966
@@ -47,8 +47,8 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt St%hex[%c3%b6]hex%dmottagaren@%
 <verify>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<sender@example.com> SMTPUTF8
-RCPT TO:<St%hex[%c3%b6]hex%dmottagaren@xn--4cab6c.se>
+MAIL FROM:%LTsender@example.com%GT SMTPUTF8
+RCPT TO:%LTSt%hex[%c3%b6]hex%dmottagaren@xn--4cab6c.se%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test969 b/tests/data/test969
index 00311d5f19b2902a67c8fe813f6fcd7f32e4c220..875ea6d4b53b905b5be0d1d5d79facfadc9d95d0 100644 (file)
--- a/tests/data/test969
+++ b/tests/data/test969
@@ -15,9 +15,9 @@ IDN
 CAPA SMTPUTF8
 </servercmd>
 <data crlf="yes">
-250-Joe Smith <joe.smith@example.com>
-250-Harry Smith <harry.smith@example.com>
-250 Melvin Smith <melvin.smith@example.com>
+250-Joe Smith %LTjoe.smith@example.com%GT
+250-Harry Smith %LTharry.smith@example.com%GT
+250 Melvin Smith %LTmelvin.smith@example.com%GT
 </data>
 </reply>
 

diff --git a/tests/data/test981 b/tests/data/test981
index 94de9dfbea4798b70fc7e5a8b2ffa5d45812132b..f1ac9aa20f16af557cedf4962bbbb832d28e0cc9 100644 (file)
--- a/tests/data/test981
+++ b/tests/data/test981
@@ -33,10 +33,10 @@ imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -u user:secret
 </command>
 <file name="%LOGDIR/upload%TESTNUMBER">
 Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST)
-From: Fred Foobar <foobar@example.COM>
+From: Fred Foobar %LTfoobar@example.COM%GT
 Subject: afternoon meeting
 To: joe@example.com
-Message-Id: <B27397-0100000@example.COM>
+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 e79efdf84b9791e45d635c02801b37c569ad5467..4e802a1d2eaba81c5ee67c90cb065df7d64ca9dc 100644 (file)
--- a/tests/data/test984
+++ b/tests/data/test984
@@ -31,10 +31,10 @@ imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -u user:secret
 </command>
 <file name="%LOGDIR/upload%TESTNUMBER">
 Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST)
-From: Fred Foobar <foobar@example.COM>
+From: Fred Foobar %LTfoobar@example.COM%GT
 Subject: afternoon meeting
 To: joe@example.com
-Message-Id: <B27397-0100000@example.COM>
+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 312c406a70f3d83e89a653db019687a705200ce2..7c158128fb9f2a2fe000374c1f7414a937fbff6c 100644 (file)
--- a/tests/data/test987
+++ b/tests/data/test987
@@ -36,8 +36,8 @@ body
 <verify>
 <protocol crlf="yes">
 EHLO %TESTNUMBER
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/data/test992 b/tests/data/test992
index 772ad91e79b2e3c91e04122b8623d9206df9ce7c..bf8b0fb1c432518eba3314af01b3342b9930b2c0 100644 (file)
--- 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:<sender@example.com>
-RCPT TO:<recipient@example.com>
+MAIL FROM:%LTsender@example.com%GT
+RCPT TO:%LTrecipient@example.com%GT
 DATA
 QUIT
 </protocol>

diff --git a/tests/testutil.pm b/tests/testutil.pm
index 6317a5e9313875f2b10951572e1ec98aa9d99168..7e2b279f07a0d2a149b1b63fd21dd402d49ca958 100644 (file)
--- 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;
+    $$thing =~ s/%GT/>/g;
 
     # include a file
     $$thing =~ s/%include ([^%]*)%[\n\r]+/includefile($1, 0)/ge;