From: robertc <>
Date: Wed, 18 Jun 2003 18:34:51 +0000 (+0000)
Subject: Summary: Apply Leeann Bent's patch for bug #647.
X-Git-Tag: SQUID_3_0_PRE1~126
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7329b75466536350abeca49f4a9e64fef67c650;p=thirdparty%2Fsquid.git

Summary: Apply Leeann Bent's patch for bug #647.
Keywords:

Apply Leeann Bent's patch for bug #647.
Added Leeann as a contributor.
---

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 7d82246496..31c4e29772 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -88,5 +88,6 @@ and ideas to make this software available.
 	Ian Castle <ian.castle@coldcomfortfarm.net>
 	Brad Smitch <brad@comstyle.com>
 	Jerry Murdock <jmurdock@itraktech.com>
+	Leeann Bent <lbent@cs.ucsd.edu>
 
 	Duane Wessels <wessels@squid-cache.org>
diff --git a/src/client_side.cc b/src/client_side.cc
index 81a8cd1700..2d2dc26ca9 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.637 2003/05/24 12:09:03 robertc Exp $
+ * $Id: client_side.cc,v 1.638 2003/06/18 12:34:51 robertc Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -901,12 +901,15 @@ ClientSocketContext::packRange(const char **buf,
          */
         assert(available >= 0 && i->debt() >= 0 || i->debt() == -1);
 
-        if (i->debt() == 0)
-            /* put terminating boundary for multiparts */
-            clientPackTermBound(i->boundary, mb);
+        if (!canPackMoreRanges()) {
+            debug(33, 3) ("clientPackRange: Returning because !canPackMoreRanges.\n");
+
+            if (i->debt() == 0)
+                /* put terminating boundary for multiparts */
+                clientPackTermBound(i->boundary, mb);
 
-        if (!canPackMoreRanges())
             return;
+        }
 
         off_t next = getNextRangeOffset();