Merge branch 'master' into 4.next

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

diff --git a/test/scripts/0000-Basic/0432 b/test/scripts/0000-Basic/0432
index 4d9935317ca96aff2cc32dd6ddadd1ac4dba6afc..c4a2330b1ca1d94ebeb7a8a5e37d959f4154ede5 100644 (file)
--- a/test/scripts/0000-Basic/0432
+++ b/test/scripts/0000-Basic/0432
@@ -2,12 +2,13 @@
 need_ipv4
 #
 exim -bh 1.2.3.4
 need_ipv4
 #
 exim -bh 1.2.3.4

+helo test

 mail from:<x@y>
 quit
 ****
 server PORT_S
 220 server ready
 mail from:<x@y>
 quit
 ****
 server PORT_S
 220 server ready

-HELO
+EHLO

 250 OK
 MAIL
 250 OK
 250 OK
 MAIL
 250 OK


@@ -17,20 +18,23 @@ QUIT
 220 OK
 ****
 exim -d -bhc 1.2.3.4
 220 OK
 ****
 exim -d -bhc 1.2.3.4

+helo test

 mail from:<x@y>
 quit
 ****
 exim -d -bhc 1.2.3.4
 mail from:<x@y>
 quit
 ****
 exim -d -bhc 1.2.3.4

+helo test

 mail from:<x@y>
 quit
 ****
 exim -bhc 1.2.3.4
 mail from:<x@y>
 quit
 ****
 exim -bhc 1.2.3.4

+helo test

 mail from:<x@y>
 quit
 ****
 server PORT_S
 220 server ready
 mail from:<x@y>
 quit
 ****
 server PORT_S
 220 server ready

-HELO
+EHLO

 250 OK
 MAIL
 250 OK
 250 OK
 MAIL
 250 OK


@@ -40,17 +44,19 @@ QUIT
 220 OK
 ****
 exim -bhc 1.2.3.4
 220 OK
 ****
 exim -bhc 1.2.3.4

+helo test

 mail from:<a@b>
 quit
 ****
 # Timeout stuff
 server PORT_S
 220 server ready
 mail from:<a@b>
 quit
 ****
 # Timeout stuff
 server PORT_S
 220 server ready

-HELO
+EHLO

 *sleep 2
 *eof
 ****
 exim -bhc 1.2.3.4
 *sleep 2
 *eof
 ****
 exim -bhc 1.2.3.4

+helo test

 mail from:<p1@q>
 quit
 ****
 mail from:<p1@q>
 quit
 ****