net/http/http_network_session.cc - Issue 353713005: Implements new, more robust design for communicating between SSLConnectJobs.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/http/http_network_session.cc

Issue 353713005: Implements new, more robust design for communicating between SSLConnectJobs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Moved tests back to ssl_client_socket_unittest.cc, fixed various other issues. Created 6 years, 5 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 side-by-side diff with in-line comments

Download patch

« net/cert/multi_threaded_cert_verifier.cc ('K') | « net/http/http_network_session.h ('k') | net/http/http_network_transaction_unittest.cc » ('j') | net/http/http_stream_factory_impl_job.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/http/http_network_session.cc

diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc

index fe7cf1d6734fbbd8ce7e6a989de19ad284dc61de..d39f012b678e17bb89e7296f67e961397d95a567 100644

--- a/net/http/http_network_session.cc

+++ b/net/http/http_network_session.cc

@@ -36,9 +36,9 @@ net::ClientSocketPoolManager* CreateSocketPoolManager(

// simultaneous connections for WebSockets.

return new net::ClientSocketPoolManagerImpl(

params.net_log,

- params.client_socket_factory ?

- params.client_socket_factory :

- net::ClientSocketFactory::GetDefaultFactory(),

+ params.client_socket_factory

+ ? params.client_socket_factory

+ : net::ClientSocketFactory::GetDefaultFactory(),

params.host_resolver,

params.cert_verifier,

params.channel_id_service,

@@ -47,6 +47,7 @@ net::ClientSocketPoolManager* CreateSocketPoolManager(

params.ssl_session_cache_shard,

params.proxy_service,

params.ssl_config_service,

+ params.enable_ssl_connect_job_waiting,

pool_type);

}