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

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

Issue 517693002: Add embedder-specific headers to HTTP CONNECT tunnel request (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added receive notification and test Created 6 years, 3 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/client_socket_pool_manager.h" 5 #include "net/socket/client_socket_pool_manager.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 *proxy_host_port.get(), 182 *proxy_host_port.get(),
183 ssl_config_for_proxy, 183 ssl_config_for_proxy,
184 PRIVACY_MODE_DISABLED, 184 PRIVACY_MODE_DISABLED,
185 load_flags, 185 load_flags,
186 force_spdy_over_ssl, 186 force_spdy_over_ssl,
187 want_spdy_over_npn); 187 want_spdy_over_npn);
188 proxy_tcp_params = NULL; 188 proxy_tcp_params = NULL;
189 } 189 }
190 190
191 http_proxy_params = 191 http_proxy_params =
192 new HttpProxySocketParams(proxy_tcp_params, 192 new HttpProxySocketParams(
193 ssl_params, 193 proxy_tcp_params,
194 request_url, 194 ssl_params,
195 user_agent, 195 request_url,
196 origin_host_port, 196 user_agent,
197 session->http_auth_cache(), 197 origin_host_port,
198 session->http_auth_handler_factory(), 198 session->http_auth_cache(),
199 session->spdy_session_pool(), 199 session->http_auth_handler_factory(),
200 force_tunnel || using_ssl); 200 session->spdy_session_pool(),
201 force_tunnel || using_ssl,
202 session->params().http_proxy_tunnel_delegate);
201 } else { 203 } else {
202 DCHECK(proxy_info.is_socks()); 204 DCHECK(proxy_info.is_socks());
203 char socks_version; 205 char socks_version;
204 if (proxy_server.scheme() == ProxyServer::SCHEME_SOCKS5) 206 if (proxy_server.scheme() == ProxyServer::SCHEME_SOCKS5)
205 socks_version = '5'; 207 socks_version = '5';
206 else 208 else
207 socks_version = '4'; 209 socks_version = '4';
208 connection_group = base::StringPrintf( 210 connection_group = base::StringPrintf(
209 "socks%c/%s", socks_version, connection_group.c_str()); 211 "socks%c/%s", socks_version, connection_group.c_str());
210 212
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
477 int num_preconnect_streams) { 479 int num_preconnect_streams) {
478 return InitSocketPoolHelper( 480 return InitSocketPoolHelper(
479 request_url, request_extra_headers, request_load_flags, request_priority, 481 request_url, request_extra_headers, request_load_flags, request_priority,
480 session, proxy_info, force_spdy_over_ssl, want_spdy_over_npn, 482 session, proxy_info, force_spdy_over_ssl, want_spdy_over_npn,
481 ssl_config_for_origin, ssl_config_for_proxy, false, privacy_mode, net_log, 483 ssl_config_for_origin, ssl_config_for_proxy, false, privacy_mode, net_log,
482 num_preconnect_streams, NULL, HttpNetworkSession::NORMAL_SOCKET_POOL, 484 num_preconnect_streams, NULL, HttpNetworkSession::NORMAL_SOCKET_POOL,
483 OnHostResolutionCallback(), CompletionCallback()); 485 OnHostResolutionCallback(), CompletionCallback());
484 } 486 }
485 487
486 } // namespace net 488 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698