diff options
| author | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-10 09:03:15 +0000 |
|---|---|---|
| committer | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-10 09:03:15 +0000 |
| commit | 677c9057fafb4c263f001ded0e173075a945a4c2 (patch) | |
| tree | ca4b253831c082fe4a7ccaba2ba3cae6f264615a /net/http/http_network_transaction.cc | |
| parent | 1b9cad81c98ec37ce2f6b4c3ef47571efc61bd3d (diff) | |
| download | chromium_src-677c9057fafb4c263f001ded0e173075a945a4c2.zip chromium_src-677c9057fafb4c263f001ded0e173075a945a4c2.tar.gz chromium_src-677c9057fafb4c263f001ded0e173075a945a4c2.tar.bz2 | |
Add a ProxyScriptFetcher class for doing asynch downloads of PAC scripts.This object will be owned by ProxyService. It will be used to manage the fetching of PAC scripts (on the IO thread, using the primary URLRequestContext).BUG=74,2764 (partial)
Review URL: http://codereview.chromium.org/13251
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6699 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_network_transaction.cc')
| -rw-r--r-- | net/http/http_network_transaction.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc index 6076fab..0ba3d1e 100644 --- a/net/http/http_network_transaction.cc +++ b/net/http/http_network_transaction.cc @@ -390,6 +390,11 @@ int HttpNetworkTransaction::DoResolveProxy() { next_state_ = STATE_RESOLVE_PROXY_COMPLETE; + if (request_->load_flags & LOAD_BYPASS_PROXY) { + proxy_info_.UseDirect(); + return OK; + } + return session_->proxy_service()->ResolveProxy( request_->url, &proxy_info_, &io_callback_, &pac_request_); } @@ -1028,6 +1033,10 @@ int HttpNetworkTransaction::ReconsiderProxyAfterError(int error) { return error; } + if (request_->load_flags & LOAD_BYPASS_PROXY) { + return error; + } + int rv = session_->proxy_service()->ReconsiderProxyAfterError( request_->url, &proxy_info_, &io_callback_, &pac_request_); if (rv == OK || rv == ERR_IO_PENDING) { |