5 files changed, 160 insertions, 2 deletions
diff --git a/test/scripts/0000-Basic/0300 b/test/scripts/0000-Basic/0300
index 053aec804..de3be1095 100644
--- a/test/scripts/0000-Basic/0300
+++ b/test/scripts/0000-Basic/0300
@@ -23,8 +23,9 @@ rset\r\nmail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata
 ??? 250
 ??? 354
 the message
-.\r\nmail from:<userx@test.ex>
+.
 +++ 1
+mail from:<userx@test.ex>
 rcpt to:<userx@test.ex>\r\ndata\r\nthe message\r\nsecond line
 ??? 250
 ??? 250
diff --git a/test/scripts/0000-Basic/0301 b/test/scripts/0000-Basic/0301
index 4add8f42c..f84244f05 100644
--- a/test/scripts/0000-Basic/0301
+++ b/test/scripts/0000-Basic/0301
@@ -26,8 +26,9 @@ mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata
 ??? 250
 ??? 354
 the message
-.\r\nmail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata\r\nthe message
+.
 ??? 250
+mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata\r\nthe message
 ??? 250
 ??? 250
 ??? 354
diff --git a/test/scripts/0000-Basic/0559 b/test/scripts/0000-Basic/0559
new file mode 100644
index 000000000..01d7d99af
--- /dev/null
+++ b/test/scripts/0000-Basic/0559
@@ -0,0 +1,44 @@
+# SMTP still alive check before final response
+need_ipv4
+#
+exim -DSERVER=server -bd -oX PORT_D
+****
+client -t5 127.0.0.1 PORT_D
+??? 220
+ehlo abcd
+??? 250-
+??? 250-
+??? 250-
+??? 250
+mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata
+??? 250
+??? 250
+??? 354
+This is a test message.
+.
++++ 1
+****
+sleep 1
+killdaemon
+#
+# Also check for next input sent too soon
+#
+exim -DSERVER=server -bd -oX PORT_D
+****
+client -t5 127.0.0.1 PORT_D
+??? 220
+ehlo abcd
+??? 250-
+??? 250-
+??? 250-
+??? 250
+mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata
+??? 250
+??? 250
+??? 354
+This is a test message.
+.\r\nrset
+??? 550
+****
+sleep 1
+killdaemon
diff --git a/test/scripts/2000-GnuTLS/2029 b/test/scripts/2000-GnuTLS/2029
new file mode 100644
index 000000000..e371e68d7
--- /dev/null
+++ b/test/scripts/2000-GnuTLS/2029
@@ -0,0 +1,57 @@
+# TLS server: SMTP still alive check before final response
+gnutls
+#
+exim -DSERVER=server -bd -oX PORT_D
+****
+# The pause (+++ 1) at the end of this is so that we don't close the input
+# until some time after sending the dot.
+#
+client-gnutls 127.0.0.1 PORT_D
+??? 220
+ehlo abcd
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250
+starttls
+??? 220
+mail from:<userx@test.ex>
+??? 250
+rcpt to:<userx@test.ex>
+??? 250
+data
+??? 354
+This is a test message.
+.
++++ 1
+****
+sleep 1
+killdaemon
+#
+# Also check for next input sent too soon
+#
+exim -DSERVER=server -bd -oX PORT_D
+****
+client-gnutls 127.0.0.1 PORT_D
+??? 220
+ehlo abcd
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250
+starttls
+??? 220
+mail from:<userx@test.ex>
+??? 250
+rcpt to:<userx@test.ex>
+??? 250
+data
+??? 354
+This is a test message.
+.\r\nrset
++++ 1
+****
+sleep 1
+killdaemon
diff --git a/test/scripts/2100-OpenSSL/2150 b/test/scripts/2100-OpenSSL/2150
new file mode 100644
index 000000000..cfc6a20d7
--- /dev/null
+++ b/test/scripts/2100-OpenSSL/2150
@@ -0,0 +1,55 @@
+# TLS server: SMTP still alive check before final response
+exim -DSERVER=server -bd -oX PORT_D
+****
+# The pause (+++ 1) at the end of this is so that we don't close the input
+# until some time after sending the dot.
+#
+client-gnutls 127.0.0.1 PORT_D
+??? 220
+ehlo abcd
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250
+starttls
+??? 220
+mail from:<userx@test.ex>
+??? 250
+rcpt to:<userx@test.ex>
+??? 250
+data
+??? 354
+This is a test message.
+.
++++ 1
+****
+sleep 1
+killdaemon
+#
+# Also check for next input sent too soon
+#
+exim -DSERVER=server -bd -oX PORT_D
+****
+client-gnutls 127.0.0.1 PORT_D
+??? 220
+ehlo abcd
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250
+starttls
+??? 220
+mail from:<userx@test.ex>
+??? 250
+rcpt to:<userx@test.ex>
+??? 250
+data
+??? 354
+This is a test message.
+.\r\nrset
++++ 1
+****
+sleep 1
+killdaemon