From: rousskov <>
Date: Tue, 12 Feb 2008 05:29:28 +0000 (+0000)
Subject: Importing SslBump feature from Squid3 ssl-bump branch:
X-Git-Tag: BASIC_TPROXY4~122
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=784054adf6713d41616f04115e32e17327ce6857;p=thirdparty%2Fsquid.git

Importing SslBump feature from Squid3 ssl-bump branch:

        Use newly added ACLChecklist::fd() method to get to the file
        descriptor, to get to the SSL structure.
---

diff --git a/src/ACLCertificate.cc b/src/ACLCertificate.cc
index bf4c9e6c67..e3966c9589 100644
--- a/src/ACLCertificate.cc
+++ b/src/ACLCertificate.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLCertificate.cc,v 1.3 2008/01/20 19:46:35 serassio Exp $
+ * $Id: ACLCertificate.cc,v 1.4 2008/02/11 22:29:28 rousskov Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -55,7 +55,9 @@ ACLStrategised<SSL *> ACLCertificate::CARegistryEntry_(new ACLCertificateData (s
 int
 ACLCertificateStrategy::match (ACLData<MatchType> * &data, ACLChecklist *checklist)
 {
-    SSL *ssl = fd_table[checklist->conn()->fd].ssl;
+    const int fd = checklist->fd();
+    const bool goodDescriptor = 0 <= fd && fd <= Biggest_FD;
+    SSL *ssl = goodDescriptor ? fd_table[fd].ssl : 0;
     return data->match (ssl);
 }