diff options
| author | Dan Fandrich <dan@coneharvesters.com> | 2007-09-17 21:44:57 +0000 |
|---|---|---|
| committer | Dan Fandrich <dan@coneharvesters.com> | 2007-09-17 21:44:57 +0000 |
| commit | 7f496d8c3fd286f5d9738c8ad13f35912d7a6b7a (patch) | |
| tree | cb8b94e27900f37561fb973371f6fe613e3d4938 /tests/data/test116 | |
| parent | 048c74f2fad85c24a8d36b06a944884686a99f61 (diff) | |
Changed some FTP tests to validate the format of the PORT and EPRT commands
sent by curl, if not the addresses themselves.
Diffstat (limited to 'tests/data/test116')
| -rw-r--r-- | tests/data/test116 | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/tests/data/test116 b/tests/data/test116 index d3718e393..b396c96b2 100644 --- a/tests/data/test116 +++ b/tests/data/test116 @@ -22,7 +22,7 @@ ftp FTP download, failed PORT </name> <command> -ftp://%HOSTIP:%FTPPORT/116 -P 127.0.0.1 +ftp://%HOSTIP:%FTPPORT/116 -P 1.2.3.4 </command> </client> @@ -31,15 +31,17 @@ ftp://%HOSTIP:%FTPPORT/116 -P 127.0.0.1 <errorcode> 30 </errorcode> -<strip> -^PORT 127,0,0,1,.* -^EPRT .* -^LPRT .* -</strip> +# Strip the port number but leave the rest +<strippart> +s/^(PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},)\d{1,3},\d{1,3}/$1/ +s/^(EPRT \|1\|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\|)\d{1,5}\|/$1/ +</strippart> <protocol> USER anonymous
PASS ftp@example.com
PWD
+EPRT |1|1.2.3.4|
+PORT 1,2,3,4,
QUIT
</protocol> </verify> |