Repository: trafficserver Updated Branches: refs/heads/4.2.x de256a6fe -> 79220c16f
TS-2564: Fix race condition when object is in the ram_cache and presence bits are already recalculated Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/45fb60ef Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/45fb60ef Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/45fb60ef Branch: refs/heads/4.2.x Commit: 45fb60efebeff4fc3b2ddba6da74595bc11e2d0f Parents: de256a6 Author: Alan M. Carroll <[email protected]> Authored: Wed May 28 16:08:24 2014 -0600 Committer: Phil Sorber <[email protected]> Committed: Thu May 29 10:14:45 2014 -0600 ---------------------------------------------------------------------- iocore/cache/CacheRead.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/45fb60ef/iocore/cache/CacheRead.cc ---------------------------------------------------------------------- diff --git a/iocore/cache/CacheRead.cc b/iocore/cache/CacheRead.cc index 7a49707..44cacfa 100644 --- a/iocore/cache/CacheRead.cc +++ b/iocore/cache/CacheRead.cc @@ -161,8 +161,9 @@ uint32_t CacheVC::load_http_info(CacheHTTPInfoVector* info, Doc* doc, RefCountObj * block_ptr) { uint32_t zret = info->get_handles(doc->hdr(), doc->hlen, block_ptr); - if (cache_config_compatibility_4_2_0_fixup && - vol->header->version.ink_major == 23 && vol->header->version.ink_minor == 0 + if (cache_config_compatibility_4_2_0_fixup && // manual override not engaged + ! this->f.doc_from_ram_cache && // it's already been done for ram cache objects + vol->header->version.ink_major == 23 && vol->header->version.ink_minor == 0 // 4.2.0 version ) { for ( int i = info->xcount - 1 ; i >= 0 ; --i ) { info->data(i).alternate.m_alt->m_response_hdr.m_mime->recompute_accelerators_and_presence_bits();
