Merge branch 'master' into 4.next

7 files changed, 47 insertions, 8 deletions

diff --git a/test/stdout/0002 b/test/stdout/0002
index 5593f06cc..1422289a7 100644
--- a/test/stdout/0002
+++ b/test/stdout/0002
@@ -123,6 +123,7 @@
 > addresses: local-part@dom.ain+xyz@abc
 > addresses: local-part@dom.ain:xyz@abc:p@q:r@s
 > addresses: 
+> Failed: output separator missing in expanding ${addresses:>}
 > 
 > escape:     B7\267F2\362
 > excape8bit: undisturbed text	tab
diff --git a/test/stdout/0572 b/test/stdout/0572
index 8b7a17a78..96ab5611b 100644
--- a/test/stdout/0572
+++ b/test/stdout/0572
@@ -53,7 +53,6 @@ hosts_avoid_esmtp =
 hosts_avoid_pipelining = 
 hosts_max_try = 5
 hosts_max_try_hardlimit = 50
-hosts_noproxy_tls = *
 no_hosts_override
 no_hosts_randomize
 hosts_require_auth = 
diff --git a/test/stdout/0901 b/test/stdout/0901
index a982ac8b6..c4020ae5f 100644
--- a/test/stdout/0901
+++ b/test/stdout/0901
@@ -330,11 +330,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> RCPT TO:CALLER@test.ex
 ??? 250
 <<< 250 Accepted
->>> BDAT 1\r\nTBDAT 87 last
->>> o: Susan@random.com
->>> From: Sam@random.com
->>> Subject: This is a bodyless test message
->>> 
+>>> BDAT 1\r\nTBDAT 87 last\r\no: Susan@random.com\r\nFrom: Sam@random.com\r\nSubject: This is a bodyless test message\r\n\r\n
 ??? 554 SMTP synchronization error
 <<< 554 SMTP synchronization error
 End of script
diff --git a/test/stdout/2102 b/test/stdout/2102
index 0d96d1279..2df808595 100644
--- a/test/stdout/2102
+++ b/test/stdout/2102
@@ -93,11 +93,15 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 ??? 250
 <<< 250 HELP
 >>> starttls
-??? 220
+??? 220 TLS go ahead
 <<< 220 TLS go ahead
 Attempting to start TLS
 pppp:error:dddddddd:SSL routines:ssl3_read_bytes:sslv3 alert handshake failure:[...]:SSL alert number 40
 Failed to start TLS
++++ 1
+>>> help
+??? 554
+<<< 554 Security failure
 End of script
 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 Certificate file = TESTSUITE/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem
diff --git a/test/stdout/2132 b/test/stdout/2132
index 322237463..64915c1fb 100644
--- a/test/stdout/2132
+++ b/test/stdout/2132
@@ -98,6 +98,10 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 Attempting to start TLS
 pppp:error:dddddddd:SSL routines:ssl3_read_bytes:sslv3 alert handshake failure:[...]:SSL alert number 40
 Failed to start TLS
++++ 1
+>>> help
+??? 554
+<<< 554 Security failure
 End of script
 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 Certificate file = TESTSUITE/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem
diff --git a/test/stdout/3000 b/test/stdout/3000
index ca7b094e6..50be468c2 100644
--- a/test/stdout/3000
+++ b/test/stdout/3000
@@ -17,7 +17,7 @@
 > 42
 > 30
 > 3
-> X/X
+> X
 > 
 > Tue, 2 Mar 1999 09:44:33 +0000 // Changed locale // Tue, 2 Mar 1999 09:44:33 +0000
 > 
diff --git a/test/stdout/4012 b/test/stdout/4012
new file mode 100644
index 000000000..fa6770563
--- /dev/null
+++ b/test/stdout/4012
@@ -0,0 +1,35 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250-myhost.test.ex Hello CALLER at test.ex

+250-SIZE 52428800

+250-8BITMIME

+250-PIPELINING

+250 HELP

+250 OK

+250 Accepted

+354 Enter message, ending with "." on a line by itself

+250 OK id=10HmaY-0005vi-00

+221 myhost.test.ex closing connection

+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250-myhost.test.ex Hello CALLER at test.ex

+250-SIZE 52428800

+250-8BITMIME

+250-PIPELINING

+250 HELP

+250 OK

+250 Accepted

+354 Enter message, ending with "." on a line by itself

+550 Administrative prohibition

+221 myhost.test.ex closing connection

+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [IP_LOOPBACK_ADDR]
+TESTSUITE/spool/scan/10HmaY-0005vi-00/10HmaY-0005vi-00.eml
+>LF>RESULT: OK
+End of script
+Listening on port 1224 ... 
+Connection request from [IP_LOOPBACK_ADDR]
+TESTSUITE/spool/scan/10HmaX-0005vi-00/10HmaX-0005vi-00.eml
+>LF>RESULT: BAD
+>LF>NAME: wibble
+End of script