diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-12 22:22:19 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-12 22:22:19 +0000 |
| commit | c3456bbc289c54765e89d628ba03505425fe372a (patch) | |
| tree | 7d027edc8ea0a358bd5dcfb227fbc48ea8ca26ab /net/socket/client_socket_pool_manager_impl.cc | |
| parent | 9b10d2a051ec36c4e7f012d31b8214221db16eaa (diff) | |
| download | chromium_src-c3456bbc289c54765e89d628ba03505425fe372a.zip chromium_src-c3456bbc289c54765e89d628ba03505425fe372a.tar.gz chromium_src-c3456bbc289c54765e89d628ba03505425fe372a.tar.bz2 | |
net: split the SSL session cache between incognito and normal.
This change causes incognito requests to effectively have a different SSL
session cache from other requests. SSL session information will therefore not
leak into or out of incognito mode.
BUG=30877
TEST=net_unittests
Review URL: http://codereview.chromium.org/8857002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114098 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/client_socket_pool_manager_impl.cc')
| -rw-r--r-- | net/socket/client_socket_pool_manager_impl.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/socket/client_socket_pool_manager_impl.cc b/net/socket/client_socket_pool_manager_impl.cc index 3159c09..a4f9b72 100644 --- a/net/socket/client_socket_pool_manager_impl.cc +++ b/net/socket/client_socket_pool_manager_impl.cc @@ -41,6 +41,7 @@ ClientSocketPoolManagerImpl::ClientSocketPoolManagerImpl( TransportSecurityState* transport_security_state, DnsCertProvenanceChecker* dns_cert_checker, SSLHostInfoFactory* ssl_host_info_factory, + const std::string& ssl_session_cache_shard, ProxyService* proxy_service, SSLConfigService* ssl_config_service) : net_log_(net_log), @@ -51,6 +52,7 @@ ClientSocketPoolManagerImpl::ClientSocketPoolManagerImpl( transport_security_state_(transport_security_state), dns_cert_checker_(dns_cert_checker), ssl_host_info_factory_(ssl_host_info_factory), + ssl_session_cache_shard_(ssl_session_cache_shard), proxy_service_(proxy_service), ssl_config_service_(ssl_config_service), transport_pool_histograms_("TCP"), @@ -70,6 +72,7 @@ ClientSocketPoolManagerImpl::ClientSocketPoolManagerImpl( transport_security_state, dns_cert_checker, ssl_host_info_factory, + ssl_session_cache_shard, socket_factory, transport_socket_pool_.get(), NULL /* no socks proxy */, @@ -290,6 +293,7 @@ ClientSocketPoolManagerImpl::GetSocketPoolForHTTPProxy( transport_security_state_, dns_cert_checker_, ssl_host_info_factory_, + ssl_session_cache_shard_, socket_factory_, tcp_https_ret.first->second /* https proxy */, NULL /* no socks proxy */, @@ -329,6 +333,7 @@ SSLClientSocketPool* ClientSocketPoolManagerImpl::GetSocketPoolForSSLWithProxy( transport_security_state_, dns_cert_checker_, ssl_host_info_factory_, + ssl_session_cache_shard_, socket_factory_, NULL, /* no tcp pool, we always go through a proxy */ GetSocketPoolForSOCKSProxy(proxy_server), |