← Back to branch summary

~measurement-factory/squid/bag13

« back to all changes in this revision

Viewing changes to src/client_side_request.cc

  • Committer: Amos Jeffries
  • Author(s): Nathan Hoad
  • Date: 2014-03-09 02:10:07 UTC
  • Revision ID: squid3@treenet.co.nz-20140309021007-smig5q7acn75qf3n
http://bugs.squid-cache.org/show_bug.cgi?id=4026
Bug 4026: SSL and adaptation_access does not handle aborted connections

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/client_side_request.cc
875
875
#if ICAP_CLIENT
876
876
    Adaptation::Icap::History::Pointer ih = request->icapHistory();
877
877
    if (ih != NULL) {
878
 
        if (getConn() != NULL) {
 
878
        if (getConn() != NULL && getConn()->clientConnection != NULL) {
879
879
            ih->rfc931 = getConn()->clientConnection->rfc931;
880
880
#if USE_SSL
881
 
            assert(getConn()->clientConnection != NULL);
882
 
            ih->ssluser = sslGetUserEmail(fd_table[getConn()->clientConnection->fd].ssl);
 
881
            if (getConn()->clientConnection->isOpen()) {
 
882
                ih->ssluser = sslGetUserEmail(fd_table[getConn()->clientConnection->fd].ssl);
 
883
            }
883
884
#endif
884
885
        }
885
886
        ih->log_uri = log_uri;