------------------------------------------------------------ revno: 11804 revision-id: squid3@treenet.co.nz-20130329065415-egjdtzsxbr5wxriu parent: squid3@treenet.co.nz-20130329061805-51cklshk1l5xgxet fixes bug(s): http://bugs.squid-cache.org/show_bug.cgi?id=3774 author: Alexandre Chappaz committer: Amos Jeffries branch nick: 3.2 timestamp: Fri 2013-03-29 00:54:15 -0600 message: Bug 3774: -k reconfigure drops rock This fix keeps Rock cache_dirs visible to Cache Manager after reconfigure. We still lack proper support for complex reconfiguration changes involving cache_dirs. ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20130329065415-egjdtzsxbr5wxriu # target_branch: http://bzr.squid-cache.org/bzr/squid3/branches\ # /SQUID_3_2 # testament_sha1: ba8f387533af1a11ef310a5bc1092042bb0a5f30 # timestamp: 2013-03-29 07:53:10 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/branches\ # /SQUID_3_2 # base_revision_id: squid3@treenet.co.nz-20130329061805-\ # 51cklshk1l5xgxet # # Begin patch === modified file 'src/cache_cf.cc' --- src/cache_cf.cc 2013-02-16 02:26:31 +0000 +++ src/cache_cf.cc 2013-03-29 06:54:15 +0000 @@ -600,6 +600,7 @@ memConfigure(); /* Sanity checks */ + Config.cacheSwap.n_strands = 0; // no diskers by default if (Config.cacheSwap.swapDirs == NULL) { /* Memory-only cache probably in effect. */ /* turn off the cache rebuild delays... */