Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(53)

Side by Side Diff: net/socket/ssl_client_socket_nss.cc

Issue 7825026: Revert "Currently, base/timer.cc calls PostTask with FROM_HERE as the Location, (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/socket/client_socket_pool_base.cc ('k') | net/socket/transport_client_socket_pool.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // This file includes code SSLClientSocketNSS::DoVerifyCertComplete() derived 5 // This file includes code SSLClientSocketNSS::DoVerifyCertComplete() derived
6 // from AuthCertificateCallback() in 6 // from AuthCertificateCallback() in
7 // mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp. 7 // mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp.
8 8
9 /* ***** BEGIN LICENSE BLOCK ***** 9 /* ***** BEGIN LICENSE BLOCK *****
10 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 10 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
(...skipping 2035 matching lines...) Expand 10 before | Expand all | Expand 10 after
2046 DCHECK_EQ(SECSuccess, rv); 2046 DCHECK_EQ(SECSuccess, rv);
2047 false_start = 0; 2047 false_start = 0;
2048 } 2048 }
2049 PORT_Free(common_name); 2049 PORT_Free(common_name);
2050 } 2050 }
2051 CERT_DestroyCertificate(cert); 2051 CERT_DestroyCertificate(cert);
2052 } 2052 }
2053 2053
2054 if (false_start && !that->handshake_callback_called_) { 2054 if (false_start && !that->handshake_callback_called_) {
2055 that->corked_ = true; 2055 that->corked_ = true;
2056 that->uncork_timer_.Start(FROM_HERE, 2056 that->uncork_timer_.Start(
2057 base::TimeDelta::FromMilliseconds(kCorkTimeoutMs), 2057 base::TimeDelta::FromMilliseconds(kCorkTimeoutMs),
2058 that, &SSLClientSocketNSS::UncorkAfterTimeout); 2058 that, &SSLClientSocketNSS::UncorkAfterTimeout);
2059 } 2059 }
2060 #endif 2060 #endif
2061 2061
2062 // Tell NSS to not verify the certificate. 2062 // Tell NSS to not verify the certificate.
2063 return SECSuccess; 2063 return SECSuccess;
2064 } 2064 }
2065 2065
2066 #if defined(NSS_PLATFORM_CLIENT_AUTH) 2066 #if defined(NSS_PLATFORM_CLIENT_AUTH)
(...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after
2444 valid_thread_id_ = base::PlatformThread::CurrentId(); 2444 valid_thread_id_ = base::PlatformThread::CurrentId();
2445 } 2445 }
2446 2446
2447 bool SSLClientSocketNSS::CalledOnValidThread() const { 2447 bool SSLClientSocketNSS::CalledOnValidThread() const {
2448 EnsureThreadIdAssigned(); 2448 EnsureThreadIdAssigned();
2449 base::AutoLock auto_lock(lock_); 2449 base::AutoLock auto_lock(lock_);
2450 return valid_thread_id_ == base::PlatformThread::CurrentId(); 2450 return valid_thread_id_ == base::PlatformThread::CurrentId();
2451 } 2451 }
2452 2452
2453 } // namespace net 2453 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/client_socket_pool_base.cc ('k') | net/socket/transport_client_socket_pool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698