Added test1042 and test1043 to test -C - on HTTP.

diff --git a/CHANGES b/CHANGES
index 2622c81..f5ffabd 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,8 +7,8 @@
                                   Changelog
 
 Daniel Fandrich (14 Jul 2008)
-- Added test1040 and test1041 to test -C - on HTTP. Test 1041 failed so it's
-  added to DISABLED.
+- Added test1040 through test1043 to test -C - on HTTP. Test 1041 failed so
+  it's added to DISABLED.
 
 Yang Tse (14 Jul 2008)
 - HTTP_ONLY definition check in lib/setup.h is now done once that configuration

diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index dbefa9c..625bc5f 100644 (file)
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -53,7 +53,7 @@ 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
+ test1040 test1041 test1042 test1043
 
 filecheck:
        @mkdir test-place; \

diff --git a/tests/data/test1041 b/tests/data/test1041
index 825cdaf..fa1692c 100644 (file)
--- a/tests/data/test1041
+++ b/tests/data/test1041
@@ -1,4 +1,5 @@
 <testcase>
+# Similar to test33
 <info>
 <keywords>
 HTTP
@@ -52,6 +53,8 @@ http://%HOSTIP:%HTTPPORT/1041 -Tlog/test1041.txt -C -
 <strip>
 ^User-Agent:.*
 </strip>
+# curl doesn't do a HEAD request on the remote file so it has no idea whether
+# it can skip part of the file or not.  Instead, it sends the entire file.
 <protocol>
 PUT /1041 HTTP/1.1\r
 Content-Range: bytes 0-99/100\r

diff --git a/tests/data/test1042 b/tests/data/test1042
new file mode 100644 (file)
index 0000000..d532120
--- /dev/null
+++ b/tests/data/test1042
@@ -0,0 +1,94 @@
+<testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+Resume
+FAILURE
+</keywords>
+</info>
+
+# Server-side
+<reply>
+# Some servers (e.g. Apache 1.2) respond this way to an invalid byte range
+<data>
+HTTP/1.1 200 OK\r
+Connection: close\r
+Content-Length: 100\r
+Content-Type: text/plain\r
+\r
+012345678
+012345678
+012345678
+012345678
+012345678
+012345678
+012345678
+012345678
+012345678
+012345678
+</data>
+
+# The file data that exists at the start of the test must be included in
+# the verification.
+<datacheck>
+012345678
+012345678
+012345678
+012345678
+012345678
+012345678
+012345678
+012345678
+012345678
+012345678
+HTTP/1.1 200 OK\r
+Connection: close\r
+Content-Length: 100\r
+Content-Type: text/plain\r
+\r
+</datacheck>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP GET from end of entirely-downloaded file, no server resume
+ </name>
+ <command>
+http://%HOSTIP:%HTTPPORT/1042 -C -
+</command>
+<file name="log/curl1042.out">
+012345678
+012345678
+012345678
+012345678
+012345678
+012345678
+012345678
+012345678
+012345678
+012345678
+</file>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<errorcode>
+33
+</errorcode>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /1042 HTTP/1.1\r
+Range: bytes=100-\r
+Host: %HOSTIP:%HTTPPORT\r
+Accept: */*\r
+\r
+</protocol>
+</verify>
+</testcase>

diff --git a/tests/data/test1043 b/tests/data/test1043
new file mode 100644 (file)
index 0000000..f9bd105
--- /dev/null
+++ b/tests/data/test1043
@@ -0,0 +1,84 @@
+<testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+Resume
+</keywords>
+</info>
+
+# Server-side
+<reply>
+<data>
+HTTP/1.1 206 Partial Content\r
+Date: Mon, 13 Nov 2007 13:41:09 GMT\r
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT\r
+Accept-Ranges: bytes\r
+Content-Length: 60\r
+Content-Range: bytes 40-99/100\r
+\r
+012345678
+012345678
+012345678
+012345678
+012345678
+012345678
+</data>
+
+# The file data that exists at the start of the test must be included in
+# the verification.
+<datacheck>
+012345678
+012345678
+012345678
+012345678
+HTTP/1.1 206 Partial Content\r
+Date: Mon, 13 Nov 2007 13:41:09 GMT\r
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT\r
+Accept-Ranges: bytes\r
+Content-Length: 60\r
+Content-Range: bytes 40-99/100\r
+\r
+012345678
+012345678
+012345678
+012345678
+012345678
+012345678
+</datacheck>
+
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP GET with resume from end of file
+ </name>
+ <command>
+http://%HOSTIP:%HTTPPORT/1043 -C -
+</command>
+<file name="log/curl1043.out">
+012345678
+012345678
+012345678
+012345678
+</file>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /1043 HTTP/1.1\r
+Range: bytes=40-\r
+Host: %HOSTIP:%HTTPPORT\r
+Accept: */*\r
+\r
+</protocol>
+</verify>
+</testcase>