ftpserver.pl: fix newlines in 227/229 replies, adjust tests

The test FTP server returned LF newlines for 227/229 replies, instead of the CRLF used for the rest. Test data added later were explicitly made to expect an LF in these response lines. After this patch the FTP server returns CRLF newlines, allowing to delete this special case in test data. Follow-up to 3bfff57e1f Follow-up to a7937ed49c Closes #19330
2026-01-18 17:21:26 +01:00 · 2025-11-02 23:25:27 +01:00
parent aaf9522a2c
commit 254e04b702
25 changed files with 26 additions and 26 deletions
--- a/tests/data/test1349
+++ b/tests/data/test1349
@@ -58,7 +58,7 @@ mooo
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 10
 150 Binary data connection for %TESTNUMBER () (10 bytes).
--- a/tests/data/test1350
+++ b/tests/data/test1350
@@ -58,7 +58,7 @@ mooo
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 10
 150 Binary data connection for %TESTNUMBER () (10 bytes).
--- a/tests/data/test1351
+++ b/tests/data/test1351
@@ -59,7 +59,7 @@ mooo
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 10
 150 Binary data connection for %TESTNUMBER () (10 bytes).
--- a/tests/data/test1352
+++ b/tests/data/test1352
@@ -59,7 +59,7 @@ mooo
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 10
 150 Binary data connection for %TESTNUMBER () (10 bytes).
--- a/tests/data/test1353
+++ b/tests/data/test1353
@@ -58,7 +58,7 @@ mooo
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 10
 150 Binary data connection for %TESTNUMBER () (10 bytes).
--- a/tests/data/test1354
+++ b/tests/data/test1354
@@ -56,7 +56,7 @@ mooo
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 10
 150 Binary data connection for %TESTNUMBER () (10 bytes).
--- a/tests/data/test1357
+++ b/tests/data/test1357
@@ -71,7 +71,7 @@ MOOOO
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 214
 150 Binary data connection for %TESTNUMBER () (214 bytes).
--- a/tests/data/test1358
+++ b/tests/data/test1358
@@ -71,7 +71,7 @@ MOOOO
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 214
 150 Binary data connection for %TESTNUMBER () (214 bytes).
--- a/tests/data/test1359
+++ b/tests/data/test1359
@@ -72,7 +72,7 @@ MOOOO
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 214
 150 Binary data connection for %TESTNUMBER () (214 bytes).
--- a/tests/data/test1360
+++ b/tests/data/test1360
@@ -72,7 +72,7 @@ MOOOO
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 214
 150 Binary data connection for %TESTNUMBER () (214 bytes).
--- a/tests/data/test1361
+++ b/tests/data/test1361
@@ -71,7 +71,7 @@ MOOOO
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 214
 150 Binary data connection for %TESTNUMBER () (214 bytes).
--- a/tests/data/test1362
+++ b/tests/data/test1362
@@ -71,7 +71,7 @@ MOOOO
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 214
 150 Binary data connection for %TESTNUMBER () (214 bytes).
--- a/tests/data/test1379
+++ b/tests/data/test1379
@@ -56,7 +56,7 @@ mooo
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 10
 150 Binary data connection for %TESTNUMBER () (10 bytes).
--- a/tests/data/test1380
+++ b/tests/data/test1380
@@ -56,7 +56,7 @@ mooo
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 10
 150 Binary data connection for %TESTNUMBER () (10 bytes).
--- a/tests/data/test1381
+++ b/tests/data/test1381
@@ -57,7 +57,7 @@ mooo
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 10
 150 Binary data connection for %TESTNUMBER () (10 bytes).
--- a/tests/data/test1382
+++ b/tests/data/test1382
@@ -57,7 +57,7 @@ mooo
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 10
 150 Binary data connection for %TESTNUMBER () (10 bytes).
--- a/tests/data/test1383
+++ b/tests/data/test1383
@@ -56,7 +56,7 @@ mooo
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 10
 150 Binary data connection for %TESTNUMBER () (10 bytes).
--- a/tests/data/test1384
+++ b/tests/data/test1384
@@ -56,7 +56,7 @@ mooo
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 10
 150 Binary data connection for %TESTNUMBER () (10 bytes).
--- a/tests/data/test1387
+++ b/tests/data/test1387
@@ -71,7 +71,7 @@ MOOOO
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 222
 150 Binary data connection for %TESTNUMBER () (222 bytes).
--- a/tests/data/test1388
+++ b/tests/data/test1388
@@ -71,7 +71,7 @@ MOOOO
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 222
 150 Binary data connection for %TESTNUMBER () (222 bytes).
--- a/tests/data/test1389
+++ b/tests/data/test1389
@@ -72,7 +72,7 @@ MOOOO
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 222
 150 Binary data connection for %TESTNUMBER () (222 bytes).
--- a/tests/data/test1390
+++ b/tests/data/test1390
@@ -72,7 +72,7 @@ MOOOO
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 222
 150 Binary data connection for %TESTNUMBER () (222 bytes).
--- a/tests/data/test1391
+++ b/tests/data/test1391
@@ -71,7 +71,7 @@ MOOOO
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 222
 150 Binary data connection for %TESTNUMBER () (222 bytes).
--- a/tests/data/test1392
+++ b/tests/data/test1392
@@ -71,7 +71,7 @@ MOOOO
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 222
 150 Binary data connection for %TESTNUMBER () (222 bytes).
--- a/tests/ftpserver.pl
+++ b/tests/ftpserver.pl
@@ -2566,12 +2566,12 @@ sub PASV_ftp {
        if($pasvbadip) {
            $p="1,2,3,4";
        }
-        sendcontrol sprintf("227 Entering Passive Mode ($p,%d,%d)\n",
+        sendcontrol sprintf("227 Entering Passive Mode ($p,%d,%d)\r\n",
                            int($pasvport/256), int($pasvport%256));
    }
    else {
        # EPSV reply
-        sendcontrol sprintf("229 Entering Passive Mode (|||%d|)\n", $pasvport);
+        sendcontrol sprintf("229 Entering Passive Mode (|||%d|)\r\n", $pasvport);
    }

    logmsg "Client has been notified that DATA conn ".