Merge branch 'master' into 4.next

[exim.git] / test / stderr / 2035

diff --git a/test/stderr/2035 b/test/stderr/2035
index aa0e4380567bb5bb7b862b88559677db68ab19a3..dedf4ad481ddd65fc2b2c6971367aeed9a97d1be 100644 (file)
--- a/test/stderr/2035
+++ b/test/stderr/2035
@@ -26,7 +26,7 @@ cmd buf flush ddd bytes
          250 HELP
 using PIPELINING
 not using DSN
-  SMTP>> MAIL FROM:<usera@ok.example> SIZE=ssss
+  SMTP>> MAIL FROM:<usera@ok.example>
   SMTP>> RCPT TO:<userb@test.ex>
 cmd buf flush ddd bytes
   SMTP<< 250 OK
@@ -50,6 +50,7 @@ already connected to 127.0.0.1 [127.0.0.1] (on fd 0)
 checking status of 127.0.0.1
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
 delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userb@test.ex)
+Transport port=25 replaced by host-specific port=1225
 continued connection, proxied TLS
   SMTP>> DATA
 cmd buf flush ddd bytes
@@ -65,7 +66,7 @@ cmd buf flush ddd bytes
 Leaving t1 transport
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
-  => userb@test.ex R=client T=t1 H=127.0.0.1 [127.0.0.1]:25 X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no C="250 OK id=10HmaY-0005vi-00"
+  => userb@test.ex R=client T=t1 H=127.0.0.1 [127.0.0.1]:1225 X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no C="250 OK id=10HmaY-0005vi-00"
 LOG: MAIN
   Completed
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>