net/socket/client_socket_pool_manager.cc - Issue 6833031: Changed the jingle network code in ChromeAsyncSocket to use the client socket pool. This also all...

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/socket/client_socket_pool_manager.cc

Issue 6833031: Changed the jingle network code in ChromeAsyncSocket to use the client socket pool. This also all... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Lint fixes Created 9 years, 8 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

Index: net/socket/client_socket_pool_manager.cc

===================================================================

--- net/socket/client_socket_pool_manager.cc (revision 81535)

+++ net/socket/client_socket_pool_manager.cc (working copy)

@@ -65,6 +65,7 @@

bool want_spdy_over_npn,

const SSLConfig& ssl_config_for_origin,

const SSLConfig& ssl_config_for_proxy,

+ bool force_tunnel,

const BoundNetLog& net_log,

int num_preconnect_streams,

ClientSocketHandle* socket_handle,

@@ -141,7 +142,7 @@

session->http_auth_cache(),

session->http_auth_handler_factory(),

session->spdy_session_pool(),

- using_ssl);

+ force_tunnel || using_ssl);

} else {

DCHECK(proxy_info.is_socks());

char socks_version;

@@ -618,6 +619,7 @@

want_spdy_over_npn,

ssl_config_for_origin,

ssl_config_for_proxy,

+ false,

net_log,

socket_handle,

@@ -645,6 +647,7 @@

false,

ssl_config_for_origin,

ssl_config_for_proxy,

+ true,

net_log,

socket_handle,

@@ -669,6 +672,7 @@

want_spdy_over_npn,

ssl_config_for_origin,

ssl_config_for_proxy,

+ false,

net_log,

num_preconnect_streams,

NULL,

« jingle/notifier/base/xmpp_connection_unittest.cc ('K') | « jingle/notifier/listener/mediator_thread_impl.cc ('k') | no next file » | no next file with comments »