From bf51f05a50a63ade21316a18d2bf1801767ab234 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 25 Nov 2004 22:21:49 +0000 Subject: FTP improvements: If EPSV, EPRT or LPRT is tried and doesn't work, it will not be retried on the same server again even if a following request is made using a persistent connection. If a second request is made to a server, requesting a file from the same directory as the previous request operated on, libcurl will no longer make that long series of CWD commands just to end up on the same spot. Note that this is only for *exactly* the same dir. There is still room for improvements to optimize the CWD-sending when the dirs are only slightly different. Added test 210, 211 and 212 to verify these changes. Had to improve the test script too and added a new primitive to the test file format. --- tests/data/Makefile.am | 2 +- tests/data/test210 | 43 +++++++++++++++++++++++++++++++++++++ tests/data/test211 | 47 +++++++++++++++++++++++++++++++++++++++++ tests/data/test212 | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 148 insertions(+), 1 deletion(-) create mode 100644 tests/data/test210 create mode 100644 tests/data/test211 create mode 100644 tests/data/test212 (limited to 'tests/data') diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index 16841cf71..e7a5fce85 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -28,7 +28,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46 \ test513 test514 test178 test179 test180 test181 test182 test183 \ test184 test185 test186 test187 test188 test189 test191 test192 \ test193 test194 test195 test196 test197 test198 test515 test516 \ - test517 test518 + test517 test518 test210 test211 test212 # The following tests have been removed from the dist since they no longer # work. We need to fix the test suite's FTPS server first, then bring them diff --git a/tests/data/test210 b/tests/data/test210 new file mode 100644 index 000000000..723508086 --- /dev/null +++ b/tests/data/test210 @@ -0,0 +1,43 @@ +# Server-side + + +data blobb + + +data blobb +data blobb + + + +# Client-side + + +ftp + + +Get two FTP files from the same remote dir: no second CWD + + +ftp://%HOSTIP:%FTPPORT/a/path/210 ftp://%HOSTIP:%FTPPORT/a/path/210 + + + +# Verify data after the test has been "shot" + + +USER anonymous +PASS curl_by_daniel@haxx.se +PWD +CWD a +CWD path +EPSV +TYPE I +SIZE 210 +RETR 210 +EPSV +TYPE I +SIZE 210 +RETR 210 +QUIT + + diff --git a/tests/data/test211 b/tests/data/test211 new file mode 100644 index 000000000..c59da0b1e --- /dev/null +++ b/tests/data/test211 @@ -0,0 +1,47 @@ +# Server-side + + +data blobb + + +data blobb +data blobb + + + +# Client-side + + +ftp + + +Get two FTP files with no remote EPSV support + + +ftp://%HOSTIP:%FTPPORT/a/path/211 ftp://%HOSTIP:%FTPPORT/a/path/211 + + +REPLY EPSV 500 no such command + + + +# Verify data after the test has been "shot" + + +USER anonymous +PASS curl_by_daniel@haxx.se +PWD +CWD a +CWD path +EPSV +PASV +TYPE I +SIZE 211 +RETR 211 +PASV +TYPE I +SIZE 211 +RETR 211 +QUIT + + diff --git a/tests/data/test212 b/tests/data/test212 new file mode 100644 index 000000000..cae7baff6 --- /dev/null +++ b/tests/data/test212 @@ -0,0 +1,57 @@ +# Server-side + + +data blobb + + +data blobb +data blobb + + + +# Client-side + + +ipv6 + + +ftp + + +Get two FTP files with no remote EPRT or LPRT support + + +ftp://%HOSTIP:%FTPPORT/a/path/212 ftp://%HOSTIP:%FTPPORT/a/path/212 -P - + + +REPLY EPRT 500 no such command +REPLY LPRT 500 no such command + + + +# Verify data after the test has been "shot" + + +s/^EPRT .*/EPRT stripped/ +s/^LPRT .*/LPRT stripped/ +s/^PORT .*/PORT stripped/ + + +USER anonymous +PASS curl_by_daniel@haxx.se +PWD +CWD a +CWD path +EPRT stripped +LPRT stripped +PORT stripped +TYPE I +SIZE 212 +RETR 212 +PORT stripped +TYPE I +SIZE 212 +RETR 212 +QUIT + + -- cgit v1.2.3