------------------------------------------------------------ revno: 13476 revision-id: rousskov@measurement-factory.com-20140625000741-7ukyvl8ovlwkle6o parent: rousskov@measurement-factory.com-20140624234837-0mjt07b5menf8rrx committer: Alex Rousskov branch nick: trunk timestamp: Tue 2014-06-24 18:07:41 -0600 message: Do not use unknown entry size in StoreEntry::checkTooSmall() determination. The size of collapsed entries is often unknown, even when they are STORE_OK (because swap_hdr_sz is unknown when the other worker has created the cache entry). The same code has been using this ignore-unknowns logic for the Content-Length header value, so the rejection of unknown entry size (added as a part of C++ conversion without a dedicated message in r5766) could have been a typo. ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: rousskov@measurement-factory.com-20140625000741-\ # 7ukyvl8ovlwkle6o # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: 0f4b581a5b5415bbe13198c1549225bf8d62bdd3 # timestamp: 2014-06-25 00:58:49 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: rousskov@measurement-factory.com-20140624234837-\ # 0mjt07b5menf8rrx # # Begin patch === modified file 'src/store.cc' --- src/store.cc 2014-06-24 22:52:53 +0000 +++ src/store.cc 2014-06-25 00:07:41 +0000 @@ -941,7 +941,7 @@ return 0; if (STORE_OK == store_status) - if (mem_obj->object_sz < 0 || + if (mem_obj->object_sz >= 0 && mem_obj->object_sz < Config.Store.minObjectSize) return 1; if (getReply()->content_length > -1)