Added collapsed_forwarding option to squid.conf.

diff --git a/src/SquidConfig.h b/src/SquidConfig.h
index b93a99876e867b4528bac200bbadfd1f01e7d64e..eab4768c44721b8b54cda5982e49090adf2a02bd 100644 (file)
--- a/src/SquidConfig.h
+++ b/src/SquidConfig.h
@@ -341,6 +341,7 @@ public:
         int emailErrData;
         int httpd_suppress_version_string;
         int global_internal_static;
+        int collapsed_forwarding;
 
 #if FOLLOW_X_FORWARDED_FOR
         int acl_uses_indirect_client;

diff --git a/src/cf.data.pre b/src/cf.data.pre
index e4b28735b516e39b979ec1ea19e44b3a9c8026bf..9f4f2cb20997d36d200bb84feb18fc5508b2179a 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -5129,6 +5129,25 @@ DOC_START
        or response to be rejected.
 DOC_END
 
+NAME: collapsed_forwarding
+COMMENT: (on|off)
+TYPE: onoff
+LOC: Config.onoff.collapsed_forwarding
+DEFAULT: off
+DOC_START
+       This option controls whether Squid is allowed to merge multiple
+       potentially cachable requests for the same URI before Squid knows
+       whether the response is going to be cachable.
+
+       This feature is disabled by default: Enabling collapsed forwarding
+       needlessly delays forwarding requests that look cachable (when they are
+       collapsed) but then need to be forwarded individually anyway because
+       they end up being for uncachable content. However, in some cases, such
+       as accelleration of highly cachable content with periodic or groupped
+       expiration times, the gains from collapsing [large volumes of
+       simultenous refresh requests] outweigh losses from such delays.
+DOC_END
+
 COMMENT_START
  TIMEOUTS
  -----------------------------------------------------------------------------