diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-09 22:13:31 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-09 22:13:31 +0000 |
| commit | 2d07fa96f492e596836f08a1f7d600601ed8bb59 (patch) | |
| tree | b927d6175d831e56280abfd3a9637752289ef1f9 /net/socket | |
| parent | 84218e1caa74f765c9c296ec7ca7b3084a783003 (diff) | |
| download | chromium_src-2d07fa96f492e596836f08a1f7d600601ed8bb59.zip chromium_src-2d07fa96f492e596836f08a1f7d600601ed8bb59.tar.gz chromium_src-2d07fa96f492e596836f08a1f7d600601ed8bb59.tar.bz2 | |
Fix for SDPY not cancelling ServerBoundCertServiceRequest.
Makes ServerBoundCertService::RequestHandle a real class which handles cancellation on destruction, instead of being just a void* handle.
BUG=167705
Review URL: https://chromiumcodereview.appspot.com/11689002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175902 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket')
| -rw-r--r-- | net/socket/ssl_client_socket_nss.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index a3c1b12..809dbc5 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -896,7 +896,6 @@ SSLClientSocketNSS::Core::Core( transport_(transport), weak_net_log_factory_(net_log), server_bound_cert_service_(server_bound_cert_service), - domain_bound_cert_request_handle_(NULL), host_and_port_(host_and_port), ssl_config_(ssl_config), nss_fd_(NULL), @@ -1081,11 +1080,7 @@ void SSLClientSocketNSS::Core::Detach() { network_handshake_state_.Reset(); - if (domain_bound_cert_request_handle_ != NULL) { - server_bound_cert_service_->CancelRequest( - domain_bound_cert_request_handle_); - domain_bound_cert_request_handle_ = NULL; - } + domain_bound_cert_request_handle_.Cancel(); } int SSLClientSocketNSS::Core::Read(IOBuffer* buf, int buf_len, @@ -2656,7 +2651,6 @@ void SSLClientSocketNSS::Core::OnGetDomainBoundCertComplete(int result) { DVLOG(1) << __FUNCTION__ << " " << result; DCHECK(OnNetworkTaskRunner()); - domain_bound_cert_request_handle_ = NULL; OnHandshakeIOComplete(result); } |