Merge branch 'master' into 4.next

[exim.git] / test / scripts / 2000-GnuTLS / 2015

diff --git a/test/scripts/2000-GnuTLS/2015 b/test/scripts/2000-GnuTLS/2015
index a03bf9b51bdac0e1ec3d5bf9fb84169bf27dc466..b963e4e067acf2bfe25f2a720927d72c8524859c 100644 (file)
--- a/test/scripts/2000-GnuTLS/2015
+++ b/test/scripts/2000-GnuTLS/2015
@@ -1,4 +1,4 @@
-# TLS server: timeout after accepting STARTTLS
+# TLS server: timeout or close after accepting STARTTLS

 gnutls
 exim -DSERVER=server -bd -oX PORT_D
 ****
 gnutls
 exim -DSERVER=server -bd -oX PORT_D
 ****


@@ -9,10 +9,23 @@ ehlo rhu.barb
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

+??? 250-

 ??? 250
 starttls_wait
 ??? 220
 +++ 2
 ??? 421
 ****
 ??? 250
 starttls_wait
 ??? 220
 +++ 2
 ??? 421
 ****

+client-gnutls 127.0.0.1 PORT_D
+??? 220
+ehlo rhu.barb
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250
+starttls_wait
+??? 220
+****

 killdaemon
 killdaemon