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/test101 | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'tests/data/test101')

diff --git a/tests/data/test101 b/tests/data/test101
index a9314a71f..815292b2c 100644
--- a/tests/data/test101
+++ b/tests/data/test101
@@ -34,17 +34,16 @@ ftp
 FTP dir list, PORT with specified IP
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/ -P %HOSTIP
+ftp://%HOSTIP:%FTPPORT/ -P %CLIENTIP
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
-# strip all kinds of PORT, EPRT and LPRT curl can do
+# Strip all valid kinds of PORT and EPRT that curl can send
 <strip>
-^PORT 127,0,0,1,.*
-^EPRT.*
-^LPRT.*
+^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}\|
 </strip>
 <protocol>
 USER anonymous
-- 
cgit v1.2.3