------------------------------------------------------------
revno: 12674
revision-id: squid3@treenet.co.nz-20140309021007-smig5q7acn75qf3n
parent: squid3@treenet.co.nz-20140309020751-ecg34icp0zfq2psk
fixes bug(s): http://bugs.squid-cache.org/show_bug.cgi?id=4026
author: Nathan Hoad <nathan@getoffmalawn.com>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.3
timestamp: Sat 2014-03-08 19:10:07 -0700
message:
  Bug 4026: SSL and adaptation_access does not handle aborted connections
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20140309021007-smig5q7acn75qf3n
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# testament_sha1: 13f29f042c41ce6e6124d04fd1f062f86fbf2fde
# timestamp: 2014-03-09 02:23:38 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# base_revision_id: squid3@treenet.co.nz-20140309020751-\
#   ecg34icp0zfq2psk
# 
# Begin patch
=== modified file 'src/client_side_request.cc'
--- src/client_side_request.cc	2013-09-29 17:50:16 +0000
+++ src/client_side_request.cc	2014-03-09 02:10:07 +0000
@@ -875,11 +875,12 @@
 #if ICAP_CLIENT
     Adaptation::Icap::History::Pointer ih = request->icapHistory();
     if (ih != NULL) {
-        if (getConn() != NULL) {
+        if (getConn() != NULL && getConn()->clientConnection != NULL) {
             ih->rfc931 = getConn()->clientConnection->rfc931;
 #if USE_SSL
-            assert(getConn()->clientConnection != NULL);
-            ih->ssluser = sslGetUserEmail(fd_table[getConn()->clientConnection->fd].ssl);
+            if (getConn()->clientConnection->isOpen()) {
+                ih->ssluser = sslGetUserEmail(fd_table[getConn()->clientConnection->fd].ssl);
+            }
 #endif
         }
         ih->log_uri = log_uri;