Merge branch 'master' into 4.next

[exim.git] / test / scripts / 0000-Basic / 0373

diff --git a/test/scripts/0000-Basic/0373 b/test/scripts/0000-Basic/0373
index 37c98e0ab3e93b47d4643cb761803ec962d698f3..cb3e00608c0fcddbd45c3ecaf565a9506ba0f5e6 100644 (file)
--- a/test/scripts/0000-Basic/0373
+++ b/test/scripts/0000-Basic/0373
@@ -60,7 +60,7 @@ quit
 #
 # Tests of IPv4 sockets
 #
 #
 # Tests of IPv4 sockets
 #

-server PORT_S 17
+server PORT_S 18

 QUERY-1
 >LF>ANSWER-1
 >*eof
 QUERY-1
 >LF>ANSWER-1
 >*eof


@@ -87,7 +87,10 @@ QUERY-9
 QUERY-10
 >LF>ANSWER-10
 >*eof
 QUERY-10
 >LF>ANSWER-10
 >*eof

->LF>ANSWER-11
+>LF>ANSWER-11a
+>*eof
+QUERY-11
+>LF>ANSWER-11b

 >*eof
 QUERY-12
 >>ANSWER-12\x0d\x0aANSWER-12\x0d\x0a
 >*eof
 QUERY-12
 >>ANSWER-12\x0d\x0aANSWER-12\x0d\x0a


@@ -121,7 +124,8 @@ ipv4 cases
 8 read timed out >>${readsocket{inet:127.0.0.1:PORT_S}{QUERY-8\n}{1s}}<<
 9  sock error    >>${readsocket{inet:127.0.0.1:PORT_S}{QUERY-9\n}{1s}{}{sock error}}<<
 10 ANSWER-10\\n     >>${readsocket{inet:badloop:PORT_S}{QUERY-10\n}}<<
 8 read timed out >>${readsocket{inet:127.0.0.1:PORT_S}{QUERY-8\n}{1s}}<<
 9  sock error    >>${readsocket{inet:127.0.0.1:PORT_S}{QUERY-9\n}{1s}{}{sock error}}<<
 10 ANSWER-10\\n     >>${readsocket{inet:badloop:PORT_S}{QUERY-10\n}}<<

-11 ANSWER-11     >>${readsocket{inet:thisloop:PORT_S}{QUERY-11\n}{2s:shutdown=no}}<<
+11 ANSWER-11a    >>${readsocket{inet:thisloop:PORT_S}{QUERY-11\n}{2s:shutdown=no}}<<
+11 ANSWER-11b    >>${readsocket{inet:thisloop:PORT_S}{QUERY-11\n}{2s:shutdown=no}}<<

 
 eol-replacement arg
 12 ANSWER-12x2  (no arg)     >>${escape:${readsocket{inet:127.0.0.1:PORT_S}{QUERY-12\n}{2s}}}<<
 
 eol-replacement arg
 12 ANSWER-12x2  (no arg)     >>${escape:${readsocket{inet:127.0.0.1:PORT_S}{QUERY-12\n}{2s}}}<<