From d677b2f22abb3eb268e5cb15e4710ff5063049fe Mon Sep 17 00:00:00 2001 From: Philip Hazel Date: Fri, 22 Jun 2007 14:38:58 +0000 Subject: Added $max_received_linelength. --- test/scripts/0000-Basic/0542 | 4 +++- test/stdout/0035 | 7 +++++++ test/stdout/0245 | 1 + test/stdout/0250 | 3 +++ test/stdout/0254 | 3 +++ test/stdout/0311 | 2 ++ test/stdout/0338 | 1 + test/stdout/0377 | 1 + test/stdout/0378 | 1 + test/stdout/0379 | 1 + test/stdout/0389 | 1 + test/stdout/0488 | 1 + test/stdout/0490 | 1 + test/stdout/0514 | 1 + test/stdout/0542 | 6 ++++-- test/stdout/3415 | 5 +++++ 16 files changed, 36 insertions(+), 3 deletions(-) (limited to 'test') diff --git a/test/scripts/0000-Basic/0542 b/test/scripts/0000-Basic/0542 index da2b9e768..92f1f607e 100644 --- a/test/scripts/0000-Basic/0542 +++ b/test/scripts/0000-Basic/0542 @@ -4,7 +4,7 @@ From: Himself To: Yourself Subject: The subject is not the object -This is the body of the message. +This is the body of the message. Make the line longer than any header. **** sudo exim -be -Mset $msg1 From: $h_from: @@ -13,6 +13,7 @@ message_body_size=$message_body_size message_size=$message_size message_id=$message_id message_exim_id=$message_exim_id +max_received_linelength=$max_received_linelength recipients=$recipients **** write test-data @@ -32,6 +33,7 @@ message_body_size=$message_body_size message_exim_id=$message_exim_id message_linecount=$message_linecount message_body_linecount=$body_linecount +max_received_linelength=$max_received_linelength headers ----------------- $message_headers diff --git a/test/stdout/0035 b/test/stdout/0035 index 15cac0b0f..6b5928b77 100644 --- a/test/stdout/0035 +++ b/test/stdout/0035 @@ -143,6 +143,7 @@ ddddddddd 0 -interface_address 127.0.0.1.1225 -received_protocol esmtp -body_linecount 0 +-max_received_linelength 0 -deliver_firsttime XX 1 @@ -162,6 +163,7 @@ ddddddddd 0 -interface_address 127.0.0.1.1225 -received_protocol esmtp -body_linecount 0 +-max_received_linelength 0 -deliver_firsttime XX 1 @@ -184,6 +186,7 @@ ddddddddd 0 -interface_address 127.0.0.1.1225 -received_protocol esmtp -body_linecount 0 +-max_received_linelength 0 -deliver_firsttime XX 1 @@ -204,6 +207,7 @@ ddddddddd 0 -interface_address 127.0.0.1.1225 -received_protocol esmtp -body_linecount 0 +-max_received_linelength 25 -deliver_firsttime XX 1 @@ -224,6 +228,7 @@ ddddddddd 0 -interface_address 127.0.0.1.1225 -received_protocol esmtp -body_linecount 0 +-max_received_linelength 25 -deliver_firsttime XX 1 @@ -247,6 +252,7 @@ ddddddddd 0 -interface_address 127.0.0.1.1225 -received_protocol esmtp -body_linecount 0 +-max_received_linelength 25 -deliver_firsttime XX 1 @@ -270,6 +276,7 @@ ddddddddd 0 -interface_address 127.0.0.1.1225 -received_protocol esmtp -body_linecount 0 +-max_received_linelength 25 -deliver_firsttime XX 1 diff --git a/test/stdout/0245 b/test/stdout/0245 index a29cad618..36332a61b 100644 --- a/test/stdout/0245 +++ b/test/stdout/0245 @@ -10,6 +10,7 @@ ddddddddd 0 -ident CALLER -received_protocol local -body_linecount 1 +-max_received_linelength 25 -auth_id CALLER -auth_sender CALLER@myhost.test.ex -allow_unqualified_recipient diff --git a/test/stdout/0250 b/test/stdout/0250 index 30fc9dc44..1d364b4e9 100644 --- a/test/stdout/0250 +++ b/test/stdout/0250 @@ -5,6 +5,7 @@ ddddddddd 0 -ident CALLER -received_protocol local -body_linecount 0 +-max_received_linelength 19 -auth_id CALLER -auth_sender CALLER@test.ex -allow_unqualified_recipient @@ -34,6 +35,7 @@ ddddddddd 0 -ident CALLER -received_protocol local -body_linecount 0 +-max_received_linelength 19 -auth_id CALLER -auth_sender CALLER@test.ex -allow_unqualified_recipient @@ -63,6 +65,7 @@ ddddddddd 0 -ident CALLER -received_protocol local -body_linecount 0 +-max_received_linelength 0 -auth_id CALLER -auth_sender CALLER@test.ex -allow_unqualified_recipient diff --git a/test/stdout/0254 b/test/stdout/0254 index 00a654640..947c4e0c5 100644 --- a/test/stdout/0254 +++ b/test/stdout/0254 @@ -5,6 +5,7 @@ ddddddddd 0 -ident CALLER -received_protocol local -body_linecount 0 +-max_received_linelength 32 -auth_id CALLER -auth_sender CALLER@myhost.test.ex -allow_unqualified_recipient @@ -40,6 +41,7 @@ ddddddddd 0 -ident CALLER -received_protocol local -body_linecount 0 +-max_received_linelength 14 -auth_id CALLER -auth_sender CALLER@myhost.test.ex -allow_unqualified_recipient @@ -68,6 +70,7 @@ ddddddddd 0 -ident CALLER -received_protocol local -body_linecount 0 +-max_received_linelength 18 -auth_id CALLER -auth_sender CALLER@myhost.test.ex -allow_unqualified_recipient diff --git a/test/stdout/0311 b/test/stdout/0311 index b563d1cd4..45190072f 100644 --- a/test/stdout/0311 +++ b/test/stdout/0311 @@ -5,6 +5,7 @@ ddddddddd 0 -ident CALLER -received_protocol local -body_linecount 0 +-max_received_linelength 46 -auth_id CALLER -auth_sender CALLER@myhost.test.ex -allow_unqualified_recipient @@ -32,6 +33,7 @@ ddddddddd 0 -ident CALLER -received_protocol local -body_linecount 0 +-max_received_linelength 46 -auth_id CALLER -auth_sender CALLER@myhost.test.ex -allow_unqualified_recipient diff --git a/test/stdout/0338 b/test/stdout/0338 index 870dc3b55..a97751353 100644 --- a/test/stdout/0338 +++ b/test/stdout/0338 @@ -9,6 +9,7 @@ ddddddddd 0 -ident CALLER -received_protocol local -body_linecount 0 +-max_received_linelength 0 -auth_id CALLER -auth_sender CALLER@test.ex -allow_unqualified_recipient diff --git a/test/stdout/0377 b/test/stdout/0377 index 140f53b9a..59742e666 100644 --- a/test/stdout/0377 +++ b/test/stdout/0377 @@ -5,6 +5,7 @@ ddddddddd 0 -ident CALLER -received_protocol local -body_linecount 0 +-max_received_linelength 0 -auth_id CALLER -auth_sender CALLER@myhost.test.ex -allow_unqualified_recipient diff --git a/test/stdout/0378 b/test/stdout/0378 index bbaa49a14..e64fdef16 100644 --- a/test/stdout/0378 +++ b/test/stdout/0378 @@ -5,6 +5,7 @@ ddddddddd 0 -ident CALLER -received_protocol local -body_linecount 0 +-max_received_linelength 0 -auth_id CALLER -auth_sender CALLER@myhost.test.ex -allow_unqualified_recipient diff --git a/test/stdout/0379 b/test/stdout/0379 index 00857b734..7bfea116f 100644 --- a/test/stdout/0379 +++ b/test/stdout/0379 @@ -5,6 +5,7 @@ ddddddddd 0 -ident CALLER -received_protocol local -body_linecount 0 +-max_received_linelength 0 -auth_id CALLER -auth_sender CALLER@myhost.test.ex -allow_unqualified_recipient diff --git a/test/stdout/0389 b/test/stdout/0389 index b361850cf..69b1bfc00 100644 --- a/test/stdout/0389 +++ b/test/stdout/0389 @@ -13,6 +13,7 @@ ddddddddd 0 -aclm 0 22 >Sender verify failed< -body_linecount 0 +-max_received_linelength 0 -auth_id CALLER -allow_unqualified_recipient -allow_unqualified_sender diff --git a/test/stdout/0488 b/test/stdout/0488 index 6acd7cee3..ff89ff2f7 100644 --- a/test/stdout/0488 +++ b/test/stdout/0488 @@ -11,6 +11,7 @@ ddddddddd 0 -ident CALLER -received_protocol local-smtp -body_linecount 0 +-max_received_linelength 0 -auth_id CALLER -allow_unqualified_recipient -allow_unqualified_sender diff --git a/test/stdout/0490 b/test/stdout/0490 index d5a87dabb..f9cb83d19 100644 --- a/test/stdout/0490 +++ b/test/stdout/0490 @@ -15,6 +15,7 @@ ddddddddd 0 -ident CALLER -received_protocol local-smtp -body_linecount 2 +-max_received_linelength 6 -auth_id CALLER -allow_unqualified_recipient -allow_unqualified_sender diff --git a/test/stdout/0514 b/test/stdout/0514 index dd078c1c9..83111ea92 100644 --- a/test/stdout/0514 +++ b/test/stdout/0514 @@ -8,6 +8,7 @@ ddddddddd 0 -ident spaced user -received_protocol local -body_linecount 1 +-max_received_linelength 7 -auth_id spaced user -auth_sender spaced user@myhost.test.ex -allow_unqualified_recipient diff --git a/test/stdout/0542 b/test/stdout/0542 index 03dd58a20..3e42bc19d 100644 --- a/test/stdout/0542 +++ b/test/stdout/0542 @@ -1,9 +1,10 @@ > From: Himself > Subject: The subject is not the object -> message_body_size=33 -> message_size=369 +> message_body_size=71 +> message_size=407 > message_id=10HmaX-0005vi-00 > message_exim_id=10HmaX-0005vi-00 +> max_received_linelength=70 > recipients=userx@test.x, usery@test.ex > > from: A Person @@ -14,6 +15,7 @@ > message_exim_id=10HmaY-0005vi-00 > message_linecount=6 > message_body_linecount=2 +> max_received_linelength=50 > headers ----------------- > From: A Person To: First , Second diff --git a/test/stdout/3415 b/test/stdout/3415 index bc9555c02..7bbd8061e 100644 --- a/test/stdout/3415 +++ b/test/stdout/3415 @@ -153,6 +153,7 @@ ddddddddd 0 -interface_address 127.0.0.1.1225 -received_protocol esmtpa -body_linecount 0 +-max_received_linelength 0 -auth_id username -deliver_firsttime XX @@ -178,6 +179,7 @@ ddddddddd 0 -interface_address 127.0.0.1.1225 -received_protocol esmtpa -body_linecount 0 +-max_received_linelength 0 -auth_id username -deliver_firsttime XX @@ -201,6 +203,7 @@ ddddddddd 0 -interface_address 127.0.0.1.1225 -received_protocol esmtpa -body_linecount 0 +-max_received_linelength 0 -auth_id username -deliver_firsttime XX @@ -224,6 +227,7 @@ ddddddddd 0 -interface_address 127.0.0.1.1225 -received_protocol esmtpa -body_linecount 0 +-max_received_linelength 0 -auth_id username@auth.id.domain -deliver_firsttime XX @@ -247,6 +251,7 @@ ddddddddd 0 -interface_address 127.0.0.1.1225 -received_protocol esmtpa -body_linecount 0 +-max_received_linelength 15 -auth_id username@auth.id.domain -deliver_firsttime XX -- cgit v1.2.3