From: Alex Rousskov Date: Fri, 5 Oct 2012 23:36:22 +0000 (-0600) Subject: Do not check 'reply content_length is too big' condition twice. X-Git-Tag: SQUID_3_3_0_1~27 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=32ffb4b93cda487f1fc118b41bc6c0ad3b1eb59d;p=thirdparty%2Fsquid.git Do not check 'reply content_length is too big' condition twice. The check got duplicated was 4410 committer: hno branch nick: HEAD timestamp: Wed 2000-05-03 00:49:26 +0000 message: hno squid-2.2.STABLE2.to_large_objects-2.patch Squid-2.2.STABLE2: Don't swap out objects > maximum_object_size --- diff --git a/src/store.cc b/src/store.cc index cb415f1fc4..f61827151c 100644 --- a/src/store.cc +++ b/src/store.cc @@ -1003,9 +1003,6 @@ StoreEntry::checkCachable() mem_obj->endOffset() > Config.Store.maxObjectSize) { debugs(20, 2, "StoreEntry::checkCachable: NO: too big"); ++store_check_cachable_hist.no.too_big; - } else if (getReply()->content_length > Config.Store.maxObjectSize) { - debugs(20, 2, "StoreEntry::checkCachable: NO: too big"); - ++store_check_cachable_hist.no.too_big; } else if (checkTooSmall()) { debugs(20, 2, "StoreEntry::checkCachable: NO: too small"); ++store_check_cachable_hist.no.too_small;