summaryrefslogtreecommitdiffstats
path: root/net/http/http_network_transaction.cc
diff options
context:
space:
mode:
Diffstat (limited to 'net/http/http_network_transaction.cc')
-rw-r--r--net/http/http_network_transaction.cc9
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) {