From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Fri, 15 Feb 2013 17:30:10 +0000 (-0700)
Subject: Added collapsed_forwarding option to squid.conf.
X-Git-Tag: SQUID_3_5_0_1~444^2~69
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=55eae9048e649cbbe98bff49a332e07ec9522e2e;p=thirdparty%2Fsquid.git

Added collapsed_forwarding option to squid.conf.
---

diff --git a/src/SquidConfig.h b/src/SquidConfig.h
index b93a99876e..eab4768c44 100644
--- 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 e4b28735b5..9f4f2cb209 100644
--- 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
  -----------------------------------------------------------------------------