Deprecate log_icap and log_access configuration directives

[thirdparty/squid.git] / src / SquidConfig.h

diff --git a/src/SquidConfig.h b/src/SquidConfig.h
index 2f2c028dba1b693c73aa98e5d47039eff6258e53..3e71d0815eec9902f061f8e6e8419a23bc2bce50 100644 (file)
--- a/src/SquidConfig.h
+++ b/src/SquidConfig.h
@@ -29,14 +29,15 @@
  *
  */
 
-#include "acl/AclAddress.h"
+#include "acl/forward.h"
+#include "base/RefCount.h"
 #include "ClientDelayConfig.h"
 #include "DelayConfig.h"
 #include "HelperChildConfig.h"
 #include "HttpHeaderTools.h"
 #include "icmp/IcmpConfig.h"
 #include "ip/Address.h"
-#include "RefCount.h"
+#include "Notes.h"
 #include "YesNoNone.h"
 
 #if USE_SSL
@@ -45,10 +46,8 @@ class sslproxy_cert_sign;
 class sslproxy_cert_adapt;
 #endif
 
-class acl_access;
-class AclSizeLimit;
-class AclDenyInfoList;
-namespace Mgr {
+namespace Mgr
+{
 class ActionPasswordList;
 } // namespace Mgr
 class CustomLog;
@@ -59,7 +58,8 @@ class RefreshPattern;
 class RemovalPolicySettings;
 class SwapDir;
 
-namespace AnyP {
+namespace AnyP
+{
 class PortCfg;
 }
 
@@ -200,6 +200,7 @@ public:
 #endif
 
         wordlist *redirect;
+        wordlist *store_id;
 #if USE_UNLINKD
 
         char *unlinkd;
@@ -217,6 +218,7 @@ public:
 #endif
 
     HelperChildConfig redirectChildren;
+    HelperChildConfig storeIdChildren;
     time_t authenticateGCInterval;
     time_t authenticateTTL;
     time_t authenticateIpTTL;
@@ -315,6 +317,7 @@ public:
         int nonhierarchical_direct;
         int strip_query_terms;
         int redirector_bypass;
+        int store_id_bypass;
         int ignore_unknown_nameservers;
         int client_pconns;
         int server_pconns;
@@ -326,7 +329,6 @@ public:
 
         int ie_refresh;
         int vary_ignore_expire;
-        int pipeline_prefetch;
         int surrogate_is_remote;
         int request_entities;
         int detect_broken_server_pconns;
@@ -355,6 +357,8 @@ public:
         int client_dst_passthru;
     } onoff;
 
+    int pipeline_max_prefetch;
+
     int forward_max_tries;
     int connect_retries;
 
@@ -369,7 +373,7 @@ public:
         acl_access *AlwaysDirect;
         acl_access *ASlists;
         acl_access *noCache;
-        acl_access *log;
+        acl_access *stats_collection;
 #if SQUID_SNMP
 
         acl_access *snmp;
@@ -378,6 +382,7 @@ public:
         acl_access *brokenPosts;
 #endif
         acl_access *redirector;
+        acl_access *store_id;
         acl_access *reply;
         AclAddress *outgoing_address;
 #if USE_HTCP
@@ -393,9 +398,9 @@ public:
         acl_access *followXFF;
 #endif /* FOLLOW_X_FORWARDED_FOR */
 
-#if ICAP_CLIENT
-        acl_access* icap;
-#endif
+        /// spoof_client_ip squid.conf acl.
+        /// nil unless configured
+        acl_access* spoof_client_ip;
     } accessList;
     AclDenyInfoList *denyInfoList;
 
@@ -474,6 +479,8 @@ public:
     HeaderManglers *reply_header_access;
     ///request_header_add access list
     HeaderWithAclList *request_header_add;
+    ///note
+    Notes notes;
     char *coredump_dir;
     char *chroot_dir;
 #if USE_CACHE_DIGESTS
@@ -546,7 +553,9 @@ public:
 
 extern SquidConfig Config;
 
-struct SquidConfig2 {
+class SquidConfig2
+{
+public:
     struct {
         int enable_purge;
         int mangle_request_headers;