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 3bfff57e1f604ef0b2bc84243014eb9c9a1e6acc
Follow-up to a7937ed49c8f201444323b8a721e1d04e0306105

Closes #19330

diff --git a/tests/data/test1349 b/tests/data/test1349
index 63c06e2983dfe155948f97d606f1c76bfa11a654..9c74aed958df5035cc9a58364c7a38f13e8f9de2 100644 (file)
--- a/tests/data/test1349
+++ b/tests/data/test1349
@@ -58,7 +58,7 @@ mooo
 230 Welcome you silly person\r
 257 "/" is current directory\r
 250 CWD command successful.\r
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)\r
 200 I modify TYPE as you wanted\r
 213 10\r
 150 Binary data connection for %TESTNUMBER () (10 bytes).\r

diff --git a/tests/data/test1350 b/tests/data/test1350
index 5d7a365394197b292efd057e113c85c4430cc6e6..fcf78744b30555e084dbe0f3048cd5247552af3d 100644 (file)
--- a/tests/data/test1350
+++ b/tests/data/test1350
@@ -58,7 +58,7 @@ mooo
 230 Welcome you silly person\r
 257 "/" is current directory\r
 250 CWD command successful.\r
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)\r
 200 I modify TYPE as you wanted\r
 213 10\r
 150 Binary data connection for %TESTNUMBER () (10 bytes).\r

diff --git a/tests/data/test1351 b/tests/data/test1351
index d05f9b026c3858cce7fd51fbcecf630bca508b27..c1ed52d4a542a33b16e7c33148457f9e1e45897a 100644 (file)
--- a/tests/data/test1351
+++ b/tests/data/test1351
@@ -59,7 +59,7 @@ mooo
 230 Welcome you silly person\r
 257 "/" is current directory\r
 250 CWD command successful.\r
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)\r
 200 I modify TYPE as you wanted\r
 213 10\r
 150 Binary data connection for %TESTNUMBER () (10 bytes).\r

diff --git a/tests/data/test1352 b/tests/data/test1352
index db093ab72b7ddea3d0e342ea812090ee7073b30d..c54ca4a217d0d4a23dddc943d536e8c1a709fe63 100644 (file)
--- a/tests/data/test1352
+++ b/tests/data/test1352
@@ -59,7 +59,7 @@ mooo
 230 Welcome you silly person\r
 257 "/" is current directory\r
 250 CWD command successful.\r
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)\r
 200 I modify TYPE as you wanted\r
 213 10\r
 150 Binary data connection for %TESTNUMBER () (10 bytes).\r

diff --git a/tests/data/test1353 b/tests/data/test1353
index 45308f1cf150e410e79b9c3c4ad8142493280554..2b6af8cf0151b234ee1340d23b739f845b045212 100644 (file)
--- a/tests/data/test1353
+++ b/tests/data/test1353
@@ -58,7 +58,7 @@ mooo
 230 Welcome you silly person\r
 257 "/" is current directory\r
 250 CWD command successful.\r
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)\r
 200 I modify TYPE as you wanted\r
 213 10\r
 150 Binary data connection for %TESTNUMBER () (10 bytes).\r

diff --git a/tests/data/test1354 b/tests/data/test1354
index dfba8ba3a5acb1e03d76c8a9a360ec8e885e1e9c..3bf6ddde16502ba3afdf9135965e4c0cee3621fb 100644 (file)
--- a/tests/data/test1354
+++ b/tests/data/test1354
@@ -56,7 +56,7 @@ mooo
 230 Welcome you silly person\r
 257 "/" is current directory\r
 250 CWD command successful.\r
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)\r
 200 I modify TYPE as you wanted\r
 213 10\r
 150 Binary data connection for %TESTNUMBER () (10 bytes).\r

diff --git a/tests/data/test1357 b/tests/data/test1357
index 25ce6b24b763b1ddf1b11d1acd9bd69345fd3e79..7e83e87feb18b91b9fa4d6fdeb4d53aaa6590c0b 100644 (file)
--- a/tests/data/test1357
+++ b/tests/data/test1357
@@ -71,7 +71,7 @@ MOOOO
 230 Welcome you silly person\r
 257 "/" is current directory\r
 250 CWD command successful.\r
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)\r
 200 I modify TYPE as you wanted\r
 213 214\r
 150 Binary data connection for %TESTNUMBER () (214 bytes).\r

diff --git a/tests/data/test1358 b/tests/data/test1358
index c5e3ce80fb1c3d92e2315ae9856bc2e158c2319e..3eb623cb6b6cc009d4d7d88aee8cce453c2fa0a1 100644 (file)
--- a/tests/data/test1358
+++ b/tests/data/test1358
@@ -71,7 +71,7 @@ MOOOO
 230 Welcome you silly person\r
 257 "/" is current directory\r
 250 CWD command successful.\r
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)\r
 200 I modify TYPE as you wanted\r
 213 214\r
 150 Binary data connection for %TESTNUMBER () (214 bytes).\r

