diff options
Diffstat (limited to 'chromium/net/socket/client_socket_pool_manager.cc')
| -rw-r--r-- | chromium/net/socket/client_socket_pool_manager.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/chromium/net/socket/client_socket_pool_manager.cc b/chromium/net/socket/client_socket_pool_manager.cc index 3066171fc4a..c053b1f4c04 100644 --- a/chromium/net/socket/client_socket_pool_manager.cc +++ b/chromium/net/socket/client_socket_pool_manager.cc @@ -6,7 +6,6 @@ #include <string> -#include "base/basictypes.h" #include "base/logging.h" #include "base/strings/stringprintf.h" #include "net/base/load_flags.h" @@ -39,14 +38,12 @@ static_assert(arraysize(g_max_sockets_per_pool) == // as home routers blocking the connections!?!? See http://crbug.com/12066. // // WebSocket connections are long-lived, and should be treated differently -// than normal other connections. 6 connections per group sounded too small -// for such use, thus we use a larger limit which was determined somewhat -// arbitrarily. -// TODO(yutak): Look at the usage and determine the right value after -// WebSocket protocol stack starts to work. +// than normal other connections. Use a limit of 255, so the limit for wss will +// be the same as the limit for ws. Also note that Firefox uses a limit of 200. +// See http://crbug.com/486800 int g_max_sockets_per_group[] = { 6, // NORMAL_SOCKET_POOL - 30 // WEBSOCKET_SOCKET_POOL + 255 // WEBSOCKET_SOCKET_POOL }; static_assert(arraysize(g_max_sockets_per_group) == @@ -146,7 +143,7 @@ int InitSocketPoolHelper(ClientSocketPoolManager::SocketGroupType group_type, } // Place sockets with and without deprecated ciphers into separate // connection groups. - if (ssl_config_for_origin.enable_deprecated_cipher_suites) + if (ssl_config_for_origin.deprecated_cipher_suites_enabled) prefix += "deprecatedciphers/"; connection_group = prefix + connection_group; } |