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/test212 | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'tests/data/test212')

diff --git a/tests/data/test212 b/tests/data/test212
index d00e677d7..9a802c0c3 100644
--- a/tests/data/test212
+++ b/tests/data/test212
@@ -31,9 +31,10 @@ data blobb
 
 # Verify data after the test has been "shot"
 <verify>
+# Strip the addresses and port number but leave the rest
 <strippart>
-s/^(EPRT \|1\|127.0.0.1).*/$1/
-s/^(PORT 127,0,0,1,).*/$1/
+s/^(EPRT \|1\|)\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\|\d{1,5}\|/$1/
+s/^(PORT )\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3}/$1/
 </strippart>
 <protocol>
 USER anonymous
@@ -41,12 +42,12 @@ PASS ftp@example.com
 PWD
 CWD a
 CWD path
-EPRT |1|127.0.0.1
-PORT 127,0,0,1,
+EPRT |1|
+PORT 
 TYPE I
 SIZE 212
 RETR 212
-PORT 127,0,0,1,
+PORT 
 SIZE 212
 RETR 212
 QUIT
-- 
cgit v1.2.3