OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "net/socket/client_socket_pool_manager.h" | 5 #include "net/socket/client_socket_pool_manager.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
139 case SSL_PROTOCOL_VERSION_TLS1: | 139 case SSL_PROTOCOL_VERSION_TLS1: |
140 prefix = "ssl(max:3.1)/"; | 140 prefix = "ssl(max:3.1)/"; |
141 break; | 141 break; |
142 default: | 142 default: |
143 CHECK(false); | 143 CHECK(false); |
144 break; | 144 break; |
145 } | 145 } |
146 } | 146 } |
147 // Place sockets with and without deprecated ciphers into separate | 147 // Place sockets with and without deprecated ciphers into separate |
148 // connection groups. | 148 // connection groups. |
149 if (ssl_config_for_origin.enable_deprecated_cipher_suites) | 149 if (ssl_config_for_origin.deprecated_cipher_suites_enabled) |
150 prefix += "deprecatedciphers/"; | 150 prefix += "deprecatedciphers/"; |
151 connection_group = prefix + connection_group; | 151 connection_group = prefix + connection_group; |
152 } | 152 } |
153 | 153 |
154 bool ignore_limits = (request_load_flags & LOAD_IGNORE_LIMITS) != 0; | 154 bool ignore_limits = (request_load_flags & LOAD_IGNORE_LIMITS) != 0; |
155 if (!proxy_info.is_direct()) { | 155 if (!proxy_info.is_direct()) { |
156 ProxyServer proxy_server = proxy_info.proxy_server(); | 156 ProxyServer proxy_server = proxy_info.proxy_server(); |
157 proxy_host_port.reset(new HostPortPair(proxy_server.host_port_pair())); | 157 proxy_host_port.reset(new HostPortPair(proxy_server.host_port_pair())); |
158 scoped_refptr<TransportSocketParams> proxy_tcp_params( | 158 scoped_refptr<TransportSocketParams> proxy_tcp_params( |
159 new TransportSocketParams( | 159 new TransportSocketParams( |
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
487 int num_preconnect_streams) { | 487 int num_preconnect_streams) { |
488 return InitSocketPoolHelper( | 488 return InitSocketPoolHelper( |
489 group_type, endpoint, request_extra_headers, request_load_flags, | 489 group_type, endpoint, request_extra_headers, request_load_flags, |
490 request_priority, session, proxy_info, expect_spdy, ssl_config_for_origin, | 490 request_priority, session, proxy_info, expect_spdy, ssl_config_for_origin, |
491 ssl_config_for_proxy, /*force_tunnel=*/false, privacy_mode, net_log, | 491 ssl_config_for_proxy, /*force_tunnel=*/false, privacy_mode, net_log, |
492 num_preconnect_streams, NULL, HttpNetworkSession::NORMAL_SOCKET_POOL, | 492 num_preconnect_streams, NULL, HttpNetworkSession::NORMAL_SOCKET_POOL, |
493 OnHostResolutionCallback(), CompletionCallback()); | 493 OnHostResolutionCallback(), CompletionCallback()); |
494 } | 494 } |
495 | 495 |
496 } // namespace net | 496 } // namespace net |
OLD | NEW |