From 7f496d8c3fd286f5d9738c8ad13f35912d7a6b7a Mon Sep 17 00:00:00 2001 From: Dan Fandrich Date: Mon, 17 Sep 2007 21:44:57 +0000 Subject: Changed some FTP tests to validate the format of the PORT and EPRT commands sent by curl, if not the addresses themselves. --- tests/data/test103 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tests/data/test103') diff --git a/tests/data/test103 b/tests/data/test103 index 27d4cb0ef..15712f5da 100644 --- a/tests/data/test103 +++ b/tests/data/test103 @@ -33,18 +33,18 @@ ftp://%HOSTIP:%FTPPORT/a/path/103 -P - # Verify data after the test has been "shot" - -s/^LPRT.*[\r\n]*// -s/^EPRT.*[\r\n]*// -s/^(PORT 127,0,0,1,)([0-9,]+)/$1/ - +# Strip all valid kinds of PORT and EPRT that curl can send + +^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3} +^EPRT \|1\|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\|\d{1,5}\| + USER anonymous PASS ftp@example.com PWD CWD a CWD path -PORT 127,0,0,1, +PORT 127,0,0,1,0,0 TYPE I SIZE 103 RETR 103 -- cgit v1.2.3