From 4ff37a4ed164552d9c50077952616f3aaf16e794 Mon Sep 17 00:00:00 2001 From: Dan Fandrich Date: Tue, 29 Jul 2008 01:05:28 +0000 Subject: [PATCH] Added test case 1050 to test --ftp-port with an IPv6 address. Made --interface tests less restrictive on host address. --- CHANGES | 2 ++ tests/data/Makefile.am | 2 +- tests/data/test1045 | 6 +--- tests/data/test1046 | 4 +-- tests/data/test1047 | 6 +--- tests/data/test1048 | 4 +-- tests/data/test1049 | 6 +--- tests/data/test1050 | 66 ++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 76 insertions(+), 20 deletions(-) create mode 100644 tests/data/test1050 diff --git a/CHANGES b/CHANGES index 26c6c5c5c..3b82c5734 100644 --- a/CHANGES +++ b/CHANGES @@ -13,6 +13,8 @@ Daniel Fandrich (28 Jul 2008) - Added test cases 1045 through 1049 as simple tests of --interface using the localhost interface. +- Added test case 1050 to test --ftp-port with an IPv6 address + Daniel Stenberg (26 Jul 2008) - David Bau filed bug report #2026240 "CURL_READFUNC_PAUSE leads to buffer overrun" (http://curl.haxx.se/bug/view.cgi?id=2026240) identifying two diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index e55dd4b27..81d5080b4 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -54,7 +54,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46 \ test556 test1031 test628 test629 test630 test631 test632 test1032 \ test1033 test539 test1034 test1035 test1036 test1037 test1038 test1039 \ test1040 test1041 test1042 test1043 test1044 test1045 test1046 test1047 \ - test1048 test1049 + test1048 test1049 test1050 filecheck: @mkdir test-place; \ diff --git a/tests/data/test1045 b/tests/data/test1045 index 3f4cd7150..97f3a7297 100644 --- a/tests/data/test1045 +++ b/tests/data/test1045 @@ -32,12 +32,8 @@ http HTTP GET with localhost --interface -http://%HOSTIP:%HTTPPORT/1045 --interface 127.0.0.1 +http://%HOSTIP:%HTTPPORT/1045 --interface %CLIENTIP -# When bound to localhost, one may connect only to a local test server - -perl -e "print 'Test requires default test server host address' if ( '%HOSTIP' ne '127.0.0.1' );" - # diff --git a/tests/data/test1046 b/tests/data/test1046 index 773d99967..59da6dce4 100644 --- a/tests/data/test1046 +++ b/tests/data/test1046 @@ -38,9 +38,9 @@ HTTP-IPv6 GET with localhost --interface -g "http://%HOST6IP:%HTTP6PORT/1046" --interface ::1 -# When bound to ip6-localhost, one may connect only to a local test server +# --interface doesn't accept an address surrounded by [] so %CLIENT6IP is out -perl -e "print 'Test requires default test server host address' if ( '%HOST6IP' ne '[::1]' );" +perl -e "print 'Test requires default test server host address' if ( '%CLIENT6IP' ne '[::1]' );" diff --git a/tests/data/test1047 b/tests/data/test1047 index 10760de4a..421708cc4 100644 --- a/tests/data/test1047 +++ b/tests/data/test1047 @@ -38,12 +38,8 @@ ftp FTP dir list PASV with localhost --interface -ftp://%HOSTIP:%FTPPORT/ --interface 127.0.0.1 +ftp://%HOSTIP:%FTPPORT/ --interface %CLIENTIP -# When bound to localhost, one may connect only to a local test server - -perl -e "print 'Test requires default test server host address' if ( '%HOSTIP' ne '127.0.0.1' );" - # diff --git a/tests/data/test1048 b/tests/data/test1048 index 2262fe836..cba99ba75 100644 --- a/tests/data/test1048 +++ b/tests/data/test1048 @@ -44,9 +44,9 @@ FTP-IPv6 dir list PASV with localhost --interface -g "ftp://%HOST6IP:%FTP6PORT/" --interface ::1 -# When bound to localhost, one may connect only to a local test server +# --interface doesn't accept an address surrounded by [] so %CLIENT6IP is out -perl -e "print 'Test requires default test server host address' if ( '%HOST6IP' ne '[::1]' );" +perl -e "print 'Test requires default test server host address' if ( '%CLIENT6IP' ne '[::1]' );" diff --git a/tests/data/test1049 b/tests/data/test1049 index 964724743..e6054a478 100644 --- a/tests/data/test1049 +++ b/tests/data/test1049 @@ -28,12 +28,8 @@ tftp TFTP retrieve with localhost --interface -tftp://%HOSTIP:%TFTPPORT//1049 --trace-ascii log/traceit --interface 127.0.0.1 +tftp://%HOSTIP:%TFTPPORT//1049 --trace-ascii log/traceit --interface %CLIENTIP -# When bound to localhost, one may connect only to a local test server - -perl -e "print 'Test requires default test server host address' if ( '%HOSTIP' ne '127.0.0.1' );" - # diff --git a/tests/data/test1050 b/tests/data/test1050 new file mode 100644 index 000000000..1abb9b1ce --- /dev/null +++ b/tests/data/test1050 @@ -0,0 +1,66 @@ + +# Similar to test 253 + + +FTP-ipv6 +IPv6 +EPRT + + + +# Server-side + +# When doing LIST, we get the default list output hard-coded in the test +# FTP server + +total 20 +drwxr-xr-x 8 98 98 512 Oct 22 13:06 . +drwxr-xr-x 8 98 98 512 Oct 22 13:06 .. +drwxr-xr-x 2 98 98 512 May 2 1996 .NeXT +-r--r--r-- 1 0 1 35 Jul 16 1996 README +lrwxrwxrwx 1 0 1 7 Dec 9 1999 bin -> usr/bin +dr-xr-xr-x 2 0 1 512 Oct 1 1997 dev +drwxrwxrwx 2 98 98 512 May 29 16:04 download.html +dr-xr-xr-x 2 0 1 512 Nov 30 1995 etc +drwxrwxrwx 2 98 1 512 Oct 30 14:33 pub +dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr + + + +# Client-side + + +ipv6 + + +ftp-ipv6 + + +FTP-IPv6 dir list, EPRT with specified IP + + +-g "ftp://%HOST6IP:%FTP6PORT/" -P ::1 + +# --interface doesn't accept an address surrounded by [] so %CLIENT6IP is out + +perl -e "print 'Test requires default test server host address' if ( '%CLIENT6IP' ne '[::1]' );" + + + +# Verify data after the test has been "shot" + +# Strip all valid kinds of EPRT that curl can send + +s/^(EPRT \|2\|::1\|)(.*)/$1/ + + +USER anonymous +PASS ftp@example.com +PWD +EPRT |2|::1| +TYPE A +LIST +QUIT + + +