Merged from trunk

diff --cc src/cache_cf.cc
Simple merge

diff --cc src/carp.cc
Simple merge

diff --cc src/main.cc
index 7d0ea9cd380ca17951d8f33ea8837e85faf55b86,b673775c8429bf6527388249d1d44bdc11f43054..7cf72217c7e0bf450d38817591113cbdf7a2cbfa
--- 1/src/main.cc
--- 2/src/main.cc
+++ b/src/main.cc
@@@ -964,15 -965,11 +962,13 @@@ mainInitialize(void
  
          FwdState::initModule();
          /* register the modules in the cache manager menus */
 -        accessLogRegisterWithCacheManager(manager);
 -        asnRegisterWithCacheManager(manager);
 -        authenticateRegisterWithCacheManager(&Config.authConfiguration, manager);
 -        carpRegisterWithCacheManager(manager);
 -        cbdataRegisterWithCacheManager(manager);
 +        // accessLogRegisterWithCacheManager(); //moved to accessLogInit()
 +        // asnRegisterWithCacheManager(); //moved to asnInit()
 +        // authenticateRegisterWithCacheManager(&Config.authConfiguration);
 +      //   moved authenticateInit()
- #if USE_CARP
 +        // carpRegisterWithCacheManager(); //moved to carpInit()
- #endif
 +
 +        cbdataRegisterWithCacheManager();
          /* These use separate calls so that the comm loops can eventually
           * coexist.
           */

diff --cc src/protos.h
index 2d44db917dfba97877dbdc8ff7db13087f646319,741556041f52437f3371017d22aa90df8fb322be..48c494adbb877f0638e3cef14ebeeb88efbbdece
--- 1/src/protos.h
--- 2/src/protos.h
+++ b/src/protos.h
@@@ -728,11 -728,9 +728,9 @@@ SQUIDCEXTERN char *internalRemoteUri(co
  SQUIDCEXTERN const char *internalHostname(void);
  SQUIDCEXTERN int internalHostnameIs(const char *);
  
- #if USE_CARP
  SQUIDCEXTERN void carpInit(void);
 -extern void carpRegisterWithCacheManager(CacheManager & manager);
 +extern void carpRegisterWithCacheManager();
  SQUIDCEXTERN peer *carpSelectParent(HttpRequest *);
- #endif
  
  
  #if USE_LEAKFINDER