From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 28 Sep 2015 09:40:52 +0000 (-0700)
Subject: Merge from trunk
X-Git-Tag: SQUID_4_0_1~5^2~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9f5ef3a2ac303cb9ffa009f658090e7d4a0ca5f4;p=thirdparty%2Fsquid.git

Merge from trunk
---

9f5ef3a2ac303cb9ffa009f658090e7d4a0ca5f4
diff --cc src/acl/Checklist.h
index fd1413f521,4ccbb4f0c7..025e3a5e6e
--- a/src/acl/Checklist.h
+++ b/src/acl/Checklist.h
@@@ -157,8 -163,18 +163,19 @@@ public
      // for ACL::checklistMatches to use
      virtual bool hasRequest() const = 0;
      virtual bool hasReply() const = 0;
 +    virtual bool hasAleXXX() const = 0;
  
+     /// change the current ACL list
+     /// \return a pointer to the old list value (may be nullptr)
+     const Acl::Tree *changeAcl(const Acl::Tree *t) {
+         const Acl::Tree *old = accessList;
+         if (t != accessList) {
+             cbdataReferenceDone(accessList);
+             accessList = cbdataReference(t);
+         }
+         return old;
+     }
+ 
  private:
      /// Calls non-blocking check callback with the answer and destroys self.
      void checkCallback(allow_t answer);
diff --cc src/acl/FilledChecklist.h
index 67a566f80a,8a3bbaf450..211fc5adba
--- a/src/acl/FilledChecklist.h
+++ b/src/acl/FilledChecklist.h
@@@ -86,10 -85,10 +86,10 @@@ public
      /// SSL [certificate validation] errors, in undefined order
      Ssl::CertErrors *sslErrors;
      /// The peer certificate
-     Ssl::X509_Pointer serverCert;
+     Security::CertPointer serverCert;
  #endif
  
 -    AccessLogEntry::Pointer al; ///< info for the future access.log entry
 +    AccessLogEntry::Pointer al; ///< info for the future access.log, and external ACL
  
      ExternalACLEntryPointer extacl_entry;