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 a9ec2a676c #19491

Closes #19470
This commit is contained in:
Viktor Szakats 2025-11-11 20:21:44 +01:00
parent 97169a91d9
commit de49cc89ab
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
80 changed files with 195 additions and 193 deletions

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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

View file

@ -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

View file

@ -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>

View file

@ -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

View file

@ -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

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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

View file

@ -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

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -11,7 +11,7 @@ VRFY
# Server-side
<reply>
<data crlf="yes">
250 <recipient@example.com>
250 %LTrecipient@example.com%GT
</data>
</reply>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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

View file

@ -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

View file

@ -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>

View file

@ -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>

View file

@ -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;