From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 30 Oct 2016 12:00:00 +0000 (+1300)
Subject: Bug 4627: fix generate-host-certificates and dynamic_cert_mem_cache_size defaults
X-Git-Tag: SQUID_4_0_16~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=65308288f0c865498ea5c729b2137bc2216faca9;p=thirdparty%2Fsquid.git

Bug 4627: fix generate-host-certificates and dynamic_cert_mem_cache_size defaults

For Squid-4 and later make these options actually do what has been documented.
Which is to generate by default with a 4MB cache.
---

diff --git a/src/anyp/PortCfg.cc b/src/anyp/PortCfg.cc
index e062048e6b..760bff50b0 100644
--- a/src/anyp/PortCfg.cc
+++ b/src/anyp/PortCfg.cc
@@ -44,8 +44,8 @@ AnyP::PortCfg::PortCfg() :
     ,
     clientca(NULL),
     sslContextSessionId(NULL),
-    generateHostCertificates(false),
-    dynamicCertMemCacheSize(std::numeric_limits<size_t>::max()),
+    generateHostCertificates(true),
+    dynamicCertMemCacheSize(4*1024*1024), // 4 MB
     signingCert(),
     signPkey(),
     certsToChain(),
diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index f9777b6825..efe10f9865 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -3863,11 +3863,11 @@ dump_generic_port(StoreEntry * e, const char *n, const AnyP::PortCfgPointer &s)
     if (s->sslContextSessionId)
         storeAppendPrintf(e, " sslcontext=%s", s->sslContextSessionId);
 
-    if (s->generateHostCertificates)
-        storeAppendPrintf(e, " generate-host-certificates");
+    if (!s->generateHostCertificates)
+        storeAppendPrintf(e, " generate-host-certificates=off");
 
-    if (s->dynamicCertMemCacheSize != std::numeric_limits<size_t>::max())
-        storeAppendPrintf(e, "dynamic_cert_mem_cache_size=%lu%s\n", (unsigned long)s->dynamicCertMemCacheSize, B_BYTES_STR);
+    if (s->dynamicCertMemCacheSize != 4*1024*1024) // 4MB default
+        storeAppendPrintf(e, "dynamic_cert_mem_cache_size=%" PRIuSIZE "%s\n", s->dynamicCertMemCacheSize, B_BYTES_STR);
 #endif
 }