mirror of
https://github.com/moparisthebest/curl
synced 2024-12-22 08:08:50 -05:00
Added test case 1050 to test --ftp-port with an IPv6 address.
Made --interface tests less restrictive on host address.
This commit is contained in:
Dan Fandrich
parent
fe167b6ba2
commit
4ff37a4ed1
2
CHANGES
2
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
|
||||
|
||||
@ -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; \
|
||||
|
||||
@ -32,12 +32,8 @@ http
|
||||
HTTP GET with localhost --interface
|
||||
</name>
|
||||
<command>
|
||||
http://%HOSTIP:%HTTPPORT/1045 --interface 127.0.0.1
|
||||
http://%HOSTIP:%HTTPPORT/1045 --interface %CLIENTIP
|
||||
</command>
|
||||
# When bound to localhost, one may connect only to a local test server
|
||||
<precheck>
|
||||
perl -e "print 'Test requires default test server host address' if ( '%HOSTIP' ne '127.0.0.1' );"
|
||||
</precheck>
|
||||
</client>
|
||||
|
||||
#
|
||||
|
||||
@ -38,9 +38,9 @@ HTTP-IPv6 GET with localhost --interface
|
||||
<command>
|
||||
-g "http://%HOST6IP:%HTTP6PORT/1046" --interface ::1
|
||||
</command>
|
||||
# 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
|
||||
<precheck>
|
||||
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]' );"
|
||||
</precheck>
|
||||
</client>
|
||||
|
||||
|
||||
@ -38,12 +38,8 @@ ftp
|
||||
FTP dir list PASV with localhost --interface
|
||||
</name>
|
||||
<command>
|
||||
ftp://%HOSTIP:%FTPPORT/ --interface 127.0.0.1
|
||||
ftp://%HOSTIP:%FTPPORT/ --interface %CLIENTIP
|
||||
</command>
|
||||
# When bound to localhost, one may connect only to a local test server
|
||||
<precheck>
|
||||
perl -e "print 'Test requires default test server host address' if ( '%HOSTIP' ne '127.0.0.1' );"
|
||||
</precheck>
|
||||
</client>
|
||||
|
||||
#
|
||||
|
||||
@ -44,9 +44,9 @@ FTP-IPv6 dir list PASV with localhost --interface
|
||||
<command>
|
||||
-g "ftp://%HOST6IP:%FTP6PORT/" --interface ::1
|
||||
</command>
|
||||
# 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
|
||||
<precheck>
|
||||
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]' );"
|
||||
</precheck>
|
||||
</client>
|
||||
|
||||
|
||||
@ -28,12 +28,8 @@ tftp
|
||||
TFTP retrieve with localhost --interface
|
||||
</name>
|
||||
<command>
|
||||
tftp://%HOSTIP:%TFTPPORT//1049 --trace-ascii log/traceit --interface 127.0.0.1
|
||||
tftp://%HOSTIP:%TFTPPORT//1049 --trace-ascii log/traceit --interface %CLIENTIP
|
||||
</command>
|
||||
# When bound to localhost, one may connect only to a local test server
|
||||
<precheck>
|
||||
perl -e "print 'Test requires default test server host address' if ( '%HOSTIP' ne '127.0.0.1' );"
|
||||
</precheck>
|
||||
</client>
|
||||
|
||||
#
|
||||
|
||||
66
tests/data/test1050
Normal file
66
tests/data/test1050
Normal file
@ -0,0 +1,66 @@
|
||||
<testcase>
|
||||
# Similar to test 253
|
||||
<info>
|
||||
<keywords>
|
||||
FTP-ipv6
|
||||
IPv6
|
||||
EPRT
|
||||
</keywords>
|
||||
</info>
|
||||
|
||||
# Server-side
|
||||
<reply>
|
||||
# When doing LIST, we get the default list output hard-coded in the test
|
||||
# FTP server
|
||||
<datacheck>
|
||||
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
|
||||
</datacheck>
|
||||
</reply>
|
||||
|
||||
# Client-side
|
||||
<client>
|
||||
<features>
|
||||
ipv6
|
||||
</features>
|
||||
<server>
|
||||
ftp-ipv6
|
||||
</server>
|
||||
<name>
|
||||
FTP-IPv6 dir list, EPRT with specified IP
|
||||
</name>
|
||||
<command>
|
||||
-g "ftp://%HOST6IP:%FTP6PORT/" -P ::1
|
||||
</command>
|
||||
# --interface doesn't accept an address surrounded by [] so %CLIENT6IP is out
|
||||
<precheck>
|
||||
perl -e "print 'Test requires default test server host address' if ( '%CLIENT6IP' ne '[::1]' );"
|
||||
</precheck>
|
||||
</client>
|
||||
|
||||
# Verify data after the test has been "shot"
|
||||
<verify>
|
||||
# Strip all valid kinds of EPRT that curl can send
|
||||
<strippart>
|
||||
s/^(EPRT \|2\|::1\|)(.*)/$1/
|
||||
</strippart>
|
||||
<protocol>
|
||||
USER anonymous
|
||||
PASS ftp@example.com
|
||||
PWD
|
||||
EPRT |2|::1|
|
||||
TYPE A
|
||||
LIST
|
||||
QUIT
|
||||
</protocol>
|
||||
</verify>
|
||||
</testcase>
|
||||
Loading…
Reference in New Issue
Block a user