From: Jeremy Harris Date: Thu, 7 Jul 2016 20:51:13 +0000 (+0100) Subject: Testsuite: cutthrough vs. callout cache X-Git-Tag: exim-4_88_RC1~74 X-Git-Url: https://git.exim.org/users/jgh/exim.git/commitdiff_plain/6e69d78e612ade9d9bb052abeb4b113984995710 Testsuite: cutthrough vs. callout cache --- diff --git a/test/confs/5402 b/test/confs/5402 index e480b64b5..2c1038015 100644 --- a/test/confs/5402 +++ b/test/confs/5402 @@ -1,4 +1,4 @@ -# Exim test configuration 5400 +# Exim test configuration 5402 exim_path = EXIM_PATH keep_environment = @@ -10,44 +10,33 @@ gecos_pattern = "" gecos_name = CALLER_NAME tls_advertise_hosts = -log_selector = +received_recipients - # ----- Main settings ----- domainlist local_domains = test.ex : *.test.ex -acl_smtp_rcpt = ar - +acl_smtp_rcpt = acl_rcpt -# ----- ACLs ----- +# ----- ACLs ------- begin acl -ar: - warn control = cutthrough_delivery - logwrite = rcpt for $local_part@$domain - warn condition = ${if eq {verify}{$local_part}} - verify = recipient/callout=use_sender - accept +acl_rcpt: +.ifdef OPT + warn control = cutthrough_delivery +.endif + accept verify = recipient/callout=use_sender + # ----- Routers ----- begin routers -dns: - driver = dnslookup - domains = localhost.test.ex : localhost4.test.ex : thishost.test.ex - self = send - transport = smtp - all: driver = manualroute domains = ! +local_domains - route_list = special.com HOSTIPV4 ; * 127.0.0.1 + route_list = * 127.0.0.1 self = send - transport = ${if eq {special_tpt}{$local_part} {smtp2}{smtp}} - headers_remove = X-hdr-rtr - headers_add = X-hdr-rtr-new: $h_X-hdr-rtr:+++ + transport = smtp no_more @@ -59,12 +48,6 @@ smtp: driver = smtp interface = HOSTIPV4 port = PORT_S - headers_add = ${if def:h_X-hdr-rtr {X-hdr-tpt-new: new} {}} - -smtp2: - driver = smtp - interface = HOSTIPV4 - port = PORT_S # End diff --git a/test/confs/5403 b/test/confs/5403 deleted file mode 120000 index 8f6811b7e..000000000 --- a/test/confs/5403 +++ /dev/null @@ -1 +0,0 @@ -5400 \ No newline at end of file diff --git a/test/confs/5403 b/test/confs/5403 new file mode 100644 index 000000000..70ec647d0 --- /dev/null +++ b/test/confs/5403 @@ -0,0 +1,70 @@ +# Exim test configuration 5403 + +exim_path = EXIM_PATH +keep_environment = +host_lookup_order = bydns +primary_hostname = myhost.test.ex +spool_directory = DIR/spool +log_file_path = DIR/spool/log/%slog +gecos_pattern = "" +gecos_name = CALLER_NAME +tls_advertise_hosts = + +log_selector = +received_recipients + +# ----- Main settings ----- + +domainlist local_domains = test.ex : *.test.ex + +acl_smtp_rcpt = ar + + +# ----- ACLs ----- + +begin acl + +ar: + warn control = cutthrough_delivery + logwrite = rcpt for $local_part@$domain + warn condition = ${if eq {verify}{$local_part}} + verify = recipient/callout=use_sender + accept + +# ----- Routers ----- + +begin routers + +dns: + driver = dnslookup + domains = localhost.test.ex : localhost4.test.ex : thishost.test.ex + self = send + transport = smtp + +all: + driver = manualroute + domains = ! +local_domains + route_list = special.com HOSTIPV4 ; * 127.0.0.1 + self = send + transport = ${if eq {special_tpt}{$local_part} {smtp2}{smtp}} + headers_remove = X-hdr-rtr + headers_add = X-hdr-rtr-new: $h_X-hdr-rtr:+++ + no_more + + +# ----- Transports ----- + +begin transports + +smtp: + driver = smtp + interface = HOSTIPV4 + port = PORT_S + headers_add = ${if def:h_X-hdr-rtr {X-hdr-tpt-new: new} {}} + +smtp2: + driver = smtp + interface = HOSTIPV4 + port = PORT_S + + +# End diff --git a/test/confs/5404 b/test/confs/5404 new file mode 120000 index 000000000..8f6811b7e --- /dev/null +++ b/test/confs/5404 @@ -0,0 +1 @@ +5400 \ No newline at end of file diff --git a/test/log/5402 b/test/log/5402 new file mode 100644 index 000000000..add3b3e03 --- /dev/null +++ b/test/log/5402 @@ -0,0 +1,3 @@ +1999-03-02 09:44:33 10HmaX-0005vi-00 >> dest@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK" +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed diff --git a/test/log/5403 b/test/log/5403 deleted file mode 100644 index 9505825f4..000000000 --- a/test/log/5403 +++ /dev/null @@ -1,4 +0,0 @@ -1999-03-02 09:44:33 rcpt for userx@domain.com -1999-03-02 09:44:33 10HmaX-0005vi-00 >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK" -1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss for userx@domain.com -1999-03-02 09:44:33 10HmaX-0005vi-00 Completed diff --git a/test/log/5404 b/test/log/5404 new file mode 100644 index 000000000..9505825f4 --- /dev/null +++ b/test/log/5404 @@ -0,0 +1,4 @@ +1999-03-02 09:44:33 rcpt for userx@domain.com +1999-03-02 09:44:33 10HmaX-0005vi-00 >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK" +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss for userx@domain.com +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed diff --git a/test/scripts/5400-cutthrough/5402 b/test/scripts/5400-cutthrough/5402 index 3e6f3189e..1113c6d32 100644 --- a/test/scripts/5400-cutthrough/5402 +++ b/test/scripts/5400-cutthrough/5402 @@ -1,42 +1,49 @@ -# cutthrough_delivery and -bhc +# cutthrough_delivery vs. recipient-verify cache entry need_ipv4 -munge loopback -no_msglog_check # -# Despite config for cutthrough should not make onward conn -server -t -2 PORT_S +# Set up callout cache +# +server PORT_S +220 ESMTP +EHLO +250 OK +MAIL FROM: +250 Sender OK +RCPT TO: +250 Recipient OK +QUIT +250 OK **** -exim -bhc 1.2.3.4 +exim -bs -odf EHLO myhost.test.ex MAIL FROM: -RCPT TO: -DATA - -. +RCPT TO: QUIT **** # -# Onward conn made for r-verify but cleared before DATA +# Send message with cutthrough +# server PORT_S -220 server ready +220 ESMTP EHLO 250 OK -MAIL -250 OK -RCPT +MAIL FROM: +250 Sender OK +RCPT TO: +250 Recipient OK +DATA +354 Send data +. 250 OK QUIT -220 OK -*eof +250 OK **** -exim -bhc 1.2.3.4 +exim -DOPT=CUTTHROUGH -bs -odf EHLO myhost.test.ex MAIL FROM: -RCPT TO: +RCPT TO: DATA . QUIT **** -# -# End diff --git a/test/scripts/5400-cutthrough/5403 b/test/scripts/5400-cutthrough/5403 index dbe7ef3c5..3e6f3189e 100644 --- a/test/scripts/5400-cutthrough/5403 +++ b/test/scripts/5400-cutthrough/5403 @@ -1,30 +1,42 @@ -# cutthrough_delivery with MAIL SIZE= +# cutthrough_delivery and -bhc need_ipv4 munge loopback +no_msglog_check # -server PORT_S -220 ESMTP -EHLO -250-OK -250 SIZE 65536 -MAIL FROM: SIZE=1123 -250 Sender OK -RCPT TO: -250 Recipient OK +# Despite config for cutthrough should not make onward conn +server -t -2 PORT_S +**** +exim -bhc 1.2.3.4 +EHLO myhost.test.ex +MAIL FROM: +RCPT TO: DATA -354 Send data + . -250 OK QUIT +**** +# +# Onward conn made for r-verify but cleared before DATA +server PORT_S +220 server ready +EHLO +250 OK +MAIL 250 OK +RCPT +250 OK +QUIT +220 OK +*eof **** -exim -bs +exim -bhc 1.2.3.4 EHLO myhost.test.ex -MAIL FROM: SIZE=99 -RCPT TO: +MAIL FROM: +RCPT TO: DATA . QUIT **** +# # End diff --git a/test/scripts/5400-cutthrough/5404 b/test/scripts/5400-cutthrough/5404 new file mode 100644 index 000000000..dbe7ef3c5 --- /dev/null +++ b/test/scripts/5400-cutthrough/5404 @@ -0,0 +1,30 @@ +# cutthrough_delivery with MAIL SIZE= +need_ipv4 +munge loopback +# +server PORT_S +220 ESMTP +EHLO +250-OK +250 SIZE 65536 +MAIL FROM: SIZE=1123 +250 Sender OK +RCPT TO: +250 Recipient OK +DATA +354 Send data +. +250 OK +QUIT +250 OK +**** +exim -bs +EHLO myhost.test.ex +MAIL FROM: SIZE=99 +RCPT TO: +DATA + +. +QUIT +**** +# End diff --git a/test/stderr/5402 b/test/stderr/5402 deleted file mode 100644 index 49d3574fe..000000000 --- a/test/stderr/5402 +++ /dev/null @@ -1,91 +0,0 @@ ->>> host in hosts_connection_nolog? no (option unset) ->>> host in host_lookup? no (option unset) ->>> host in host_reject_connection? no (option unset) ->>> host in sender_unqualified_hosts? no (option unset) ->>> host in recipient_unqualified_hosts? no (option unset) ->>> host in helo_verify_hosts? no (option unset) ->>> host in helo_try_verify_hosts? no (option unset) ->>> host in helo_accept_junk_hosts? no (option unset) ->>> myhost.test.ex in helo_lookup_domains? yes (matched "@") ->>> looking up host name for 1.2.3.4 -LOG: no host name found for IP address 1.2.3.4 ->>> host in dsn_advertise_hosts? no (option unset) ->>> host in pipelining_advertise_hosts? yes (matched "*") ->>> using ACL "ar" ->>> processing "warn" ->>> check control = cutthrough_delivery ->>> check logwrite = rcpt for $local_part@$domain ->>> = rcpt for plain@domain.com -LOG: rcpt for plain@domain.com ->>> warn: condition test succeeded in ACL "ar" ->>> processing "warn" ->>> check condition = ${if eq {verify}{$local_part}} ->>> = ->>> warn: condition test failed in ACL "ar" ->>> processing "accept" ->>> accept: condition test succeeded in ACL "ar" ->>> end of ACL "ar": ACCEPT -LOG: 10HmaX-0005vi-00 <= CALLER@myhost.test.ex H=(myhost.test.ex) [1.2.3.4] P=esmtp S=sss for plain@domain.com ->>> host in hosts_connection_nolog? no (option unset) ->>> host in host_lookup? no (option unset) ->>> host in host_reject_connection? no (option unset) ->>> host in sender_unqualified_hosts? no (option unset) ->>> host in recipient_unqualified_hosts? no (option unset) ->>> host in helo_verify_hosts? no (option unset) ->>> host in helo_try_verify_hosts? no (option unset) ->>> host in helo_accept_junk_hosts? no (option unset) ->>> myhost.test.ex in helo_lookup_domains? yes (matched "@") ->>> looking up host name for 1.2.3.4 -LOG: no host name found for IP address 1.2.3.4 ->>> host in dsn_advertise_hosts? no (option unset) ->>> host in pipelining_advertise_hosts? yes (matched "*") ->>> using ACL "ar" ->>> processing "warn" ->>> check control = cutthrough_delivery ->>> check logwrite = rcpt for $local_part@$domain ->>> = rcpt for verify@domain.com -LOG: rcpt for verify@domain.com ->>> warn: condition test succeeded in ACL "ar" ->>> processing "warn" ->>> check condition = ${if eq {verify}{$local_part}} ->>> = true ->>> check verify = recipient/callout=use_sender ->>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> ->>> routing verify@domain.com ->>> domain.com in "localhost.test.ex : localhost4.test.ex : thishost.test.ex"? no (end of list) ->>> domain.com in "test.ex : *.test.ex"? no (end of list) ->>> domain.com in "! +local_domains"? yes (end of list) ->>> calling all router ->>> domain.com in "special.com"? no (end of list) ->>> domain.com in "*"? yes (matched "*") ->>> local host found for non-MX address ->>> fully qualified name = 127.0.0.1 -MUNGED: ::1 will be omitted in what follows ->>> get[host|ipnode]byname[2] looked up these IP addresses: ->>> name=127.0.0.1 address=127.0.0.1 ->>> routed by all router ->>> Attempting full verification using callout ->>> callout cache: no domain record found for domain.com ->>> callout cache: no address record found for verify@domain.com/ ->>> interface=ip4.ip4.ip4.ip4 port=1224 ->>> Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected ->>> SMTP<< 220 server ready ->>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset) ->>> SMTP>> EHLO myhost.test.ex ->>> SMTP<< 250 OK ->>> 127.0.0.1 in hosts_require_auth? no (option unset) ->>> SMTP>> MAIL FROM: ->>> SMTP<< 250 OK ->>> SMTP>> RCPT TO: ->>> SMTP<< 250 OK ->>> wrote callout cache domain record: ->>> result=1 postmaster=0 random=0 ->>> wrote positive callout cache address record ->>> ----------- end verify ------------ ->>> warn: condition test succeeded in ACL "ar" ->>> processing "accept" ->>> accept: condition test succeeded in ACL "ar" ->>> end of ACL "ar": ACCEPT ->>> SMTP>> QUIT ->>> ----------- cutthrough shutdown (host-checking mode) ------------ -LOG: 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=(myhost.test.ex) [1.2.3.4] P=esmtp S=sss for verify@domain.com diff --git a/test/stderr/5403 b/test/stderr/5403 new file mode 100644 index 000000000..49d3574fe --- /dev/null +++ b/test/stderr/5403 @@ -0,0 +1,91 @@ +>>> host in hosts_connection_nolog? no (option unset) +>>> host in host_lookup? no (option unset) +>>> host in host_reject_connection? no (option unset) +>>> host in sender_unqualified_hosts? no (option unset) +>>> host in recipient_unqualified_hosts? no (option unset) +>>> host in helo_verify_hosts? no (option unset) +>>> host in helo_try_verify_hosts? no (option unset) +>>> host in helo_accept_junk_hosts? no (option unset) +>>> myhost.test.ex in helo_lookup_domains? yes (matched "@") +>>> looking up host name for 1.2.3.4 +LOG: no host name found for IP address 1.2.3.4 +>>> host in dsn_advertise_hosts? no (option unset) +>>> host in pipelining_advertise_hosts? yes (matched "*") +>>> using ACL "ar" +>>> processing "warn" +>>> check control = cutthrough_delivery +>>> check logwrite = rcpt for $local_part@$domain +>>> = rcpt for plain@domain.com +LOG: rcpt for plain@domain.com +>>> warn: condition test succeeded in ACL "ar" +>>> processing "warn" +>>> check condition = ${if eq {verify}{$local_part}} +>>> = +>>> warn: condition test failed in ACL "ar" +>>> processing "accept" +>>> accept: condition test succeeded in ACL "ar" +>>> end of ACL "ar": ACCEPT +LOG: 10HmaX-0005vi-00 <= CALLER@myhost.test.ex H=(myhost.test.ex) [1.2.3.4] P=esmtp S=sss for plain@domain.com +>>> host in hosts_connection_nolog? no (option unset) +>>> host in host_lookup? no (option unset) +>>> host in host_reject_connection? no (option unset) +>>> host in sender_unqualified_hosts? no (option unset) +>>> host in recipient_unqualified_hosts? no (option unset) +>>> host in helo_verify_hosts? no (option unset) +>>> host in helo_try_verify_hosts? no (option unset) +>>> host in helo_accept_junk_hosts? no (option unset) +>>> myhost.test.ex in helo_lookup_domains? yes (matched "@") +>>> looking up host name for 1.2.3.4 +LOG: no host name found for IP address 1.2.3.4 +>>> host in dsn_advertise_hosts? no (option unset) +>>> host in pipelining_advertise_hosts? yes (matched "*") +>>> using ACL "ar" +>>> processing "warn" +>>> check control = cutthrough_delivery +>>> check logwrite = rcpt for $local_part@$domain +>>> = rcpt for verify@domain.com +LOG: rcpt for verify@domain.com +>>> warn: condition test succeeded in ACL "ar" +>>> processing "warn" +>>> check condition = ${if eq {verify}{$local_part}} +>>> = true +>>> check verify = recipient/callout=use_sender +>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> +>>> routing verify@domain.com +>>> domain.com in "localhost.test.ex : localhost4.test.ex : thishost.test.ex"? no (end of list) +>>> domain.com in "test.ex : *.test.ex"? no (end of list) +>>> domain.com in "! +local_domains"? yes (end of list) +>>> calling all router +>>> domain.com in "special.com"? no (end of list) +>>> domain.com in "*"? yes (matched "*") +>>> local host found for non-MX address +>>> fully qualified name = 127.0.0.1 +MUNGED: ::1 will be omitted in what follows +>>> get[host|ipnode]byname[2] looked up these IP addresses: +>>> name=127.0.0.1 address=127.0.0.1 +>>> routed by all router +>>> Attempting full verification using callout +>>> callout cache: no domain record found for domain.com +>>> callout cache: no address record found for verify@domain.com/ +>>> interface=ip4.ip4.ip4.ip4 port=1224 +>>> Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected +>>> SMTP<< 220 server ready +>>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset) +>>> SMTP>> EHLO myhost.test.ex +>>> SMTP<< 250 OK +>>> 127.0.0.1 in hosts_require_auth? no (option unset) +>>> SMTP>> MAIL FROM: +>>> SMTP<< 250 OK +>>> SMTP>> RCPT TO: +>>> SMTP<< 250 OK +>>> wrote callout cache domain record: +>>> result=1 postmaster=0 random=0 +>>> wrote positive callout cache address record +>>> ----------- end verify ------------ +>>> warn: condition test succeeded in ACL "ar" +>>> processing "accept" +>>> accept: condition test succeeded in ACL "ar" +>>> end of ACL "ar": ACCEPT +>>> SMTP>> QUIT +>>> ----------- cutthrough shutdown (host-checking mode) ------------ +LOG: 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=(myhost.test.ex) [1.2.3.4] P=esmtp S=sss for verify@domain.com diff --git a/test/stdout/5402 b/test/stdout/5402 index c0548bae7..1aa55964e 100644 --- a/test/stdout/5402 +++ b/test/stdout/5402 @@ -1,29 +1,14 @@ - -**** SMTP testing session as if from host 1.2.3.4 -**** but without any ident (RFC 1413) callback. -**** This is not for real! - 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 -250-myhost.test.ex Hello myhost.test.ex [1.2.3.4] +250-myhost.test.ex Hello CALLER at myhost.test.ex 250-SIZE 52428800 250-8BITMIME 250-PIPELINING 250 HELP 250 OK 250 Accepted -354 Enter message, ending with "." on a line by itself -250 OK id=10HmaX-0005vi-00 - -**** SMTP testing: that is not a real message id! - 221 myhost.test.ex closing connection - -**** SMTP testing session as if from host 1.2.3.4 -**** but without any ident (RFC 1413) callback. -**** This is not for real! - 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 -250-myhost.test.ex Hello myhost.test.ex [1.2.3.4] +250-myhost.test.ex Hello CALLER at myhost.test.ex 250-SIZE 52428800 250-8BITMIME 250-PIPELINING @@ -31,25 +16,44 @@ 250 OK 250 Accepted 354 Enter message, ending with "." on a line by itself -250 OK id=10HmaY-0005vi-00 - -**** SMTP testing: that is not a real message id! - +250 OK id=10HmaX-0005vi-00 221 myhost.test.ex closing connection ******** SERVER ******** Listening on port 1224 ... -Server timed out -Listening on port 1224 ... Connection request from [ip4.ip4.ip4.ip4] -220 server ready +220 ESMTP EHLO myhost.test.ex 250 OK MAIL FROM: +250 Sender OK +RCPT TO: +250 Recipient OK +QUIT +250 OK +End of script +Listening on port 1224 ... +Connection request from [ip4.ip4.ip4.ip4] +220 ESMTP +EHLO myhost.test.ex 250 OK -RCPT TO: +MAIL FROM: +250 Sender OK +RCPT TO: +250 Recipient OK +DATA +354 Send data +Received: from CALLER (helo=myhost.test.ex) + by myhost.test.ex with local-esmtp (Exim x.yz) + (envelope-from ) + id 10HmaX-0005vi-00 + for dest@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: +From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +. 250 OK QUIT -220 OK -Expected EOF read from client +250 OK End of script diff --git a/test/stdout/5403 b/test/stdout/5403 index aa2bdcaab..c0548bae7 100644 --- a/test/stdout/5403 +++ b/test/stdout/5403 @@ -1,5 +1,10 @@ + +**** SMTP testing session as if from host 1.2.3.4 +**** but without any ident (RFC 1413) callback. +**** This is not for real! + 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 -250-myhost.test.ex Hello CALLER at myhost.test.ex +250-myhost.test.ex Hello myhost.test.ex [1.2.3.4] 250-SIZE 52428800 250-8BITMIME 250-PIPELINING @@ -8,33 +13,43 @@ 250 Accepted 354 Enter message, ending with "." on a line by itself 250 OK id=10HmaX-0005vi-00 + +**** SMTP testing: that is not a real message id! + +221 myhost.test.ex closing connection + +**** SMTP testing session as if from host 1.2.3.4 +**** but without any ident (RFC 1413) callback. +**** This is not for real! + +220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +250-myhost.test.ex Hello myhost.test.ex [1.2.3.4] +250-SIZE 52428800 +250-8BITMIME +250-PIPELINING +250 HELP +250 OK +250 Accepted +354 Enter message, ending with "." on a line by itself +250 OK id=10HmaY-0005vi-00 + +**** SMTP testing: that is not a real message id! + 221 myhost.test.ex closing connection ******** SERVER ******** Listening on port 1224 ... +Server timed out +Listening on port 1224 ... Connection request from [ip4.ip4.ip4.ip4] -220 ESMTP +220 server ready EHLO myhost.test.ex -250-OK -250 SIZE 65536 -MAIL FROM: SIZE=ssss -250 Sender OK -RCPT TO: -250 Recipient OK -DATA -354 Send data -Received: from CALLER (helo=myhost.test.ex) - by myhost.test.ex with local-esmtp (Exim x.yz) - (envelope-from ) - id 10HmaX-0005vi-00 - for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -X-hdr-rtr-new: +++ - -. 250 OK -QUIT +MAIL FROM: 250 OK +RCPT TO: +250 OK +QUIT +220 OK +Expected EOF read from client End of script diff --git a/test/stdout/5404 b/test/stdout/5404 new file mode 100644 index 000000000..aa2bdcaab --- /dev/null +++ b/test/stdout/5404 @@ -0,0 +1,40 @@ +220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +250-myhost.test.ex Hello CALLER at myhost.test.ex +250-SIZE 52428800 +250-8BITMIME +250-PIPELINING +250 HELP +250 OK +250 Accepted +354 Enter message, ending with "." on a line by itself +250 OK id=10HmaX-0005vi-00 +221 myhost.test.ex closing connection + +******** SERVER ******** +Listening on port 1224 ... +Connection request from [ip4.ip4.ip4.ip4] +220 ESMTP +EHLO myhost.test.ex +250-OK +250 SIZE 65536 +MAIL FROM: SIZE=ssss +250 Sender OK +RCPT TO: +250 Recipient OK +DATA +354 Send data +Received: from CALLER (helo=myhost.test.ex) + by myhost.test.ex with local-esmtp (Exim x.yz) + (envelope-from ) + id 10HmaX-0005vi-00 + for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: +From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 +X-hdr-rtr-new: +++ + +. +250 OK +QUIT +250 OK +End of script