Summary: Merge in Leeann Bent's fix for multipart requests.

Keywords:

multipart requests are not currently parsed: we make them uncachable and turn off the ranges flag in the request.

diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc
index ad849d0dbbe6d06927423011516e1f02c4a2a9bf..344a090a85ebe8e1345f1586260869a91c23a5dc 100644 (file)
--- a/src/client_side_reply.cc
+++ b/src/client_side_reply.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side_reply.cc,v 1.61 2003/07/16 07:21:22 hno Exp $
+ * $Id: client_side_reply.cc,v 1.62 2003/07/23 11:21:37 robertc Exp $
  *
  * DEBUG: section 88    Client-side Reply Routines
  * AUTHOR: Robert Collins (Originally Duane Wessels in client_side.c)
@@ -1917,6 +1917,11 @@ clientReplyContext::processReplyAccessResult(bool accessAllowed)
     char *buf = next()->readBuffer.data;
     char *body_buf = buf + rep->hdr_sz;
 
+    //Server side may disable ranges under some circumstances.
+
+    if ((!http->request->range))
+        next()->readBuffer.offset = 0;
+
     if (next()->readBuffer.offset != 0) {
         if (next()->readBuffer.offset > body_size) {
             /* Can't use any of the body we recieved. send nothing */