diff options
| author | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-24 03:37:23 +0000 |
|---|---|---|
| committer | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-24 03:37:23 +0000 |
| commit | d759912753b5a71f294cd96e6fb8ea1c6e4efc12 (patch) | |
| tree | 77a0be70260be8e9963cb37f4576c5e8b09ea72d /jingle | |
| parent | d6cc5d74d5816c6e097e110e30b47b7a36149367 (diff) | |
| download | chromium_src-d759912753b5a71f294cd96e6fb8ea1c6e4efc12.zip chromium_src-d759912753b5a71f294cd96e6fb8ea1c6e4efc12.tar.gz chromium_src-d759912753b5a71f294cd96e6fb8ea1c6e4efc12.tar.bz2 | |
Remove HttpStreamFactory's NPN/SPDY globals, except for spdy_enabled.
Instead, each HttpNetworkSession is given its own immutable copies on
construction. Other than spdy_enabled, none of the globals were
changed before this CL, anyways.
Also, setting spdy_enabled back to true after setting it to false no
longer clears the NPN list.
spdy_enabled is still a global because group policy can set it to
false at runtime.
BUG=372533
R=joaodasilva@chromium.org, rch@chromium.org, sergeyu@chromium.org, sgurun@chromium.org, sky@chromium.org, ttuttle@chromium.org
Review URL: https://codereview.chromium.org/284423002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272698 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle')
| -rw-r--r-- | jingle/glue/proxy_resolving_client_socket.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/jingle/glue/proxy_resolving_client_socket.cc b/jingle/glue/proxy_resolving_client_socket.cc index f88f715..40b51ea 100644 --- a/jingle/glue/proxy_resolving_client_socket.cc +++ b/jingle/glue/proxy_resolving_client_socket.cc @@ -70,6 +70,8 @@ ProxyResolvingClientSocket::ProxyResolvingClientSocket( const net::HttpNetworkSession::Params* reference_params = request_context->GetNetworkSessionParams(); if (reference_params) { + // TODO(mmenke): Just copying specific parameters seems highly regression + // prone. Should have a better way to do this. session_params.host_mapping_rules = reference_params->host_mapping_rules; session_params.ignore_certificate_errors = reference_params->ignore_certificate_errors; @@ -79,7 +81,14 @@ ProxyResolvingClientSocket::ProxyResolvingClientSocket( reference_params->testing_fixed_http_port; session_params.testing_fixed_https_port = reference_params->testing_fixed_https_port; + session_params.next_protos = reference_params->next_protos; session_params.trusted_spdy_proxy = reference_params->trusted_spdy_proxy; + session_params.force_spdy_over_ssl = reference_params->force_spdy_over_ssl; + session_params.force_spdy_always = reference_params->force_spdy_always; + session_params.forced_spdy_exclusions = + reference_params->forced_spdy_exclusions; + session_params.use_alternate_protocols = + reference_params->use_alternate_protocols; } network_session_ = new net::HttpNetworkSession(session_params); |