From f042a7419d21eb0c0c6d7b6fe526eb93e7a78bbb Mon Sep 17 00:00:00 2001 From: Dan Fandrich Date: Mon, 28 Jul 2008 18:39:32 +0000 Subject: Added test cases 1045 through 1049 as simple tests of --interface using the localhost interface. --- CHANGES | 7 ++++++ tests/data/Makefile.am | 3 ++- tests/data/test1045 | 56 ++++++++++++++++++++++++++++++++++++++++++ tests/data/test1046 | 60 +++++++++++++++++++++++++++++++++++++++++++++ tests/data/test1047 | 62 +++++++++++++++++++++++++++++++++++++++++++++++ tests/data/test1048 | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++ tests/data/test1049 | 48 ++++++++++++++++++++++++++++++++++++ 7 files changed, 301 insertions(+), 1 deletion(-) create mode 100644 tests/data/test1045 create mode 100644 tests/data/test1046 create mode 100644 tests/data/test1047 create mode 100644 tests/data/test1048 create mode 100644 tests/data/test1049 diff --git a/CHANGES b/CHANGES index b1812f9bb..26c6c5c5c 100644 --- a/CHANGES +++ b/CHANGES @@ -6,6 +6,13 @@ Changelog +Daniel Fandrich (28 Jul 2008) +- Fixed display of the interface bind address in the trace output when it's + an IPv6 address. + +- Added test cases 1045 through 1049 as simple tests of --interface using the + localhost interface. + 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 b55db6c3a..e55dd4b27 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -53,7 +53,8 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46 \ test1024 test1025 test555 test1026 test1027 test1028 test1029 test1030 \ test556 test1031 test628 test629 test630 test631 test632 test1032 \ test1033 test539 test1034 test1035 test1036 test1037 test1038 test1039 \ - test1040 test1041 test1042 test1043 test1044 + test1040 test1041 test1042 test1043 test1044 test1045 test1046 test1047 \ + test1048 test1049 filecheck: @mkdir test-place; \ diff --git a/tests/data/test1045 b/tests/data/test1045 new file mode 100644 index 000000000..3f4cd7150 --- /dev/null +++ b/tests/data/test1045 @@ -0,0 +1,56 @@ + + + +HTTP +HTTP GET +--interface + + + +# +# Server-side + + +HTTP/1.1 200 OK +Date: Mon, 28 Jul 2008 14:49:00 GMT +Server: test-server/fake +Content-Length: 6 +Connection: close +Content-Type: text/plain + +-foo- + + + +# +# Client-side + + +http + + +HTTP GET with localhost --interface + + +http://%HOSTIP:%HTTPPORT/1045 --interface 127.0.0.1 + +# 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' );" + + + +# +# Verify data after the test has been "shot" + + +^User-Agent:.* + + +GET /1045 HTTP/1.1 +Host: %HOSTIP:%HTTPPORT +Accept: */* + + + + diff --git a/tests/data/test1046 b/tests/data/test1046 new file mode 100644 index 000000000..773d99967 --- /dev/null +++ b/tests/data/test1046 @@ -0,0 +1,60 @@ + + + +HTTP +HTTP GET +--interface +IPv6 + + + +# +# Server-side + + +HTTP/1.1 200 OK +Date: Mon, 28 Jul 2008 14:49:00 GMT +Server: test-server/fake +Content-Length: 6 +Connection: close +Content-Type: text/plain + +-foo- + + + +# +# Client-side + + +ipv6 + + +http-ipv6 + + +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 + +perl -e "print 'Test requires default test server host address' if ( '%HOST6IP' ne '[::1]' );" + + + +# +# Verify data after the test has been "shot" + + +^User-Agent:.* + + +GET /1046 HTTP/1.1 +Host: %HOST6IP:%HTTP6PORT +Accept: */* + + + + diff --git a/tests/data/test1047 b/tests/data/test1047 new file mode 100644 index 000000000..10760de4a --- /dev/null +++ b/tests/data/test1047 @@ -0,0 +1,62 @@ + + + +FTP +PASV +LIST +--interface + + + +# +# 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 + + +ftp + + +FTP dir list PASV with localhost --interface + + +ftp://%HOSTIP:%FTPPORT/ --interface 127.0.0.1 + +# 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' );" + + + +# +# Verify data after the test has been "shot" + + +USER anonymous +PASS ftp@example.com +PWD +EPSV +TYPE A +LIST +QUIT + + + diff --git a/tests/data/test1048 b/tests/data/test1048 new file mode 100644 index 000000000..2262fe836 --- /dev/null +++ b/tests/data/test1048 @@ -0,0 +1,66 @@ + + + +FTP +PASV +LIST +--interface +IPv6 + + + +# +# 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 PASV with localhost --interface + + +-g "ftp://%HOST6IP:%FTP6PORT/" --interface ::1 + +# When bound to localhost, one may connect only to a local test server + +perl -e "print 'Test requires default test server host address' if ( '%HOST6IP' ne '[::1]' );" + + + +# +# Verify data after the test has been "shot" + + +USER anonymous +PASS ftp@example.com +PWD +EPSV +TYPE A +LIST +QUIT + + + diff --git a/tests/data/test1049 b/tests/data/test1049 new file mode 100644 index 000000000..964724743 --- /dev/null +++ b/tests/data/test1049 @@ -0,0 +1,48 @@ + + + +TFTP +TFTP RRQ +--interface + + + +# +# Server-side + + +a chunk of +data +returned + to client + + + +# +# Client-side + + +tftp + + +TFTP retrieve with localhost --interface + + +tftp://%HOSTIP:%TFTPPORT//1049 --trace-ascii log/traceit --interface 127.0.0.1 + +# 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' );" + + + +# +# Verify pseudo protocol after the test has been "shot" + + +opcode: 1 +filename: /1049 +mode: octet + + + -- cgit v1.2.3