From 58fc5fb2eec65bc0b1c7f5e571e3c534cf008b88 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sun, 7 Aug 2016 15:14:59 +0100 Subject: CHUNKING: fix transmit with long headers When the buffer used for SMTP commands and message headers filled to flush point, protocol sequencing was wrong. --- test/stderr/2013 | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'test/stderr/2013') diff --git a/test/stderr/2013 b/test/stderr/2013 index 11e165c61..459f75027 100644 --- a/test/stderr/2013 +++ b/test/stderr/2013 @@ -6,6 +6,7 @@ LOG: queue_run MAIN Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO myhost.test.ex +cmd buf flush 21 bytes SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] 250-SIZE 52428800 250-8BITMIME @@ -13,8 +14,10 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected 250-STARTTLS 250 HELP SMTP>> STARTTLS +cmd buf flush 10 bytes SMTP<< 220 TLS go ahead SMTP>> EHLO myhost.test.ex +cmd buf flush 21 bytes SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] 250-SIZE 52428800 250-8BITMIME @@ -23,11 +26,13 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected SMTP>> MAIL FROM: SIZE=ssss SMTP>> RCPT TO: SMTP>> DATA +cmd buf flush 78 bytes SMTP<< 250 OK SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself SMTP<< 250 OK id=10HmaZ-0005vi-00 SMTP>> EHLO myhost.test.ex +cmd buf flush 21 bytes SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] 250-SIZE 52428800 250-8BITMIME @@ -44,8 +49,10 @@ configuration file is TESTSUITE/test-config trusted user admin user SMTP>> STARTTLS +cmd buf flush 10 bytes SMTP<< 220 TLS go ahead SMTP>> EHLO myhost.test.ex +cmd buf flush 21 bytes SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] 250-SIZE 52428800 250-8BITMIME @@ -54,11 +61,13 @@ admin user SMTP>> MAIL FROM: SIZE=ssss SMTP>> RCPT TO: SMTP>> DATA +cmd buf flush 78 bytes SMTP<< 250 OK SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself SMTP<< 250 OK id=10HmbA-0005vi-00 SMTP>> QUIT +cmd buf flush 6 bytes SMTP(close)>> LOG: MAIN => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00" -- cgit v1.2.3