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

Unified Diff: net/http/http_stream_factory_impl_job.cc

Issue 7024017: Fix --host-rules command switch. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update to ToT. Created 9 years, 6 months 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
Index: net/http/http_stream_factory_impl_job.cc
diff --git a/net/http/http_stream_factory_impl_job.cc b/net/http/http_stream_factory_impl_job.cc
index 1efd1cc9b8a0829fb46303a6a04722e62be45916..239c2b1a91d479fbe6e08d83efd2b08a25c00083 100644
--- a/net/http/http_stream_factory_impl_job.cc
+++ b/net/http/http_stream_factory_impl_job.cc
@@ -457,6 +457,9 @@ int HttpStreamFactoryImpl::Job::DoResolveProxy() {
origin_ = HostPortPair(request_info_.url.HostNoBrackets(),
request_info_.url.EffectiveIntPort());
+ origin_url_ = HttpStreamFactory::ApplyHostMappingRules(
+ request_info_.url, &origin_);
+
if (request_info_.load_flags & LOAD_BYPASS_PROXY) {
proxy_info_.UseDirect();
return OK;
@@ -576,7 +579,11 @@ int HttpStreamFactoryImpl::Job::DoInitConnection() {
if (IsPreconnecting()) {
return ClientSocketPoolManager::PreconnectSocketsForHttpRequest(
- request_info_,
+ origin_url_,
+ request_info_.referrer,
+ request_info_.extra_headers,
+ request_info_.load_flags,
+ request_info_.priority,
session_,
proxy_info_,
ShouldForceSpdySSL(),
@@ -587,7 +594,11 @@ int HttpStreamFactoryImpl::Job::DoInitConnection() {
num_streams_);
} else {
return ClientSocketPoolManager::InitSocketHandleForHttpRequest(
- request_info_,
+ origin_url_,
+ request_info_.referrer,
+ request_info_.extra_headers,
+ request_info_.load_flags,
+ request_info_.priority,
session_,
proxy_info_,
ShouldForceSpdySSL(),

Powered by Google App Engine
This is Rietveld 408576698