diff options
| author | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-08 22:32:53 +0000 |
|---|---|---|
| committer | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-08 22:32:53 +0000 |
| commit | 0bc83b3e89b410efcb3092a5f48c622c006395a7 (patch) | |
| tree | a67fe20ea015332e9193ba573390a9edf7d0902a /net | |
| parent | ab62f257c3f96deeb7cb0b575721bfe390bb6cb6 (diff) | |
| download | chromium_src-0bc83b3e89b410efcb3092a5f48c622c006395a7.zip chromium_src-0bc83b3e89b410efcb3092a5f48c622c006395a7.tar.gz chromium_src-0bc83b3e89b410efcb3092a5f48c622c006395a7.tar.bz2 | |
Added back CHECK that asserts we do SSL socket connect
and disconnect on the same thread. Perform the CHECK
before doing any work in disconnect to catch the
error very early.
Reverting the http://codereview.chromium.org/6627058
The original bug where we added the CHECK is
http://code.google.com/p/chromium/issues/detail?id=65948
BUG=75171
TEST=Access SSL site and exit. Start Windows Chromium,
sign in to Google Cloud Print, quit Chromium,
re-launch Chromium.
R=wtc
Review URL: http://codereview.chromium.org/6647003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77352 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/socket/ssl_client_socket_nss.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index 435fb12..892fddc 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -660,6 +660,8 @@ int SSLClientSocketNSS::Connect(CompletionCallback* callback) { void SSLClientSocketNSS::Disconnect() { EnterFunction(""); + CHECK(CalledOnValidThread()); + // Shut down anything that may call us back (through buffer_send_callback_, // buffer_recv_callback, or handshake_io_callback_). verifier_.reset(); |