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

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

Issue 6041004: net: perform a non-A DNS lookup for HTTPS hosts. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add missing UMA_ Created 9 years, 11 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/base/dns_util.h ('k') | net/socket/ssl_host_info.h » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 #include "net/socket/ssl_client_socket_pool.h" 5 #include "net/socket/ssl_client_socket_pool.h"
6 6
7 #include "base/metrics/histogram.h" 7 #include "base/metrics/histogram.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "net/base/net_errors.h" 9 #include "net/base/net_errors.h"
10 #include "net/base/host_port_pair.h" 10 #include "net/base/host_port_pair.h"
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 } 194 }
195 195
196 int SSLConnectJob::DoTCPConnect() { 196 int SSLConnectJob::DoTCPConnect() {
197 DCHECK(tcp_pool_); 197 DCHECK(tcp_pool_);
198 198
199 if (ssl_host_info_factory_) { 199 if (ssl_host_info_factory_) {
200 ssl_host_info_.reset( 200 ssl_host_info_.reset(
201 ssl_host_info_factory_->GetForHost(params_->host_and_port().host(), 201 ssl_host_info_factory_->GetForHost(params_->host_and_port().host(),
202 params_->ssl_config())); 202 params_->ssl_config()));
203 } 203 }
204
205 if (dnsrr_resolver_)
206 ssl_host_info_->StartDnsLookup(dnsrr_resolver_);
207
204 if (ssl_host_info_.get()) { 208 if (ssl_host_info_.get()) {
205 // This starts fetching the SSL host info from the disk cache for Snap 209 // This starts fetching the SSL host info from the disk cache for Snap
206 // Start. 210 // Start.
207 ssl_host_info_->Start(); 211 ssl_host_info_->Start();
208 } 212 }
209 213
210 next_state_ = STATE_TCP_CONNECT_COMPLETE; 214 next_state_ = STATE_TCP_CONNECT_COMPLETE;
211 transport_socket_handle_.reset(new ClientSocketHandle()); 215 transport_socket_handle_.reset(new ClientSocketHandle());
212 scoped_refptr<TCPSocketParams> tcp_params = params_->tcp_params(); 216 scoped_refptr<TCPSocketParams> tcp_params = params_->tcp_params();
213 return transport_socket_handle_->Init(group_name(), tcp_params, 217 return transport_socket_handle_->Init(group_name(), tcp_params,
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
533 537
534 base::TimeDelta SSLClientSocketPool::ConnectionTimeout() const { 538 base::TimeDelta SSLClientSocketPool::ConnectionTimeout() const {
535 return base_.ConnectionTimeout(); 539 return base_.ConnectionTimeout();
536 } 540 }
537 541
538 ClientSocketPoolHistograms* SSLClientSocketPool::histograms() const { 542 ClientSocketPoolHistograms* SSLClientSocketPool::histograms() const {
539 return base_.histograms(); 543 return base_.histograms();
540 } 544 }
541 545
542 } // namespace net 546 } // namespace net
OLDNEW
« no previous file with comments | « net/base/dns_util.h ('k') | net/socket/ssl_host_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698