From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Thu, 28 Jun 2012 05:11:18 +0000 (-0600)
Subject: Account for Store disk client quota when bandwidth-limiting the server.
X-Git-Tag: SQUID_3_2_0_18~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2fdea1bdb5ebac5bd31d0dd6a92fcefedf449d0c;p=thirdparty%2Fsquid.git

Account for Store disk client quota when bandwidth-limiting the server.

It is not clear why the store client type matters when
MemObject::mostBytesAllowed() is trying to find the maximum delay pool
quota for reading from the next hop HTTP server.  Whether the client(s)
are reading from disk or RAM, the corresponding server-side bandwidth
ought to be limited.

This code was removed as a part of bug 3462 investigation, but it is not
needed to fix bug 3462.
---

diff --git a/src/MemObject.cc b/src/MemObject.cc
index 1cf74b8e94..5e677ccbd1 100644
--- a/src/MemObject.cc
+++ b/src/MemObject.cc
@@ -477,10 +477,6 @@ MemObject::mostBytesAllowed() const
 
 #endif
 
-        if (sc->getType() != STORE_MEM_CLIENT)
-            /* reading off disk */
-            continue;
-
         j = sc->delayId.bytesWanted(0, sc->copyInto.length);
 
         if (j > jmax) {