Cutthrough: handle request when a callout-hold is active. Bug 2604

[users/heiko/exim.git] / test / stderr / 0432

diff --git a/test/stderr/0432 b/test/stderr/0432
index 084f0afa7d516c4f8473ade424254f362d88d3a1..b01205611244b822ab2afe4e9a7e80820ec37a0f 100644 (file)
--- a/test/stderr/0432
+++ b/test/stderr/0432
@@ -72,6 +72,7 @@ domain = y
 routed by r1 router
   envelope to: x@y
   transport: t1
 routed by r1 router
   envelope to: x@y
   transport: t1

+host_fake_gethostbyname returned 1 (HOST_NOT_FOUND)

 using host_fake_gethostbyname for 127.0.0.1 (IPv4)
 local host found for non-MX address
 MUNGED: ::1 will be omitted in what follows
 using host_fake_gethostbyname for 127.0.0.1 (IPv4)
 local host found for non-MX address
 MUNGED: ::1 will be omitted in what follows


@@ -90,7 +91,7 @@ callout cache: no address record found for x@y
  EXIM_DBCLOSE(0xAAAAAAAA)
  closed hints database and lockfile
 interface=NULL port=1224
  EXIM_DBCLOSE(0xAAAAAAAA)
  closed hints database and lockfile
 interface=NULL port=1224

-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected

   SMTP<< 220 server ready
 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
   SMTP>> EHLO myhost.test.ex
   SMTP<< 220 server ready
 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
   SMTP>> EHLO myhost.test.ex


@@ -132,7 +133,7 @@ SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from [1.2.3.4] closed by QUIT
 search_tidyup called
 LOG: smtp_connection MAIN
   SMTP connection from [1.2.3.4] closed by QUIT
 search_tidyup called

->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp


@@ -182,6 +183,7 @@ domain = y
 routed by r1 router
   envelope to: x@y
   transport: t1
 routed by r1 router
   envelope to: x@y
   transport: t1

+host_fake_gethostbyname returned 1 (HOST_NOT_FOUND)

 using host_fake_gethostbyname for 127.0.0.1 (IPv4)
 local host found for non-MX address
 MUNGED: ::1 will be omitted in what follows
 using host_fake_gethostbyname for 127.0.0.1 (IPv4)
 local host found for non-MX address
 MUNGED: ::1 will be omitted in what follows


@@ -210,7 +212,7 @@ SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from [1.2.3.4] closed by QUIT
 search_tidyup called
 LOG: smtp_connection MAIN
   SMTP connection from [1.2.3.4] closed by QUIT
 search_tidyup called

->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=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 hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -260,7 +262,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> callout cache: no domain record found for b
 >>> callout cache: no address record found for a@b
 >>> interface=NULL port=1224
 >>> callout cache: no domain record found for b
 >>> callout cache: no address record found for a@b
 >>> interface=NULL port=1224

->>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+>>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected

 >>>   SMTP<< 220 server ready
 >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
 >>>   SMTP>> EHLO myhost.test.ex
 >>>   SMTP<< 220 server ready
 >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
 >>>   SMTP>> EHLO myhost.test.ex


@@ -306,7 +308,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> callout cache: no domain record found for q
 >>> callout cache: no address record found for p1@q
 >>> interface=NULL port=1224
 >>> callout cache: no domain record found for q
 >>> callout cache: no address record found for p1@q
 >>> interface=NULL port=1224

->>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+>>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected

 >>>   SMTP<< 220 server ready
 >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
 >>>   SMTP>> EHLO myhost.test.ex
 >>>   SMTP<< 220 server ready
 >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
 >>>   SMTP>> EHLO myhost.test.ex