diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-30 20:25:19 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-30 20:25:19 +0000 |
| commit | 4e4793913217b92577f0a0b80efd6377182bb8c3 (patch) | |
| tree | ea2e4c71a8ef703d352b8ddc6a0c5b847f334e3e /net/socket/ssl_client_socket_nss.cc | |
| parent | 7b8132a31af3037cb634f5aed088c2050e69197b (diff) | |
| download | chromium_src-4e4793913217b92577f0a0b80efd6377182bb8c3.zip chromium_src-4e4793913217b92577f0a0b80efd6377182bb8c3.tar.gz chromium_src-4e4793913217b92577f0a0b80efd6377182bb8c3.tar.bz2 | |
net: don't set NSS options in a callback.
This debugger traps in debug mode due to the locks held at the time that the callback is made.
BUG=125299
TEST=none
Review URL: http://codereview.chromium.org/10221018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134584 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_client_socket_nss.cc')
| -rw-r--r-- | net/socket/ssl_client_socket_nss.cc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index 23c1d15..37f9566 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -2105,16 +2105,6 @@ SECStatus SSLClientSocketNSS::OwnAuthCertHandler(void* arg, PRFileDesc* socket, PRBool checksig, PRBool is_server) { -#ifdef SSL_ENABLE_FALSE_START - PRBool npn; - SECStatus rv = - SSL_HandshakeNegotiatedExtension(socket, ssl_next_proto_nego_xtn, &npn); - if (rv != SECSuccess || !npn) { - // If the server doesn't support NPN, then we don't do False Start with it. - SSL_OptionSet(socket, SSL_ENABLE_FALSE_START, PR_FALSE); - } -#endif - // Tell NSS to not verify the certificate. return SECSuccess; } |