Fix spurious detection of timeout while writing to transport filter

[users/jgh/exim.git] / test / stdout / 2128

diff --git a/test/stdout/2128 b/test/stdout/2128
index 0d1018144e161dbf82bdd75e83cacf0dd800761d..1ccd96b883ba56d8c044e29da3f5ad31723fbbd4 100644 (file)
--- a/test/stdout/2128
+++ b/test/stdout/2128
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-

+<<< 250-8BITMIME
+??? 250-

 <<< 250-PIPELINING
 ??? 250-
 <<< 250-STARTTLS
 <<< 250-PIPELINING
 ??? 250-
 <<< 250-STARTTLS


@@ -16,21 +18,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv2/v3 write client hello A
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA

 Succeeded in starting TLS
 >>> quit
 ??? 221
 Succeeded in starting TLS
 >>> quit
 ??? 221


@@ -38,21 +25,6 @@ Succeeded in starting TLS
 End of script
 Connecting to 127.0.0.1 port 1226 ... connected
 Attempting to start TLS
 End of script
 Connecting to 127.0.0.1 port 1226 ... connected
 Attempting to start TLS

-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv2/v3 write client hello A
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA

 Succeeded in starting TLS
 ??? 220
 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 Succeeded in starting TLS
 ??? 220
 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000


@@ -62,6 +34,8 @@ Succeeded in starting TLS
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-

+<<< 250-8BITMIME
+??? 250-

 <<< 250-PIPELINING
 ??? 250
 <<< 250 HELP
 <<< 250-PIPELINING
 ??? 250
 <<< 250 HELP