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.
This commit is contained in:
klzgrad 2018-01-25 00:11:23 -05:00
parent ae7bfc498c
commit 1c22ba8ed1
2 changed files with 1 additions and 4 deletions

View File

@ -305,7 +305,6 @@ void ClientSocketPoolManager::set_max_sockets_per_pool(
HttpNetworkSession::SocketPoolType pool_type, HttpNetworkSession::SocketPoolType pool_type,
int socket_count) { int socket_count) {
DCHECK_LT(0, socket_count); DCHECK_LT(0, socket_count);
DCHECK_GT(1000, socket_count); // Sanity check.
DCHECK_LT(pool_type, HttpNetworkSession::NUM_SOCKET_POOL_TYPES); DCHECK_LT(pool_type, HttpNetworkSession::NUM_SOCKET_POOL_TYPES);
g_max_sockets_per_pool[pool_type] = socket_count; g_max_sockets_per_pool[pool_type] = socket_count;
DCHECK_GE(g_max_sockets_per_pool[pool_type], DCHECK_GE(g_max_sockets_per_pool[pool_type],
@ -325,7 +324,6 @@ void ClientSocketPoolManager::set_max_sockets_per_group(
int socket_count) { int socket_count) {
DCHECK_LT(0, socket_count); DCHECK_LT(0, socket_count);
// The following is a sanity check... but we should NEVER be near this value. // 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); DCHECK_LT(pool_type, HttpNetworkSession::NUM_SOCKET_POOL_TYPES);
g_max_sockets_per_group[pool_type] = socket_count; g_max_sockets_per_group[pool_type] = socket_count;
@ -347,7 +345,6 @@ void ClientSocketPoolManager::set_max_sockets_per_proxy_server(
HttpNetworkSession::SocketPoolType pool_type, HttpNetworkSession::SocketPoolType pool_type,
int socket_count) { int socket_count) {
DCHECK_LT(0, socket_count); DCHECK_LT(0, socket_count);
DCHECK_GT(100, socket_count); // Sanity check.
DCHECK_LT(pool_type, HttpNetworkSession::NUM_SOCKET_POOL_TYPES); DCHECK_LT(pool_type, HttpNetworkSession::NUM_SOCKET_POOL_TYPES);
// Assert this case early on. The max number of sockets per group cannot // Assert this case early on. The max number of sockets per group cannot
// exceed the max number of sockets per proxy server. // exceed the max number of sockets per proxy server.

View File

@ -103,7 +103,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.
int InitSocketHandleForHttpRequest( NET_EXPORT 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,