From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 17 Jul 2009 03:16:43 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~741^2~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=91393dbccb2fda523961fae94693ce5ead71568a;p=thirdparty%2Fsquid.git

Merge from trunk
---

91393dbccb2fda523961fae94693ce5ead71568a
diff --cc src/helper.cc
index d8269a79c3,101f869409..b06ccf9ed2
--- a/src/helper.cc
+++ b/src/helper.cc
@@@ -648,8 -644,7 +649,8 @@@ helperStatefulStats(StoreEntry * sentry
      storeAppendPrintf(sentry, "\nFlags key:\n\n");
      storeAppendPrintf(sentry, "   B = BUSY\n");
      storeAppendPrintf(sentry, "   C = CLOSING\n");
 -    storeAppendPrintf(sentry, "   R = RESERVED or DEFERRED\n");
 +    storeAppendPrintf(sentry, "   R = RESERVED\n");
-     storeAppendPrintf(sentry, "   R = DEFERRED\n");
++    storeAppendPrintf(sentry, "   D = DEFERRED\n");
      storeAppendPrintf(sentry, "   S = SHUTDOWN PENDING\n");
      storeAppendPrintf(sentry, "   P = PLACEHOLDER\n");
  }
diff --cc src/main.cc
index 698977fea7,00bb217c56..6c02cbb212
--- a/src/main.cc
+++ b/src/main.cc
@@@ -781,9 -799,23 +790,12 @@@ mainRotate(void
      accessLogRotate();		/* access.log */
      useragentRotateLog();	/* useragent.log */
      refererRotateLog();		/* referer.log */
+ #if ICAP_CLIENT
+     icapLogRotate();               /*icap.log*/
+ #endif
  #if WIP_FWD_LOG
 -
      fwdLogRotate();
  #endif
 -
 -    icmpEngine.Open();
 -#if USE_DNSSERVERS
 -
 -    dnsInit();
 -#endif
 -
 -    redirectInit();
 -    authenticateInit(&Config.authConfiguration);
 -    externalAclInit();
  }
  
  static void