Added tests 1057 and 1058 to test FTP and HTTPS transfers with ranges

relative to end of file.

diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index e6df0cca04ca75612802b0c26b2c6b8cb1df5716..46199f94404d128bce9952d422807bd5de8fe3d8 100644 (file)
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -55,7 +55,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46           \
  test1033 test539 test1034 test1035 test1036 test1037 test1038 test1039    \
  test1040 test1041 test1042 test1043 test1044 test1045 test1046 test1047   \
  test1048 test1049 test1050 test1051 test1052 test1053 test1054 test1055   \
- test1056
+ test1056 test1057 test1058
 
 filecheck:
        @mkdir test-place; \

diff --git a/tests/data/test1057 b/tests/data/test1057
new file mode 100644 (file)
index 0000000..cfb88f2
--- /dev/null
+++ b/tests/data/test1057
@@ -0,0 +1,51 @@
+<testcase>
+<info>
+<keywords>
+FTP
+EPSV
+RETR
+Range
+</keywords>
+</info>
+
+# Server-side
+<reply>
+<data>
+456789abcdef
+</data>
+<datacheck nonewline="yes">
+456789abcdef
+</datacheck>
+<size>
+64
+</size>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP retrieve a byte-range relative to end of file
+ </name>
+ <command>
+-r -12 ftp://%HOSTIP:%FTPPORT/1057
+</command>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+USER anonymous\r
+PASS ftp@example.com\r
+PWD\r
+EPSV\r
+TYPE I\r
+SIZE 1057\r
+REST 52\r
+RETR 1057\r
+QUIT\r
+</protocol>
+</verify>
+</testcase>

diff --git a/tests/data/test1058 b/tests/data/test1058
new file mode 100644 (file)
index 0000000..0553b14
--- /dev/null
+++ b/tests/data/test1058
@@ -0,0 +1,53 @@
+<testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+Content-Range
+</keywords>
+</info>
+
+# Server-side
+<reply>
+<data>
+HTTP/1.1 206 Partial Content\r
+Date: Thu, 31 Jul 2008 13:41:09 GMT\r
+Accept-Ranges: bytes\r
+Content-Length: 101\r
+Content-Range: bytes 100-200/201\r
+Connection: close\r
+Content-Type: text/html\r
+\r
+..partial data returned from the
+server as a result of setting an explicit byte range
+in the request
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP range support
+ </name>
+ <command>
+http://%HOSTIP:%HTTPPORT/want/1058 -r -101
+</command>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /want/1058 HTTP/1.1\r
+Range: bytes=-101\r
+Host: %HOSTIP:%HTTPPORT\r
+Accept: */*\r
+\r
+</protocol>
+</verify>
+</testcase>