summaryrefslogtreecommitdiffstats
path: root/net/socket
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-14 15:42:38 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-14 15:42:38 +0000
commit0bc6452c9c509486398bbdc6d39b81eaf4628604 (patch)
tree98fb1c0fe94a20c0926039979381fd03befdbaca /net/socket
parente84de40ca0fea035153eb63a3c9b5cbd93417a21 (diff)
downloadchromium_src-0bc6452c9c509486398bbdc6d39b81eaf4628604.zip
chromium_src-0bc6452c9c509486398bbdc6d39b81eaf4628604.tar.gz
chromium_src-0bc6452c9c509486398bbdc6d39b81eaf4628604.tar.bz2
net: don't assume that we have an SSLHostInfo.
sync doesn't run an HttpCache and therefore sync's requests don't pickup an SSLHostInfo. BUG=69522 TEST=don't crash on startup http://codereview.chromium.org/6355003/ git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71444 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket')
-rw-r--r--net/socket/ssl_client_socket_pool.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/socket/ssl_client_socket_pool.cc b/net/socket/ssl_client_socket_pool.cc
index 12d9e19..b8ffca8 100644
--- a/net/socket/ssl_client_socket_pool.cc
+++ b/net/socket/ssl_client_socket_pool.cc
@@ -202,10 +202,10 @@ int SSLConnectJob::DoTCPConnect() {
params_->ssl_config()));
}
- if (dnsrr_resolver_)
- ssl_host_info_->StartDnsLookup(dnsrr_resolver_);
-
if (ssl_host_info_.get()) {
+ if (dnsrr_resolver_)
+ ssl_host_info_->StartDnsLookup(dnsrr_resolver_);
+
// This starts fetching the SSL host info from the disk cache for Snap
// Start.
ssl_host_info_->Start();