merge from trunk r12502

diff --cc src/ssl/support.cc
index fd6b4e0313499af7e23050fd7483e39402e6dbb9,660fa8f86662f02adda8ed0ee39579ec9f5f0489..b8f1b4d5421b1c2b84d5aca3567812981df54ef4
--- 1/src/ssl/support.cc
--- 2/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;