| 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) {
|
|
|