From 99b40451836dfea2d5dce2ada4fab15b2ab5bfb2 Mon Sep 17 00:00:00 2001
From: Steve Holme <steve_holme@hotmail.com>
Date: Sat, 4 May 2013 09:52:09 +0100
Subject: smtp: Fixed sending of double CRLF caused by first in EOB

If the mail sent during the transfer contains a terminating <CRLF> then
we should not send the first <CRLF> of the EOB as specified in RFC-5321.

Additionally don't send the <CRLF> if there is "no mail data" as the
DATA command already includes it.
---
 tests/data/test1320 | 1 -
 tests/data/test1406 | 1 -
 tests/data/test900  | 1 -
 tests/data/test901  | 1 -
 tests/data/test902  | 1 -
 tests/data/test903  | 1 -
 tests/data/test904  | 1 -
 tests/data/test905  | 1 -
 tests/data/test906  | 1 -
 tests/data/test907  | 1 -
 tests/data/test908  | 1 -
 tests/data/test909  | 1 -
 12 files changed, 12 deletions(-)

(limited to 'tests')

diff --git a/tests/data/test1320 b/tests/data/test1320
index f1c7328e6..15ec7bb6c 100644
--- a/tests/data/test1320
+++ b/tests/data/test1320
@@ -58,7 +58,6 @@ From: different
 To: another
 
 body
-
 .
 </upload>
 <proxy>
diff --git a/tests/data/test1406 b/tests/data/test1406
index b7727edfd..6245c513e 100644
--- a/tests/data/test1406
+++ b/tests/data/test1406
@@ -49,7 +49,6 @@ From: different
 To: another
 
 body
-
 .
 </upload>
 <file name="log/test1406.c" mode="text">
diff --git a/tests/data/test900 b/tests/data/test900
index e71fa94fd..749a96574 100644
--- a/tests/data/test900
+++ b/tests/data/test900
@@ -46,7 +46,6 @@ From: different
 To: another
 
 body
-
 .
 </upload>
 </verify>
diff --git a/tests/data/test901 b/tests/data/test901
index cc3409990..ed2451824 100644
--- a/tests/data/test901
+++ b/tests/data/test901
@@ -57,7 +57,6 @@ To: another
 ..
 
 body
-
 .
 </upload>
 </verify>
diff --git a/tests/data/test902 b/tests/data/test902
index c3b9fb442..4da1b9912 100644
--- a/tests/data/test902
+++ b/tests/data/test902
@@ -52,7 +52,6 @@ From: different
 To: another
 
 body
-
 .
 </upload>
 </verify>
diff --git a/tests/data/test903 b/tests/data/test903
index defadf903..157bd48cb 100644
--- a/tests/data/test903
+++ b/tests/data/test903
@@ -49,7 +49,6 @@ QUIT
 </protocol>
 <upload>
 mail body
-
 .
 </upload>
 </verify>
diff --git a/tests/data/test904 b/tests/data/test904
index 19e6f2226..1a23f4157 100644
--- a/tests/data/test904
+++ b/tests/data/test904
@@ -50,7 +50,6 @@ QUIT
 </protocol>
 <upload>
 mail body
-
 .
 </upload>
 </verify>
diff --git a/tests/data/test905 b/tests/data/test905
index 451a73d49..fccd84bae 100644
--- a/tests/data/test905
+++ b/tests/data/test905
@@ -52,7 +52,6 @@ QUIT
 </protocol>
 <upload>
 mail body
-
 .
 </upload>
 </verify>
diff --git a/tests/data/test906 b/tests/data/test906
index 80c1e7ee6..1f88990fd 100644
--- a/tests/data/test906
+++ b/tests/data/test906
@@ -45,7 +45,6 @@ From: different
 To: another
 
 body
-
 .
 </upload>
 </verify>
diff --git a/tests/data/test907 b/tests/data/test907
index 45e453db0..511d51970 100644
--- a/tests/data/test907
+++ b/tests/data/test907
@@ -47,7 +47,6 @@ QUIT
 </protocol>
 <upload>
 mail body
-
 .
 </upload>
 </verify>
diff --git a/tests/data/test908 b/tests/data/test908
index c1689287f..61d56c5e0 100644
--- a/tests/data/test908
+++ b/tests/data/test908
@@ -48,7 +48,6 @@ QUIT
 </protocol>
 <upload>
 mail body
-
 .
 </upload>
 </verify>
diff --git a/tests/data/test909 b/tests/data/test909
index 89c8b0fb8..2fc1f191d 100644
--- a/tests/data/test909
+++ b/tests/data/test909
@@ -50,7 +50,6 @@ From: different
 To: another
 
 body
-
 .
 </upload>
 </verify>
-- 
cgit v1.2.3