Commit 77a21ff6 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

pop3 test server: send terminating ".CRLF" only 

With commit 035ef06b applied, the test pop3 server needs to send
".\r\n" as the body terminating sequence and there needs to be a final
CRLF in the actual body in the test data file.
parent 035ef06b

tests/ftpserver.pl

+6 −5
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#                            | (__| |_| |  _ <| |___

#                             \___|\___/|_| \_\_____|

#

# Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.

# Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.

#

# This software is licensed as described in the file COPYING, which

# you should have received as part of this distribution. The terms
@@ -857,8 +857,9 @@ sub RETR_pop3 { 
         sendcontrol $d;

     }



     # end with the magic 5-byte end of mail marker

     sendcontrol "\r\n.\r\n";

     # end with the magic 3-byte end of mail marker, assumes that the

     # mail body ends with a CRLF!

     sendcontrol ".\r\n";



     return 0;

}
@@ -880,8 +881,8 @@ my @pop3list=( 
         sendcontrol $d;

     }



     # end with the magic 5-byte end of listing marker

     sendcontrol "\r\n.\r\n";

     # end with the magic 3-byte end of listing marker

     sendcontrol ".\r\n";



     return 0;

}

tests/data/test1319

+2 −2

File changed.

Contains only whitespace changes.

tests/data/test800

+7 −7

File changed.

Contains only whitespace changes.