Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(923)

Unified Diff: net/http/http_network_transaction.cc

Issue 13251: Add a ProxyScriptFetcher class for doing asynch downloads of PAC scripts.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/data/proxy_script_fetcher_unittest/pac.txt.mock-http-headers ('k') | net/net_lib.scons » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_network_transaction.cc
===================================================================
--- net/http/http_network_transaction.cc (revision 6694)
+++ net/http/http_network_transaction.cc (working copy)
@@ -390,6 +390,11 @@
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 @@
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) {
« no previous file with comments | « net/data/proxy_script_fetcher_unittest/pac.txt.mock-http-headers ('k') | net/net_lib.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698