From: robertc <>
Date: Mon, 14 Jul 2003 05:00:09 +0000 (+0000)
Subject: Summary: SSL Support for recent changes.
X-Git-Tag: SQUID_3_0_PRE1~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c588c5ba29473e32214ff3fd379def1e0970d7d6;p=thirdparty%2Fsquid.git

Summary: SSL Support for recent changes.
Keywords:

The ConnStateData change broke SSL, which wasn't enabled in my build tree.
---

diff --git a/src/client_side.cc b/src/client_side.cc
index 8da63f853c..c1cd8c3aff 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.649 2003/07/11 02:11:47 robertc Exp $
+ * $Id: client_side.cc,v 1.650 2003/07/13 23:00:09 robertc Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -523,7 +523,7 @@ ClientHttpRequest::logRequest()
 
 #if USE_SSL
 
-        if (getConn())
+        if (getConn().getRaw() != NULL)
             al.cache.ssluser = sslGetUserEmail(fd_table[getConn()->fd].ssl);
 
 #endif
diff --git a/src/external_acl.cc b/src/external_acl.cc
index 25640aad55..662a9af1ba 100644
--- a/src/external_acl.cc
+++ b/src/external_acl.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: external_acl.cc,v 1.49 2003/07/11 01:40:36 robertc Exp $
+ * $Id: external_acl.cc,v 1.50 2003/07/13 23:00:09 robertc Exp $
  *
  * DEBUG: section 82    External ACL
  * AUTHOR: Henrik Nordstrom, MARA Systems AB
@@ -768,7 +768,7 @@ makeExternalAclKey(ACLChecklist * ch, external_acl_data * acl_data)
 
         case _external_acl_format::EXT_ACL_USER_CERT:
 
-            if (cbdataReferenceValid(ch->conn())) {
+            if (ch->conn().getRaw()) {
                 SSL *ssl = fd_table[ch->conn()->fd].ssl;
 
                 if (ssl)
@@ -779,7 +779,7 @@ makeExternalAclKey(ACLChecklist * ch, external_acl_data * acl_data)
 
         case _external_acl_format::EXT_ACL_CA_CERT:
 
-            if (cbdataReferenceValid(ch->conn())) {
+            if (ch->conn().getRaw()) {
                 SSL *ssl = fd_table[ch->conn()->fd].ssl;
 
                 if (ssl)