diff options
| author | rcs@chromium.org <rcs@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-09 05:23:54 +0000 |
|---|---|---|
| committer | rcs@chromium.org <rcs@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-09 05:23:54 +0000 |
| commit | a702da7952a19cc3def379d573dca5a6c191273c (patch) | |
| tree | 58f3f0fc5f626d551659afe05e785840b3febe63 /jingle/glue | |
| parent | 30759127f43d6be58149b1fa363813fb016f5b71 (diff) | |
| download | chromium_src-a702da7952a19cc3def379d573dca5a6c191273c.zip chromium_src-a702da7952a19cc3def379d573dca5a6c191273c.tar.gz chromium_src-a702da7952a19cc3def379d573dca5a6c191273c.tar.bz2 | |
Add Finch experiment for selectively bypassing proxies.
Add option to bypass the data compression proxy if the request resource
type (as inferred by the renderer process) is not an image.
For background, see this design doc:
https://docs.google.com/a/google.com/document/d/1Kz92Fmw3lv_R-2aNvLp8jW9lkfKOZciTZtni2qQ_Adc/edit
BUG=391836
Review URL: https://codereview.chromium.org/332313003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281951 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle/glue')
| -rw-r--r-- | jingle/glue/proxy_resolving_client_socket.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/jingle/glue/proxy_resolving_client_socket.cc b/jingle/glue/proxy_resolving_client_socket.cc index 7622c21..c736018 100644 --- a/jingle/glue/proxy_resolving_client_socket.cc +++ b/jingle/glue/proxy_resolving_client_socket.cc @@ -10,6 +10,7 @@ #include "base/compiler_specific.h" #include "base/logging.h" #include "net/base/io_buffer.h" +#include "net/base/load_flags.h" #include "net/base/net_errors.h" #include "net/http/http_network_session.h" #include "net/socket/client_socket_handle.h" @@ -137,9 +138,11 @@ int ProxyResolvingClientSocket::Connect( // First we try and resolve the proxy. int status = network_session_->proxy_service()->ResolveProxy( proxy_url_, + net::LOAD_NORMAL, &proxy_info_, proxy_resolve_callback_, &pac_request_, + NULL, bound_net_log_); if (status != net::ERR_IO_PENDING) { // We defer execution of ProcessProxyResolveDone instead of calling it @@ -277,8 +280,8 @@ int ProxyResolvingClientSocket::ReconsiderProxyAfterError(int error) { } int rv = network_session_->proxy_service()->ReconsiderProxyAfterError( - proxy_url_, error, &proxy_info_, proxy_resolve_callback_, &pac_request_, - bound_net_log_); + proxy_url_, net::LOAD_NORMAL, error, &proxy_info_, + proxy_resolve_callback_, &pac_request_, NULL, bound_net_log_); if (rv == net::OK || rv == net::ERR_IO_PENDING) { CloseTransportSocket(); } else { |