From e1050ded05be07770f9485d3b7eb25fa90aee4d0 Mon Sep 17 00:00:00 2001 From: klzgrad Date: Thu, 25 Jan 2018 00:11:23 -0500 Subject: [PATCH] socket: Allow higher limits for proxies As an intermediary proxy we should not enforce stricter connection limits in addition to what the user is already enforcing. --- src/net/socket/client_socket_pool_manager.cc | 3 --- src/net/socket/client_socket_pool_manager.h | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/net/socket/client_socket_pool_manager.cc b/src/net/socket/client_socket_pool_manager.cc index 90d52309d5..40b92bd679 100644 --- a/src/net/socket/client_socket_pool_manager.cc +++ b/src/net/socket/client_socket_pool_manager.cc @@ -303,7 +303,6 @@ void ClientSocketPoolManager::set_max_sockets_per_pool( HttpNetworkSession::SocketPoolType pool_type, int socket_count) { DCHECK_LT(0, socket_count); - DCHECK_GT(1000, socket_count); // Sanity check. DCHECK_LT(pool_type, HttpNetworkSession::NUM_SOCKET_POOL_TYPES); g_max_sockets_per_pool[pool_type] = socket_count; DCHECK_GE(g_max_sockets_per_pool[pool_type], @@ -323,7 +322,6 @@ void ClientSocketPoolManager::set_max_sockets_per_group( int socket_count) { DCHECK_LT(0, socket_count); // The following is a sanity check... but we should NEVER be near this value. - DCHECK_GT(100, socket_count); DCHECK_LT(pool_type, HttpNetworkSession::NUM_SOCKET_POOL_TYPES); g_max_sockets_per_group[pool_type] = socket_count; @@ -345,7 +343,6 @@ void ClientSocketPoolManager::set_max_sockets_per_proxy_server( HttpNetworkSession::SocketPoolType pool_type, int socket_count) { DCHECK_LT(0, socket_count); - DCHECK_GT(100, socket_count); // Sanity check. DCHECK_LT(pool_type, HttpNetworkSession::NUM_SOCKET_POOL_TYPES); // Assert this case early on. The max number of sockets per group cannot // exceed the max number of sockets per proxy server. diff --git a/src/net/socket/client_socket_pool_manager.h b/src/net/socket/client_socket_pool_manager.h index aeebe4d31b..694b52da89 100644 --- a/src/net/socket/client_socket_pool_manager.h +++ b/src/net/socket/client_socket_pool_manager.h @@ -103,7 +103,7 @@ class NET_EXPORT_PRIVATE ClientSocketPoolManager { // |resolution_callback| will be invoked after the the hostname is // resolved. If |resolution_callback| does not return OK, then the // connection will be aborted with that value. -int InitSocketHandleForHttpRequest( +NET_EXPORT int InitSocketHandleForHttpRequest( ClientSocketPoolManager::SocketGroupType group_type, const HostPortPair& endpoint, const HttpRequestHeaders& request_extra_headers,