git://git.exim.org
/
users
/
heiko
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid all tail-end pipelining on retries
[users/heiko/exim.git]
/
test
/
stderr
/
0276
diff --git
a/test/stderr/0276
b/test/stderr/0276
index c721ff784e06e95104d7b82dd2166a07d36500ef..3519ecf166f02fde7ccddb978c06e811a0d0df3f 100644
(file)
--- a/
test/stderr/0276
+++ b/
test/stderr/0276
@@
-1,27
+1,30
@@
LOG: MAIN
<= CALLER@test.ex U=CALLER P=local S=sss
delivering 10HmaX-0005vi-00
LOG: MAIN
<= CALLER@test.ex U=CALLER P=local S=sss
delivering 10HmaX-0005vi-00
-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
SMTP>> EHLO myhost.test.ex
SMTP<< 250-server id
250-PIPELINING
250 OK
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-server id
250-PIPELINING
250 OK
- SMTP
>
> MAIL FROM:<CALLER@test.ex>
- SMTP
>
> RCPT TO:<userx@test.ex>
+ SMTP
|
> MAIL FROM:<CALLER@test.ex>
+ SMTP
|
> RCPT TO:<userx@test.ex>
SMTP>> DATA
SMTP<< 250 OK
SMTP<< 250 OK
SMTP<< 500 NO
SMTP>> DATA
SMTP<< 250 OK
SMTP<< 250 OK
SMTP<< 500 NO
- SMTP>> QUIT
+ SMTP+> QUIT
+ SMTP(shutdown)>>
+ SMTP<< 200 OK
+ SMTP(close)>>
LOG: MAIN
LOG: MAIN
- ** userx@test.ex R=r1 T=t1
: SMTP error from remote mail server after pipelined DATA: host 127.0.0.1 [127.0.0.1]
: 500 NO
+ ** userx@test.ex R=r1 T=t1
H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined DATA
: 500 NO
LOG: MAIN
<= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
delivering 10HmaY-0005vi-00
LOG: MAIN
<= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
delivering 10HmaY-0005vi-00
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ...
failed: Connection refused
LOG: MAIN
LOG: MAIN
- 127.0.0.1 [127.0.0.1] Connection refused
+
H=
127.0.0.1 [127.0.0.1] Connection refused
LOG: MAIN
== CALLER@test.ex R=r1 T=t1 defer (dd): Connection refused
LOG: MAIN
LOG: MAIN
== CALLER@test.ex R=r1 T=t1 defer (dd): Connection refused
LOG: MAIN
@@
-35,26
+38,29
@@
LOG: MAIN
LOG: MAIN
<= CALLER@test.ex U=CALLER P=local S=sss
delivering 10HmaZ-0005vi-00
LOG: MAIN
<= CALLER@test.ex U=CALLER P=local S=sss
delivering 10HmaZ-0005vi-00
-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
SMTP>> EHLO myhost.test.ex
SMTP<< 250-server id
250 OK
SMTP>> MAIL FROM:<CALLER@test.ex>
SMTP<< 250 OK
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-server id
250 OK
SMTP>> MAIL FROM:<CALLER@test.ex>
SMTP<< 250 OK
- SMTP>> RCPT TO:<user
x
@test.ex>
+ SMTP>> RCPT TO:<user
y
@test.ex>
SMTP<< 250 OK
SMTP>> DATA
SMTP<< 500 NO
SMTP<< 250 OK
SMTP>> DATA
SMTP<< 500 NO
- SMTP>> QUIT
+ SMTP+> QUIT
+ SMTP(shutdown)>>
+ SMTP<< 200 OK
+ SMTP(close)>>
LOG: MAIN
LOG: MAIN
- ** user
x@test.ex R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]
: 500 NO
+ ** user
y@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after DATA
: 500 NO
LOG: MAIN
<= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss
delivering 10HmbA-0005vi-00
LOG: MAIN
<= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss
delivering 10HmbA-0005vi-00
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ...
failed: Connection refused
LOG: MAIN
LOG: MAIN
- 127.0.0.1 [127.0.0.1] Connection refused
+
H=
127.0.0.1 [127.0.0.1] Connection refused
LOG: MAIN
== CALLER@test.ex R=r1 T=t1 defer (dd): Connection refused
LOG: MAIN
LOG: MAIN
== CALLER@test.ex R=r1 T=t1 defer (dd): Connection refused
LOG: MAIN