mirror/naiveproxy
1
0
Fork 0
mirror of https://github.com/klzgrad/naiveproxy.git synced 2024-11-24 14:26:09 +03:00
Code Issues Projects Releases Wiki Activity

socket: Allow higher limits for proxies

Browse Source 
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 32712cf172
commit 824a78dc8a
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/socket/client_socket_pool_manager.cc
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.

2
net/socket/client_socket_pool_manager.h
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,