From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 4 Sep 2009 09:26:19 +0000 (+1200)
Subject: Bug 2570: wccp2 "Here I Am" announcements not sent
X-Git-Tag: SQUID_3_2_0_1~743
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7895fa18d56b915e7047098ef4801f807917a175;p=thirdparty%2Fsquid.git

Bug 2570: wccp2 "Here I Am" announcements not sent

There is a bit of re-work in configuration needed before this can go into
the storage config scope where it belongs. Temporary fix for 3.1.
see bug report for details.
---

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 22a8d9fe90..b6ba86a453 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -430,6 +430,12 @@ configDoConfigure(void)
     memConfigure();
     /* Sanity checks */
 
+    if (Config.cacheSwap.swapDirs == NULL) {
+        /* Memory-only cache probably in effect. */
+        /* turn off the cache rebuild delays... */
+        StoreController::store_dirs_rebuilding = 0;
+    }
+
     if (Debug::rotateNumber < 0) {
         Debug::rotateNumber = Config.Log.rotateNumber;
     }