diff options
| author | rsleevi <rsleevi@chromium.org> | 2015-12-28 15:49:18 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-28 23:50:16 +0000 |
| commit | 10682844c172adadd6227deb5bf06de07c4fc6fa (patch) | |
| tree | 755ffc37a4db8503ba3077f12e718c8edf3b39de | |
| parent | aca8ba5b170cf01bbbc3d43d1b2ac87062af6d64 (diff) | |
| download | chromium_src-10682844c172adadd6227deb5bf06de07c4fc6fa.zip chromium_src-10682844c172adadd6227deb5bf06de07c4fc6fa.tar.gz chromium_src-10682844c172adadd6227deb5bf06de07c4fc6fa.tar.bz2 | |
Make the OCSP Init Singleton Lazy
As the OCSP Init code (for NSS) is a non-leaky Singleton, but
the other NSS code is, we end up calling into it during shutdown
while other requests may still be pending. Since the code is,
unfortunately, not exactly the most thread safe, the right answer
is to just not attempt to cleanup on shutdown, same as all the
other NSS code.
BUG=572727
Review URL: https://codereview.chromium.org/1550853002
Cr-Commit-Position: refs/heads/master@{#367024}
| -rw-r--r-- | net/cert_net/nss_ocsp.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/cert_net/nss_ocsp.cc b/net/cert_net/nss_ocsp.cc index 6b73cd5..40b79da 100644 --- a/net/cert_net/nss_ocsp.cc +++ b/net/cert_net/nss_ocsp.cc @@ -171,7 +171,7 @@ class OCSPNSSInitialization { DISALLOW_COPY_AND_ASSIGN(OCSPNSSInitialization); }; -base::LazyInstance<OCSPNSSInitialization> g_ocsp_nss_initialization = +base::LazyInstance<OCSPNSSInitialization>::Leaky g_ocsp_nss_initialization = LAZY_INSTANCE_INITIALIZER; // Concrete class for SEC_HTTP_REQUEST_SESSION. @@ -594,10 +594,6 @@ OCSPNSSInitialization::OCSPNSSInitialization() { } OCSPNSSInitialization::~OCSPNSSInitialization() { - SECStatus status = CERT_RegisterAlternateOCSPAIAInfoCallBack(NULL, NULL); - if (status != SECSuccess) { - LOG(ERROR) << "Error unregistering OCSP: " << PR_GetError(); - } } |