git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix mismerge
[exim.git]
/
test
/
stdout
/
2014
diff --git
a/test/stdout/2014
b/test/stdout/2014
index edd498aa84154bca7381e908e7e5faa5d51ebebe..94b9bdee8fe5c8ea7f8366fca5f7728b2bcdf15a 100644
(file)
--- a/
test/stdout/2014
+++ b/
test/stdout/2014
@@
-8,6
+8,8
@@
Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@
-34,6
+36,8
@@
Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@
-71,6
+75,8
@@
Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
??? 250-
<<< 250-SIZE 52428800
??? 250-
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@
-108,6
+114,8
@@
Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
??? 250-
<<< 250-SIZE 52428800
??? 250-
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@
-145,6
+153,8
@@
Key file = aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net
??? 250-
<<< 250-SIZE 52428800
??? 250-
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@
-173,6
+183,8
@@
Key file = aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net
??? 250-
<<< 250-SIZE 52428800
??? 250-
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@
-210,6
+222,8
@@
Key file = aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.c
??? 250-
<<< 250-SIZE 52428800
??? 250-
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@
-239,6
+253,8
@@
Key file = aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.c
??? 250-
<<< 250-SIZE 52428800
??? 250-
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@
-276,6
+292,8
@@
Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
??? 250-
<<< 250-SIZE 52428800
??? 250-
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
git://git.exim.org / exim.git / blobdiff