------------------------------------------------------------ revno: 12332 revision-id: chtsanti@users.sourceforge.net-20120925145120-7b11xgo8fxj2h7yi parent: chtsanti@users.sourceforge.net-20120925135844-zz81oufeby1oe9fx committer: Christos Tsantilas branch nick: trunk timestamp: Tue 2012-09-25 17:51:20 +0300 message: Bug fix: The ACLFilledChecklist::fd set with wrong fd for Config.ssl_client.cert_error acl list The Config.ssl_client.cert_error uses the server-side connection fd instead of the client-side connection fd. ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: chtsanti@users.sourceforge.net-20120925145120-\ # 7b11xgo8fxj2h7yi # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: e7d52e26fe5231e4021615e10df0e6cab7df1360 # timestamp: 2012-09-25 14:52:29 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: chtsanti@users.sourceforge.net-20120925135844-\ # zz81oufeby1oe9fx # # Begin patch === modified file 'src/client_side.cc' --- src/client_side.cc 2012-09-25 13:46:57 +0000 +++ src/client_side.cc 2012-09-25 14:51:20 +0000 @@ -2516,8 +2516,6 @@ ACLFilledChecklist check(Config.ssl_client.cert_error, request, dash_str); check.sslErrors = new Ssl::Errors(SQUID_X509_V_ERR_DOMAIN_MISMATCH); - if (Comm::IsConnOpen(pinning.serverConnection)) - check.fd(pinning.serverConnection->fd); const bool allowDomainMismatch = check.fastCheck() == ACCESS_ALLOWED; delete check.sslErrors;