From: Christos Tsantilas <chtsanti@users.sourceforge.net>
Date: Wed, 5 Dec 2012 14:13:05 +0000 (+0200)
Subject: merge from trunk r12502
X-Git-Tag: SQUID_3_4_0_1~458^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b5482b9c3bf6c72f741362c0f99b5831322f478d;p=thirdparty%2Fsquid.git

merge from trunk r12502
---

b5482b9c3bf6c72f741362c0f99b5831322f478d
diff --cc src/ssl/support.cc
index fd6b4e0313,660fa8f866..b8f1b4d542
--- a/src/ssl/support.cc
+++ b/src/ssl/support.cc
@@@ -288,10 -287,9 +288,10 @@@ ssl_verify_cb(int ok, X509_STORE_CTX * 
              }
              delete filledCheck->sslErrors;
              filledCheck->sslErrors = NULL;
 +            filledCheck->serverCert.reset(NULL);
          }
  #if 1 // USE_SSL_CERT_VALIDATOR
-         // If the certificate validator is used then we need to allow all errors and 
+         // If the certificate validator is used then we need to allow all errors and
          // pass them to certficate validator for more processing
          else if (Ssl::TheConfig.ssl_crt_validator)
              ok = 1;