From 7f496d8c3fd286f5d9738c8ad13f35912d7a6b7a Mon Sep 17 00:00:00 2001
From: Dan Fandrich <dan@coneharvesters.com>
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/test116 | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'tests/data/test116')

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>
-- 
cgit v1.2.3