From ca9ab24ed5f06c87e1eb8b7530128dac02cad864 Mon Sep 17 00:00:00 2001
From: Marc Hoersken <info@marc-hoersken.de>
Date: Sun, 26 Jan 2014 11:30:41 +0100
Subject: [PATCH] ftpserver.pl: directory LISTings use [CR][LF] for ASCII
transfer
According to section 2.2 of RFC959 the End-of-Line is defined as:
The end-of-line sequence defines the separation of printing
lines. The sequence is Carriage Return, followed by Line Feed.
Verified by sniffing traffic between a Windows FTP client (FileZilla)
and Unix-hosted FTP server (ProFTPD).
---
tests/ftpserver.pl | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl
index f2b12ebc3a..0116e2073c 100755
--- a/tests/ftpserver.pl
+++ b/tests/ftpserver.pl
@@ -2160,6 +2160,9 @@ my @ftpdir=("total 20\r\n",
my @data = getpart("reply", "data");
for(@data) {
my $send = $_;
+ # convert all \n to \r\n for ASCII transfer
+ $send =~ s/\r\n/\n/g;
+ $send =~ s/\n/\r\n/g;
logmsg "send $send as data\n";
senddata $send;
}
--
GitLab