diff options
| author | sanjeevr@chromium.org <sanjeevr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-15 22:34:37 +0000 |
|---|---|---|
| committer | sanjeevr@chromium.org <sanjeevr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-15 22:34:37 +0000 |
| commit | 2e7f6e8287bb2e139da7bba876138e2d0f275714 (patch) | |
| tree | ae15c658c20275eeb3b278d226662af46064f8e5 /net/socket | |
| parent | ae4b68e2c7344f560f12b7e34946188b691a4695 (diff) | |
| download | chromium_src-2e7f6e8287bb2e139da7bba876138e2d0f275714.zip chromium_src-2e7f6e8287bb2e139da7bba876138e2d0f275714.tar.gz chromium_src-2e7f6e8287bb2e139da7bba876138e2d0f275714.tar.bz2 | |
Changed the jingle network code in ChromeAsyncSocket to use the client socket pool. This also allows the connection to be able to tunnel through proxies.
BUG=77430
TEST=Unit-tests, sync unit-tests, test Cloud Print and Sync behind procy servers.
Review URL: http://codereview.chromium.org/6833031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81820 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket')
| -rw-r--r-- | net/socket/client_socket_pool_manager.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket_pool_manager.cc index de29bd5..7277b37 100644 --- a/net/socket/client_socket_pool_manager.cc +++ b/net/socket/client_socket_pool_manager.cc @@ -65,6 +65,7 @@ int InitSocketPoolHelper(const HttpRequestInfo& request_info, 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 @@ int InitSocketPoolHelper(const HttpRequestInfo& request_info, 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 @@ int ClientSocketPoolManager::InitSocketHandleForHttpRequest( want_spdy_over_npn, ssl_config_for_origin, ssl_config_for_proxy, + false, net_log, 0, socket_handle, @@ -645,6 +647,7 @@ int ClientSocketPoolManager::InitSocketHandleForRawConnect( false, ssl_config_for_origin, ssl_config_for_proxy, + true, net_log, 0, socket_handle, @@ -669,6 +672,7 @@ int ClientSocketPoolManager::PreconnectSocketsForHttpRequest( want_spdy_over_npn, ssl_config_for_origin, ssl_config_for_proxy, + false, net_log, num_preconnect_streams, NULL, |