mirror/naiveproxy
1
0
Fork 0
mirror of https://github.com/klzgrad/naiveproxy.git synced 2024-12-01 01:36:09 +03:00
Code Issues Projects Releases Wiki Activity

Update socket pool manager

Browse Source
This commit is contained in:
klzgrad 2018-12-08 00:52:08 -05:00
parent 18568042f8
commit 50f039c930
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/net/socket/client_socket_pool_manager.cc
View File

@ -407,6 +407,30 @@ int InitSocketHandleForRawConnect(const HostPortPair& host_port_pair,
OnHostResolutionCallback(), std::move(callback)); OnHostResolutionCallback(), std::move(callback));
} }
int InitSocketHandleForRawConnect2(
const HostPortPair& host_port_pair,
HttpNetworkSession* session,
int request_load_flags,
RequestPriority request_priority,
const ProxyInfo& proxy_info,
quic::QuicTransportVersion quic_version,
const SSLConfig& ssl_config_for_origin,
const SSLConfig& ssl_config_for_proxy,
PrivacyMode privacy_mode,
const NetLogWithSource& net_log,
ClientSocketHandle* socket_handle,
CompletionOnceCallback callback) {
DCHECK(socket_handle);
HttpRequestHeaders request_extra_headers;
return InitSocketPoolHelper(
ClientSocketPoolManager::NORMAL_GROUP, host_port_pair,
request_extra_headers, request_load_flags, request_priority, session,
proxy_info, quic_version, ssl_config_for_origin, ssl_config_for_proxy,
/*force_tunnel=*/true, privacy_mode, SocketTag(), net_log, 0,
socket_handle, HttpNetworkSession::NORMAL_SOCKET_POOL,
OnHostResolutionCallback(), std::move(callback));
}
int InitSocketHandleForTlsConnect(const HostPortPair& endpoint, int InitSocketHandleForTlsConnect(const HostPortPair& endpoint,
HttpNetworkSession* session, HttpNetworkSession* session,
int request_load_flags, int request_load_flags,

16
src/net/socket/client_socket_pool_manager.h
View File

@ -106,7 +106,7 @@ class NET_EXPORT_PRIVATE ClientSocketPoolManager {
// |resolution_callback| will be invoked after the the hostname is // |resolution_callback| will be invoked after the the hostname is
// resolved. If |resolution_callback| does not return OK, then the // resolved. If |resolution_callback| does not return OK, then the
// connection will be aborted with that value. // connection will be aborted with that value.
NET_EXPORT int InitSocketHandleForHttpRequest( int InitSocketHandleForHttpRequest(
ClientSocketPoolManager::SocketGroupType group_type, ClientSocketPoolManager::SocketGroupType group_type,
const HostPortPair& endpoint, const HostPortPair& endpoint,
const HttpRequestHeaders& request_extra_headers, const HttpRequestHeaders& request_extra_headers,
@ -167,6 +167,20 @@ NET_EXPORT int InitSocketHandleForRawConnect(
ClientSocketHandle* socket_handle, ClientSocketHandle* socket_handle,
CompletionOnceCallback callback); CompletionOnceCallback callback);
NET_EXPORT int InitSocketHandleForRawConnect2(
const HostPortPair& host_port_pair,
HttpNetworkSession* session,
int request_load_flags,
RequestPriority request_priority,
const ProxyInfo& proxy_info,
quic::QuicTransportVersion quic_version,
const SSLConfig& ssl_config_for_origin,
const SSLConfig& ssl_config_for_proxy,
PrivacyMode privacy_mode,
const NetLogWithSource& net_log,
ClientSocketHandle* socket_handle,
CompletionOnceCallback callback);
// Deprecated: Please do not use this outside of //net and //services/network. // Deprecated: Please do not use this outside of //net and //services/network.
// A helper method that uses the passed in proxy information to initialize a // A helper method that uses the passed in proxy information to initialize a
// ClientSocketHandle with the relevant socket pool. Use this method for // ClientSocketHandle with the relevant socket pool. Use this method for