From: Christos Tsantilas Date: Wed, 22 Apr 2015 19:41:13 +0000 (+0300) Subject: revert rev.14035 X-Git-Tag: merge-candidate-3-v1~157 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a88caef6276feeb54d854483eb79776e1d248485;p=thirdparty%2Fsquid.git revert rev.14035 --- diff --git a/src/ssl/PeerConnector.cc b/src/ssl/PeerConnector.cc index bc0f81d2c7..9557b5118a 100644 --- a/src/ssl/PeerConnector.cc +++ b/src/ssl/PeerConnector.cc @@ -601,9 +601,8 @@ Ssl::PeerConnector::handleNegotiateError(const int ret) // Abort if no certificate found probably because of malformed or // unsupported server Hello message (TODO: make configurable). #if 1 - Ssl::X509_Pointer serverCert(SSL_get_peer_certificate(ssl)); if (!SSL_get_ex_data(ssl, ssl_ex_index_ssl_error_detail) && - serverCert.get() && + SSL_get_peer_certificate(ssl) && (srvBio->bumpMode() == Ssl::bumpPeek || srvBio->bumpMode() == Ssl::bumpStare) && srvBio->holdWrite()) { debugs(81, 3, "Error (" << ERR_error_string(ssl_lib_error, NULL) << ") but, hold write on SSL connection on FD " << fd); checkForPeekAndSplice();