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

Unified Diff: net/http/http_stream_factory_impl.cc

Issue 981633002: Created new URLRequestContext for secure proxy check (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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.cc
diff --git a/net/http/http_stream_factory_impl.cc b/net/http/http_stream_factory_impl.cc
index 235122d2e834ae363f77203bc88277c5ad2c96e5..f13369eb09031e2650770585292ecc2916a40362 100644
--- a/net/http/http_stream_factory_impl.cc
+++ b/net/http/http_stream_factory_impl.cc
@@ -9,6 +9,7 @@
#include "base/logging.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
+#include "net/base/load_flags.h"
#include "net/base/net_log.h"
#include "net/base/net_util.h"
#include "net/http/http_network_session.h"
@@ -106,8 +107,10 @@ HttpStreamRequest* HttpStreamFactoryImpl::RequestStreamInternal(
net_log);
GURL alternate_url;
- AlternateProtocolInfo alternate =
- GetAlternateProtocolRequestFor(request_info.url, &alternate_url);
+
+ AlternateProtocolInfo alternate = GetAlternateProtocolRequestFor(
+ request_info.url, request_info.load_flags, &alternate_url);
+
Job* alternate_job = NULL;
if (alternate.protocol != UNINITIALIZED_ALTERNATE_PROTOCOL) {
// Never share connection with other jobs for FTP requests.
@@ -150,8 +153,9 @@ void HttpStreamFactoryImpl::PreconnectStreams(
const SSLConfig& proxy_ssl_config) {
DCHECK(!for_websockets_);
GURL alternate_url;
- AlternateProtocolInfo alternate =
- GetAlternateProtocolRequestFor(request_info.url, &alternate_url);
+ AlternateProtocolInfo alternate = GetAlternateProtocolRequestFor(
+ request_info.url, request_info.load_flags, &alternate_url);
+
Job* job = NULL;
if (alternate.protocol != UNINITIALIZED_ALTERNATE_PROTOCOL) {
HttpRequestInfo alternate_request_info = request_info;
@@ -173,6 +177,7 @@ const HostMappingRules* HttpStreamFactoryImpl::GetHostMappingRules() const {
AlternateProtocolInfo HttpStreamFactoryImpl::GetAlternateProtocolRequestFor(
const GURL& original_url,
+ int load_flags,
GURL* alternate_url) {
const AlternateProtocolInfo kNoAlternateProtocol;
@@ -182,6 +187,9 @@ AlternateProtocolInfo HttpStreamFactoryImpl::GetAlternateProtocolRequestFor(
if (original_url.SchemeIs("ftp"))
return kNoAlternateProtocol;
+ if (load_flags & LOAD_UNENCRYPTED_HTTP11)
+ return kNoAlternateProtocol;
+
HostPortPair origin = HostPortPair::FromURL(original_url);
HttpServerProperties& http_server_properties =
*session_->http_server_properties();

Powered by Google App Engine
This is Rietveld 408576698