]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Account for Store disk client quota when bandwidth-limiting the server.
authorAlex Rousskov <rousskov@measurement-factory.com>
Sat, 21 Jul 2012 04:12:30 +0000 (22:12 -0600)
committerAmos Jeffries <squid3@treenet.co.nz>
Sat, 21 Jul 2012 04:12:30 +0000 (22:12 -0600)
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.

src/MemObject.cc

index 4684332334e538dd3274edd168bb3b49504b2d23..d0ca9b04196bcc2edb521280702927c1013d2ae8 100644 (file)
@@ -438,10 +438,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) {