diff --git a/tests/data/test1359 b/tests/data/test1359
index e7d005860073111a139c478a6aee7a9671e4c636..98765b285d0ea2ad894e886cf0a481e8bbb62cab 100644 (file)
--- a/tests/data/test1359
+++ b/tests/data/test1359
@@ -72,7 +72,7 @@ MOOOO
 230 Welcome you silly person\r
 257 "/" is current directory\r
 250 CWD command successful.\r
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)\r
 200 I modify TYPE as you wanted\r
 213 214\r
 150 Binary data connection for %TESTNUMBER () (214 bytes).\r

diff --git a/tests/data/test1360 b/tests/data/test1360
index 794ba6453671cdf77cd5979daba4ff905e9252e9..117ef84b375e7b55c538e58f252d259af331176c 100644 (file)
--- a/tests/data/test1360
+++ b/tests/data/test1360
@@ -72,7 +72,7 @@ MOOOO
 230 Welcome you silly person\r
 257 "/" is current directory\r
 250 CWD command successful.\r
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)\r
 200 I modify TYPE as you wanted\r
 213 214\r
 150 Binary data connection for %TESTNUMBER () (214 bytes).\r

diff --git a/tests/data/test1361 b/tests/data/test1361
index 13138941d7035e6d25647d390261a6706a54e55c..9215c23ca293c68eade8e0f587b6a9dac27da62b 100644 (file)
--- a/tests/data/test1361
+++ b/tests/data/test1361
@@ -71,7 +71,7 @@ MOOOO
 230 Welcome you silly person\r
 257 "/" is current directory\r
 250 CWD command successful.\r
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)\r
 200 I modify TYPE as you wanted\r
 213 214\r
 150 Binary data connection for %TESTNUMBER () (214 bytes).\r

diff --git a/tests/data/test1362 b/tests/data/test1362
index 1ffa1a2e9aad1a2cb838bd4e77b3206e7c620499..9ad0fa742416b9db4be69e228d2450c6e3a32a8c 100644 (file)
--- a/tests/data/test1362
+++ b/tests/data/test1362
@@ -71,7 +71,7 @@ MOOOO
 230 Welcome you silly person\r
 257 "/" is current directory\r
 250 CWD command successful.\r
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)\r
 200 I modify TYPE as you wanted\r
 213 214\r
 150 Binary data connection for %TESTNUMBER () (214 bytes).\r

diff --git a/tests/data/test1379 b/tests/data/test1379
index 5faf44ac1bb3ed24f784acb0825ff42ef9732e61..953c9b6cd8c78d6cd3e45080b90b999b3c00cab6 100644 (file)
--- a/tests/data/test1379
+++ b/tests/data/test1379
@@ -56,7 +56,7 @@ mooo
 230 Welcome you silly person\r
 257 "/" is current directory\r
 250 CWD command successful.\r
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)\r
 200 I modify TYPE as you wanted\r
 213 10\r
 150 Binary data connection for %TESTNUMBER () (10 bytes).\r

diff --git a/tests/data/test1380 b/tests/data/test1380
index 02db86ac271f34c272910486eae27be416d3ee17..b106b3c7fcb559aab7512985c480a505790ea32c 100644 (file)
--- a/tests/data/test1380
+++ b/tests/data/test1380
@@ -56,7 +56,7 @@ mooo
 230 Welcome you silly person\r
 257 "/" is current directory\r
 250 CWD command successful.\r
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)\r
 200 I modify TYPE as you wanted\r
 213 10\r
 150 Binary data connection for %TESTNUMBER () (10 bytes).\r

diff --git a/tests/data/test1381 b/tests/data/test1381
index 4ae53c38cb35bb5c532664410c064a35275ee7bc..7d4ef7ba333cdec73e34456795ac6a58a3b6d89f 100644 (file)
--- a/tests/data/test1381
+++ b/tests/data/test1381
@@ -57,7 +57,7 @@ mooo
 230 Welcome you silly person\r
 257 "/" is current directory\r
 250 CWD command successful.\r
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)\r
 200 I modify TYPE as you wanted\r
 213 10\r
 150 Binary data connection for %TESTNUMBER () (10 bytes).\r

diff --git a/tests/data/test1382 b/tests/data/test1382
index bce914faa6827e23a77afe04cab9de0cdc874b8c..7c4cc6e290d79ef308d1d206f482ba604dc62c05 100644 (file)
--- a/tests/data/test1382
+++ b/tests/data/test1382
@@ -57,7 +57,7 @@ mooo
 230 Welcome you silly person\r
 257 "/" is current directory\r
 250 CWD command successful.\r
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)\r
 200 I modify TYPE as you wanted\r
 213 10\r
 150 Binary data connection for %TESTNUMBER () (10 bytes).\r

