DMARC: Avoid using Resent-From: header. Bug 3029

[exim.git] / test / stdout / 0002

diff --git a/test/stdout/0002 b/test/stdout/0002
index d7e76e6c4be47ccd90fba5387e737af8ed269d96..0524afd7b87e0c7bc8b6eab21b99bc19569460ad 100644 (file)
--- a/test/stdout/0002
+++ b/test/stdout/0002
@@ -197,6 +197,38 @@ newline    tab\134backslash ~tilde\177DEL\200\201.
 > hex2b64:MPPJPkZDbetYunCBao7BJA==
 > hex2b64:ztcfpyNSMb7Tg/rP3EHE3cwi7PE=
 > 
+> headerwrap:
+> headerwrap:a
+> headerwrap:ab
+> headerwrap:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaz
+> headerwrap_79:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+       z
+> headerwrap:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+       b
+> headerwrap:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaz
+       Aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaab
+> headerwrap:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaz
+       Aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaab
+> headerwrap:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaz
+       Aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+       bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbz
+> headerwrap:12345678901234567890123456789012345678901234567890123456789012345678901234567890
+       1234567890123456789(100).67890123456789012345678901234567890123456789012
+       34567890123456789012345678901234567890123456789(200).6789012345678901234
+       567890123456789012345678901234567890123456789012345678901234567890123456
+       789(300).678901234567890123456789012345678901234567890123456789012345678
+       901234567890123456789(400).678901234567890123456789012345678901234567890
+       1234567890123456789012345678901234567890123456789(500).67890123456789012
+       3456789012345678901234567890123456789012345678901234567890123456789(600)
+       .67890123456789012345678901234567890123456789012345678901234567890123456
+       78901234567890123456789(700).6789012345678901234567890123456789012345678
+       901234567890123456789012345678901234567890123456789(800).678901234567890
+       123456789012345678901234567890123456789012345678901234567890123456789012
+       3456789(900).67890123456789012345678901234567890123456789012345678901234
+       5678901234567890123456789012
+> headerwrap_81_100:123456789012345678901234567890123456789012345678901234567890123456789012345678901
+       23456789012345678
+> 
 > base32: 0  <>
 > base32: 1  <b>
 > base32: 31 <7>
@@ -420,6 +452,7 @@ newline     tab\134backslash ~tilde\177DEL\200\201.
 > gei:    y
 > 
 > isip:   y  1.2.3.4
+> isip:   n  1.2.3
 > isip4:  y  1.2.3.4
 > isip6:  n  1.2.3.4
 > isip:   n  ::1.2.3.256
@@ -433,10 +466,14 @@ newline   tab\134backslash ~tilde\177DEL\200\201.
 > isip:   y  fe80::a00:20ff:fe86:a061
 > isip4:  n  fe80::a00:20ff:fe86:a061
 > isip6:  y  fe80::a00:20ff:fe86:a061
+> isip6:  n   fe80:a00:20ff:fe86:a061
 > isip:   y  fe80::1.2.3.4
 > isip:   n  rhubarb
 > isip4:  n  rhubarb
 > isip6:  n  rhubarb
+> isip6:  n  ::/100
+> isip6:  n  ::/foo
+> isip6:  n  ::/f o
 > 
 > match:  cdab
 > match:  cdab
@@ -664,6 +701,7 @@ newline     tab\134backslash ~tilde\177DEL\200\201.
 > abcdea a   z   zbcdez
 > abcdea a       abcdea
 > abcdea abc z   zzzdez
+> (null)         ''
 > 
 > # Boolean
 > "TrUe"                true      EXPECT: true
@@ -913,6 +951,13 @@ xyz
 > <>
 > expect: <>
 > 
+> # string value with embedded comma
+> <Doe, John>
+> expect <Doe, John>
+> # string value with embedded doublequote
+> <word1 \" word2>
+> expect <word1 \" word2>
+> 
 > yes
 > yes
 > 
@@ -925,12 +970,14 @@ xyz
 > Failed: "if" failed and "fail" requested
 > yes
 > match_address:   no
+> protected:  
 > 
 > primary_hostname: myhost.test.ex
 > match:  cdab
 > Failed: "if" failed and "fail" requested
 > yes
 > match_address:   no
+> protected:  
 > 
 > -be Sender host name and address etc, all unset
 > -oMa  sender_host_address = 
@@ -1047,6 +1094,7 @@ xyz
 221 myhost.test.ex closing connection\r
 > match_ip:        15 
 > match_ip:        16 
+> match_ip:        17 
 > 
 > in list
 > in list