Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(621)

Unified Diff: net/socket/client_socket_pool_manager.cc

Issue 2858693003: Remove the deprecated cipher fallback. (Closed)
Patch Set: rebase Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/log/net_log_event_type_list.h ('k') | net/socket/ssl_client_socket_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/client_socket_pool_manager.cc
diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket_pool_manager.cc
index f0b4b6f96c8e7cc0ff55f76981d092ba0904329a..fd02b02dbb1912dacce14dee989870ebe385d8de 100644
--- a/net/socket/client_socket_pool_manager.cc
+++ b/net/socket/client_socket_pool_manager.cc
@@ -114,12 +114,7 @@ int InitSocketPoolHelper(ClientSocketPoolManager::SocketGroupType group_type,
connection_group = "ftp/" + connection_group;
}
if (using_ssl) {
- std::string prefix = "ssl/";
- // Place sockets with and without deprecated ciphers into separate
- // connection groups.
- if (ssl_config_for_origin.deprecated_cipher_suites_enabled)
- prefix += "deprecatedciphers/";
- connection_group = prefix + connection_group;
+ connection_group = "ssl/" + connection_group;
davidben 2017/05/09 19:04:18 There. Happy now? :-)
mmenke 2017/05/09 19:34:27 Less happy, actually, given that I didn't even kno
}
ClientSocketPool::RespectLimits respect_limits =
« no previous file with comments | « net/log/net_log_event_type_list.h ('k') | net/socket/ssl_client_socket_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698