/*
- * Copyright (C) 1996-2016 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2017 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
#include "acl/forward.h"
#include "base/RefCount.h"
+#include "base/YesNoNone.h"
#include "ClientDelayConfig.h"
#include "DelayConfig.h"
#include "helper/ChildConfig.h"
#include "ssl/support.h"
#endif
#include "store/forward.h"
-#include "YesNoNone.h"
#if USE_OPENSSL
class sslproxy_cert_sign;
} Swap;
YesNoNone memShared; ///< whether the memory cache is shared among workers
+ YesNoNone shmLocking; ///< shared_memory_locking
size_t memMaxSize;
struct {
Helper::ChildConfig redirectChildren;
Helper::ChildConfig storeIdChildren;
- time_t authenticateGCInterval;
- time_t authenticateTTL;
- time_t authenticateIpTTL;
struct {
char *surrogate_id;
int digest_generation;
#endif
- int ie_refresh;
int vary_ignore_expire;
int surrogate_is_remote;
int request_entities;
#endif
} onoff;
+ int64_t collapsed_forwarding_shared_entries_limit;
+
int pipeline_max_prefetch;
int forward_max_tries;
acl_access *ftp_epsv;
acl_access *forceRequestBodyContinuation;
+ acl_access *serverPconnForNonretriable;
} accessList;
AclDenyInfoList *denyInfoList;
HeaderManglers *reply_header_access;
///request_header_add access list
HeaderWithAclList *request_header_add;
+ ///reply_header_add access list
+ HeaderWithAclList *reply_header_add;
///note
Notes notes;
char *coredump_dir;
} SSL;
#endif
- wordlist *ext_methods;
-
struct {
int high_rptm;
int high_pf;
external_acl *externalAclHelperList;
struct {
- Security::ContextPtr sslContext;
+ Security::ContextPointer sslContext;
#if USE_OPENSSL
char *foreignIntermediateCertsPath;
acl_access *cert_error;
int v4_first; ///< Place IPv4 first in the order of DNS results.
ssize_t packet_max; ///< maximum size EDNS advertised for DNS replies.
} dns;
-
};
extern SquidConfig Config;
class SquidConfig2
{
public:
+ void clear() {
+ *this = SquidConfig2();
+ }
+
struct {
- int enable_purge;
- int mangle_request_headers;
+ int enable_purge = 0;
} onoff;
- uid_t effectiveUserID;
- gid_t effectiveGroupID;
+ uid_t effectiveUserID = 0;
+ gid_t effectiveGroupID = 0;
};
extern SquidConfig2 Config2;