- Eduard Bloch filed the debian bug report #487567

  (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=487567) pointing out that
  libcurl used Content-Range: instead of Range when doing a range request with
  --head (CURLOPT_NOBODY). This is now fixed and test case 1032 was added to
  verify.

diff --git a/CHANGES b/CHANGES
index 61b9fbc6fa2543aa943ee66eef92495c75c5f8b5..2951b1e99fecd6c20ca5438ff579f32ba8949aed 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,13 @@
 
                                   Changelog
 
+Daniel Stenberg (22 Jun 2008)
+- Eduard Bloch filed the debian bug report #487567
+  (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=487567) pointing out that
+  libcurl used Content-Range: instead of Range when doing a range request with
+  --head (CURLOPT_NOBODY). This is now fixed and test case 1032 was added to
+  verify.
+  
 Daniel Fandrich (21 Jun 2008)
 - Stopped using ranges in scanf character sequences (e.g. %[a-z]) since that
   is not ANSI C, just a common extension.  This caused problems on

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 91f09344103374e48025dc2b48c262031ed60abc..d94eb1e8abd6ef6900d9abd6647740a3b5ba1bc5 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -24,6 +24,7 @@ This release includes the following bugfixes:
  o curl_multi_socket() socket callback fix for close/re-create sockets case
  o SCP or SFTP over socks proxy crashed
  o RC4-MD5 cipher now works with NSS-built libcurl
+ o range requests with --head are now done correctly
 
 This release includes the following known bugs:
 
@@ -42,6 +43,6 @@ advice from friends like these:
 
  Lenny Rachitsky, Axel Tillequin, Arnaud Ebalard, Yang Tse, Dan Fandrich,
  Rob Crittenden, Dengminwen, Christopher Palow, Hans-Jurgen May,
- Phil Pellouchoud
+ Phil Pellouchoud, Eduard Bloch
 
         Thanks! (and sorry if I forgot to mention someone)

diff --git a/lib/http.c b/lib/http.c
index acb0f94d70e39eaeca2d4c4acfbcab2c6dc01435..280cccecb109210a4687606c09b954d89da90fdc 100644 (file)
--- a/lib/http.c
+++ b/lib/http.c
@@ -2298,7 +2298,7 @@ CURLcode Curl_http(struct connectdata *conn, bool *done)
      * or uploading and we always let customized headers override our internal
      * ones if any such are specified.
      */
-    if((httpreq == HTTPREQ_GET) &&
+    if(((httpreq == HTTPREQ_GET) || (httpreq == HTTPREQ_HEAD)) &&
        !checkheaders(data, "Range:")) {
       /* if a line like this was already allocated, free the previous one */
       if(conn->allocptr.rangeline)

diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 7ea9b3bf8e9f04cda04270bd2f864eba6dded273..d2068a302833caa6ee462dad80283242524114f7 100644 (file)
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -51,7 +51,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46           \
  test1021 test1022 test1023 test309 test616 test617 test618 test619        \
  test620 test621 test622 test623 test624 test625 test626 test627 test554   \
  test1024 test1025 test555 test1026 test1027 test1028 test1029 test1030    \
- test556 test1031 test628 test629 test630 test631 test632
+ test556 test1031 test628 test629 test630 test631 test632 test1032
 
 filecheck:
        @mkdir test-place; \

diff --git a/tests/data/test1032 b/tests/data/test1032
new file mode 100644 (file)
index 0000000..614cdbf
--- /dev/null
+++ b/tests/data/test1032
@@ -0,0 +1,56 @@
+<testcase>
+<info>
+<keywords>
+HTTP
+HTTP HEAD
+range
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+ETag: "21025-dc7-39462498"
+Accept-Ranges: bytes
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Funny-head: yesyes
+
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP HEAD with --range
+ </name>
+ <command>
+--range 1-3 --head http://%HOSTIP:%HTTPPORT/1032
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+HEAD /1032 HTTP/1.1\r
+Range: bytes=1-3\r
+Host: %HOSTIP:%HTTPPORT\r
+Accept: */*\r
+\r
+</protocol>
+</verify>
+</testcase>