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

Unified Diff: net/socket/client_socket_pool_manager.cc

Issue 9148011: Allow chrome to handle 407 auth challenges to CONNECT requests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 8 years, 11 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
« no previous file with comments | « net/socket/client_socket_pool_manager.h ('k') | net/socket/ssl_client_socket_pool.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/client_socket_pool_manager.cc
===================================================================
--- net/socket/client_socket_pool_manager.cc (revision 118888)
+++ net/socket/client_socket_pool_manager.cc (working copy)
@@ -52,6 +52,7 @@
const BoundNetLog& net_log,
int num_preconnect_streams,
ClientSocketHandle* socket_handle,
+ TunnelAuthCallback auth_needed_callback,
const CompletionCallback& callback) {
scoped_refptr<TransportSocketParams> tcp_params;
scoped_refptr<HttpProxySocketParams> http_proxy_params;
@@ -136,7 +137,8 @@
session->http_auth_cache(),
session->http_auth_handler_factory(),
session->spdy_session_pool(),
- force_tunnel || using_ssl);
+ force_tunnel || using_ssl,
+ auth_needed_callback);
} else {
DCHECK(proxy_info.is_socks());
char socks_version;
@@ -289,13 +291,15 @@
const SSLConfig& ssl_config_for_proxy,
const BoundNetLog& net_log,
ClientSocketHandle* socket_handle,
+ TunnelAuthCallback auth_needed_callback,
const CompletionCallback& callback) {
+
DCHECK(socket_handle);
return InitSocketPoolHelper(
request_url, request_extra_headers, request_load_flags, request_priority,
session, proxy_info, force_spdy_over_ssl, want_spdy_over_npn,
ssl_config_for_origin, ssl_config_for_proxy, false, net_log, 0,
- socket_handle, callback);
+ socket_handle, auth_needed_callback, callback);
}
int InitSocketHandleForRawConnect(
@@ -306,6 +310,7 @@
const SSLConfig& ssl_config_for_proxy,
const BoundNetLog& net_log,
ClientSocketHandle* socket_handle,
+ TunnelAuthCallback auth_needed_callback,
const CompletionCallback& callback) {
DCHECK(socket_handle);
// Synthesize an HttpRequestInfo.
@@ -313,11 +318,11 @@
HttpRequestHeaders request_extra_headers;
int request_load_flags = 0;
RequestPriority request_priority = MEDIUM;
-
return InitSocketPoolHelper(
request_url, request_extra_headers, request_load_flags, request_priority,
session, proxy_info, false, false, ssl_config_for_origin,
- ssl_config_for_proxy, true, net_log, 0, socket_handle, callback);
+ ssl_config_for_proxy, true, net_log, 0, socket_handle,
+ auth_needed_callback, callback);
}
int PreconnectSocketsForHttpRequest(
@@ -332,12 +337,13 @@
const SSLConfig& ssl_config_for_origin,
const SSLConfig& ssl_config_for_proxy,
const BoundNetLog& net_log,
- int num_preconnect_streams) {
+ int num_preconnect_streams,
+ TunnelAuthCallback auth_needed_callback) {
return InitSocketPoolHelper(
request_url, request_extra_headers, request_load_flags, request_priority,
session, proxy_info, force_spdy_over_ssl, want_spdy_over_npn,
ssl_config_for_origin, ssl_config_for_proxy, false, net_log,
- num_preconnect_streams, NULL, CompletionCallback());
+ num_preconnect_streams, NULL, auth_needed_callback, CompletionCallback());
}
} // namespace net
« no previous file with comments | « net/socket/client_socket_pool_manager.h ('k') | net/socket/ssl_client_socket_pool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698