From: robertc <>
Date: Wed, 23 Jul 2003 17:21:37 +0000 (+0000)
Subject: Summary: Merge in Leeann Bent's fix for multipart requests.
X-Git-Tag: SQUID_3_0_PRE2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=49ea0125bd7962c94551f96be717aa5d6ef7868b;p=thirdparty%2Fsquid.git

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 ad849d0dbb..344a090a85 100644
--- 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 */