diff --git a/tests/data/test1383 b/tests/data/test1383
index 23a9ec55bae8909f5a83accd125334ff6389bb33..c8b1d119b978e13b9c6410c61122d74766eec702 100644 (file)
--- a/tests/data/test1383
+++ b/tests/data/test1383
@@ -56,7 +56,7 @@ mooo
 230 Welcome you silly person\r
 257 "/" is current directory\r
 250 CWD command successful.\r
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)\r
 200 I modify TYPE as you wanted\r
 213 10\r
 150 Binary data connection for %TESTNUMBER () (10 bytes).\r

diff --git a/tests/data/test1384 b/tests/data/test1384
index 459a4e0236b1fc19d918fed55f38216ac97955c1..3f99d28bfe6a3ba3b81bd111aad0cb9d2e92ffc5 100644 (file)
--- a/tests/data/test1384
+++ b/tests/data/test1384
@@ -56,7 +56,7 @@ mooo
 230 Welcome you silly person\r
 257 "/" is current directory\r
 250 CWD command successful.\r
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)\r
 200 I modify TYPE as you wanted\r
 213 10\r
 150 Binary data connection for %TESTNUMBER () (10 bytes).\r

diff --git a/tests/data/test1387 b/tests/data/test1387
index 44b7d8aea2c57c9f5c4524a0d3acdb08a2af335f..a5531aa20146301fb13deba5bbc90906f46b8b05 100644 (file)
--- a/tests/data/test1387
+++ b/tests/data/test1387
@@ -71,7 +71,7 @@ MOOOO
 230 Welcome you silly person\r
 257 "/" is current directory\r
 250 CWD command successful.\r
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)\r
 200 I modify TYPE as you wanted\r
 213 222\r
 150 Binary data connection for %TESTNUMBER () (222 bytes).\r

diff --git a/tests/data/test1388 b/tests/data/test1388
index 6bb799727956c2533bcbf59c3b51c0bf35140733..8630be7877b569cb24424aca92c9f7a4479a18e0 100644 (file)
--- a/tests/data/test1388
+++ b/tests/data/test1388
@@ -71,7 +71,7 @@ MOOOO
 230 Welcome you silly person\r
 257 "/" is current directory\r
 250 CWD command successful.\r
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)\r
 200 I modify TYPE as you wanted\r
 213 222\r
 150 Binary data connection for %TESTNUMBER () (222 bytes).\r

diff --git a/tests/data/test1389 b/tests/data/test1389
index 5c6979bd31952ffaddef69cd46a333d41b9d4df2..53fda6cd590ebf8c259a05b25f48889bd90420c8 100644 (file)
--- a/tests/data/test1389
+++ b/tests/data/test1389
@@ -72,7 +72,7 @@ MOOOO
 230 Welcome you silly person\r
 257 "/" is current directory\r
 250 CWD command successful.\r
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)\r
 200 I modify TYPE as you wanted\r
 213 222\r
 150 Binary data connection for %TESTNUMBER () (222 bytes).\r

diff --git a/tests/data/test1390 b/tests/data/test1390
index e263fef96966956eeb5692ab38505ef1543c5ae1..b86e099d75921113f9eda2bda2fc20a7d4828b10 100644 (file)
--- a/tests/data/test1390
+++ b/tests/data/test1390
@@ -72,7 +72,7 @@ MOOOO
 230 Welcome you silly person\r
 257 "/" is current directory\r
 250 CWD command successful.\r
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)\r
 200 I modify TYPE as you wanted\r
 213 222\r
 150 Binary data connection for %TESTNUMBER () (222 bytes).\r

diff --git a/tests/data/test1391 b/tests/data/test1391
index 063294b8e7b61bffaa82df88843b230de0dd74b2..d9350b86773c7deeb1bdfb99e022a579b0a3007b 100644 (file)
--- a/tests/data/test1391
+++ b/tests/data/test1391
@@ -71,7 +71,7 @@ MOOOO
 230 Welcome you silly person\r
 257 "/" is current directory\r
 250 CWD command successful.\r
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)\r
 200 I modify TYPE as you wanted\r
 213 222\r
 150 Binary data connection for %TESTNUMBER () (222 bytes).\r

diff --git a/tests/data/test1392 b/tests/data/test1392
index 824cc214c2d93ba8c7a8b9ba89c699405f00291d..572841e5b5b94138210ad7d45ce8f90b2427e63a 100644 (file)
--- a/tests/data/test1392
+++ b/tests/data/test1392
@@ -71,7 +71,7 @@ MOOOO
 230 Welcome you silly person\r
 257 "/" is current directory\r
 250 CWD command successful.\r
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)\r
 200 I modify TYPE as you wanted\r
 213 222\r
 150 Binary data connection for %TESTNUMBER () (222 bytes).\r

diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl
index 71d6774fd1ea29c438690c34cb3e113cceb4f954..f70fa0d0ee7e639f49a1d94082d66c368a487715 100755 (executable)
--- 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 ".